Skip to content

Commit fd70189

Browse files
committed
bugfix: upgrade openeuler chroots to latest release and fix gpg check failed in 20.03
Signed-off-by: Li Chaoran <pkwarcraft@gmail.com>
1 parent be5fd91 commit fd70189

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

mock-core-configs/etc/mock/templates/openeuler-20.03.tpl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ openEuler-rpm-config openEuler-release which xz sed make bzip2 gzip gcc coreutils unzip diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
22
config_opts['dist'] = 'oe2003' # only useful for --resultdir variable subst
3-
config_opts['releasever'] = '20.03LTS_SP3'
3+
config_opts['releasever'] = '20.03LTS_SP4'
44
config_opts['package_manager'] = 'dnf'
5-
config_opts['description'] = 'openEuler 20.03 LTS SP3'
5+
config_opts['description'] = 'openEuler 20.03 LTS SP4'
66
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
7-
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:20.03-lts'
7+
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:20.03-lts-sp4'
88

99
config_opts['dnf.conf'] = """
1010
[main]
@@ -31,40 +31,40 @@ name=OS
3131
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
3232
enabled=1
3333
gpgcheck=1
34-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
34+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
3535
3636
[everything]
3737
name=everything
3838
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/everything&arch=$basearch
3939
enabled=1
4040
gpgcheck=1
41-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
41+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
4242
4343
[EPOL]
4444
name=EPOL
4545
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/EPOL/main&arch=$basearch
4646
enabled=1
4747
gpgcheck=1
48-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
48+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
4949
5050
[debuginfo]
5151
name=debuginfo
5252
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/debuginfo&arch=$basearch
5353
enabled=0
5454
gpgcheck=1
55-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
55+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
5656
5757
[source]
5858
name=source
5959
metalink=https://mirrors.openeuler.org/metalink?path=openeuler/$releasever/source/repodata/repomd.xml
6060
enabled=0
6161
gpgcheck=1
62-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
62+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
6363
6464
[update]
6565
name=update
6666
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/update&arch=$basearch
6767
enabled=1
6868
gpgcheck=1
69-
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler
69+
gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker
7070
"""

mock-core-configs/etc/mock/templates/openeuler-22.03.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ openEuler-rpm-config openEuler-release which xz sed make bzip2 gzip gcc coreutils unzip diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
22
config_opts['dist'] = 'oe2203' # only useful for --resultdir variable subst
3-
config_opts['releasever'] = '22.03LTS_SP1'
3+
config_opts['releasever'] = '22.03LTS_SP4'
44
config_opts['package_manager'] = 'dnf'
5-
config_opts['description'] = 'openEuler 22.03 LTS SP1'
5+
config_opts['description'] = 'openEuler 22.03 LTS SP4'
66
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
7-
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:22.03-lts'
7+
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:22.03-lts-sp4'
88

99
config_opts['dnf.conf'] = """
1010
[main]

mock-core-configs/etc/mock/templates/openeuler-24.03.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ openEuler-rpm-config openEuler-release which xz sed make bzip2 gzip gcc coreutils unzip diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
22
config_opts['dist'] = 'oe2403' # only useful for --resultdir variable subst
3-
config_opts['releasever'] = '24.03LTS'
3+
config_opts['releasever'] = '24.03LTS_SP1'
44
config_opts['package_manager'] = 'dnf'
5-
config_opts['description'] = 'openEuler 24.03 LTS'
5+
config_opts['description'] = 'openEuler 24.03 LTS SP1'
66
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
7-
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:24.03-lts'
7+
config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:24.03-lts-sp1'
88

99
config_opts['dnf.conf'] = """
1010
[main]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bugfix: upgrade openeuler chroots to latest release and fix gpg check failed in 20.03 for issue#1539

0 commit comments

Comments
 (0)