sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "centos: do not use $releasever in .repo files"

Browse Source
This commit is contained in:
Zuul 2022-02-01 07:43:51 +00:00 committed by Gerrit Code Review
commit 3d905e772e
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/centos-minimal/yum.repos.d/8-stream/appstream.repo
View File

@ -1,5 +1,5 @@
[Stream-AppStream] [Stream-AppStream]
name=CentOS-Stream - AppStream name=CentOS-Stream - AppStream
mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream mirrorlist=http://mirrorlist.centos.org/?release=8-stream&arch=$basearch&repo=AppStream
gpgcheck=0 gpgcheck=0

2
diskimage_builder/elements/centos-minimal/yum.repos.d/8-stream/base.repo
View File

@ -1,5 +1,5 @@
[Stream-BaseOS] [Stream-BaseOS]
name=CentOS-Stream - Base name=CentOS-Stream - Base
mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS mirrorlist=http://mirrorlist.centos.org/?release=8-stream&arch=$basearch&repo=BaseOS
gpgcheck=0 gpgcheck=0

9
diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
View File

@ -140,10 +140,13 @@ function _install_repos {
# ${TMPDIR}/yum-$USER-random. Since we don't need this once the # ${TMPDIR}/yum-$USER-random. Since we don't need this once the
# initial download happens, redirect TMPDIR for this call so we # initial download happens, redirect TMPDIR for this call so we
# can clean it up nicely # can clean it up nicely
#
# Note that the $releasever for centos-stream is just the major
# version. There is another variable "$stream" that we don't pass
local temp_tmp local temp_tmp
temp_tmp=$(mktemp -d) temp_tmp=$(mktemp -d)
TMPDIR=${temp_tmp} ${HOST_YUM_DOWNLOADER} --verbose \ TMPDIR=${temp_tmp} ${HOST_YUM_DOWNLOADER} --verbose \
--releasever=${DIB_RELEASE} \ --releasever=${DIB_RELEASE/-*/} \
--setopt=reposdir=$repo \ --setopt=reposdir=$repo \
--setopt=cachedir=$temp_tmp \ --setopt=cachedir=$temp_tmp \
--destdir=$WORKING \ --destdir=$WORKING \
@ -205,8 +208,8 @@ function _install_pkg_manager {
# the yumdownloader calls above in _install_repos want to use # the yumdownloader calls above in _install_repos want to use
# ~/.rpmdb/ ... there is nothing in the build-system /var/lib/rpm! # ~/.rpmdb/ ... there is nothing in the build-system /var/lib/rpm!
# #
# Another issue we hit is having to set --releasedir here. yum # Another issue we hit is having to set --releasever here. yum
# determines $releasevar based on (more or less) "rpm -q # determines $releasever based on (more or less) "rpm -q
# --whatprovides $distroverpkg". By default, this is # --whatprovides $distroverpkg". By default, this is
# "redhat-release" (fedora-release provides redhat-release) but # "redhat-release" (fedora-release provides redhat-release) but
# some platforms like CentOS override it in /etc/yum.conf (to # some platforms like CentOS override it in /etc/yum.conf (to

2
roles/dib-setup-gate-mirrors/templates/centos-minimal/8-stream/appstream.repo.j2
View File

@ -1,5 +1,5 @@
[Stream-AppStream] [Stream-AppStream]
name=CentOS-Stream - AppStream name=CentOS-Stream - AppStream
baseurl=https://{{ mirror_fqdn }}/centos/$releasever/AppStream/$basearch/os/ baseurl=https://{{ mirror_fqdn }}/centos/8-stream/AppStream/$basearch/os/
gpgcheck=0 gpgcheck=0

2
roles/dib-setup-gate-mirrors/templates/centos-minimal/8-stream/base.repo.j2
View File

@ -1,5 +1,5 @@
[Stream-BaseOS] [Stream-BaseOS]
name=CentOS-Stream - Base name=CentOS-Stream - Base
baseurl=https://{{ mirror_fqdn }}/centos/$releasever/BaseOS/$basearch/os/ baseurl=https://{{ mirror_fqdn }}/centos/8-stream/BaseOS/$basearch/os/
gpgcheck=0 gpgcheck=0