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

Merge "yum-minimal: clean up release package installs"

Browse Source
This commit is contained in:
Zuul 2022-04-26 09:54:34 +00:00 committed by Gerrit Code Review
commit fb7db1b736
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,39 +85,24 @@ function _install_repos {
# (see above) so ... # (see above) so ...
packages="${DIB_YUM_MINIMAL_BOOTSTRAP_PACKAGES:-} " packages="${DIB_YUM_MINIMAL_BOOTSTRAP_PACKAGES:-} "
packages+="basesystem filesystem setup " packages+="basesystem filesystem setup "
if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -gt 29 ]]; then if [[ ${DISTRO_NAME} = fedora ]]; then
packages+="fedora-release-cloud fedora-release-common " packages+="fedora-release-cloud fedora-release-common "
elif [[ ${DISTRO_NAME} == 'centos' && ${DIB_RELEASE} = '9-stream' ]]; then packages+="fedora-repos fedora-gpg-keys"
packages+="bash glibc ncurses-libs " elif [[ ${DISTRO_NAME} = centos && ${DIB_RELEASE%-stream} -gt 7 ]]; then
elif [[ ${DISTRO_NAME} == 'openeuler' ]]; then
packages+="openEuler-release "
else
packages+="${DISTRO_NAME}-release "
fi
# Starting in F21 this was split into a separate package
if [[ ${DISTRO_NAME} == 'fedora' ]]; then
packages+="fedora-repos "
fi
# F27 started putting gpg keys into this separate package
if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -gt 26 ]]; then
packages+="fedora-gpg-keys "
fi
# CentOS 8.1 split repositories and GPG keys out into subpackages
if [[ ${DISTRO_NAME} = centos && ${DIB_RELEASE%-stream} -gt 7 ]]; then
packages+="centos-gpg-keys " packages+="centos-gpg-keys "
if [[ "$DIB_RELEASE" =~ (stream) ]]; then if [[ "$DIB_RELEASE" =~ (stream) ]]; then
packages+="centos-stream-release centos-stream-repos " packages+="centos-stream-release centos-stream-repos "
else else
packages+="centos-linux-release centos-linux-repos " packages+="centos-linux-release centos-linux-repos "
fi fi
fi elif [[ ${DISTRO_NAME} == 'openeuler' ]]; then
packages+="openEuler-release "
# For openEuler, install other required repos and gpy-keys packages.
if [[ ${DISTRO_NAME} == 'openeuler' ]]; then
packages+="openEuler-repos openEuler-gpg-keys " packages+="openEuler-repos openEuler-gpg-keys "
else
# NOTE(ianw) 2022-04-20 : can probably remove when we don't
# support centos 7, unlikely anything else ends up here at
# this point.
packages+="${DISTRO_NAME}-release "
fi fi
# By default, parent elements (fedora-minimal, centos-minimal) # By default, parent elements (fedora-minimal, centos-minimal)