packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci/libbuild.sh: drop yum/CentOS support 

`dnf` is present in all the platforms we care about now, and the CentOS
bit is out of date. We can re-add it if we add e.g. C[89]S support with
the updated list of packages.

Motivated by noticing that the `yum` symlink isn't always present.
This commit is contained in:
Jonathan Lebon 2022-02-03 13:08:22 -05:00
parent 2de6abfcd0
commit 8e445cb957
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ci/libbuild.sh
View File

@ -6,7 +6,7 @@ OS_ID=$(. /etc/os-release; echo $ID)
OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID) OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
pkg_upgrade() { pkg_upgrade() {
yum -y distro-sync dnf -y distro-sync
} }
make() { make() {
@ -20,7 +20,7 @@ build() {
} }
pkg_install() { pkg_install() {
yum -y install "$@" dnf -y install "$@"
} }
pkg_install_if_os() { pkg_install_if_os() {
@ -39,25 +39,15 @@ pkg_install_buildroot() {
# https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89 # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89
# https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups
if rpm -q fedora-release-container; then if rpm -q fedora-release-container; then
yum -y swap fedora-release{-container,} dnf -y swap fedora-release{-container,}
fi fi
pkg_install dnf-plugins-core @buildsys-build;; pkg_install dnf-plugins-core @buildsys-build;;
centos) pkg_install yum-utils
# Base buildroot, copied from the mock config sadly
pkg_install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ \
grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar \
unzip util-linux which xz;;
*) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";;
esac esac
} }
pkg_builddep() { pkg_builddep() {
# This is sadly the only case where it's a different command dnf builddep -y "$@"
if test -x /usr/bin/dnf; then
dnf builddep -y "$@"
else
yum-builddep -y "$@"
fi
} }
# Install both build and runtime dependencies for $pkg # Install both build and runtime dependencies for $pkg