From a3fba8ae4530a8d4ab38d2244176f77e3edf1773 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 18 Jan 2021 16:00:18 +0100 Subject: [PATCH] Update mock-core-configs to 33.4-1 --- mock-core-configs.spec | 32 +++++++++++++++++++++++--------- sources | 2 +- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/mock-core-configs.spec b/mock-core-configs.spec index b0126e2..641b557 100644 --- a/mock-core-configs.spec +++ b/mock-core-configs.spec @@ -1,5 +1,5 @@ Name: mock-core-configs -Version: 33.3 +Version: 33.4 Release: 1%{?dist} Summary: Mock core config files basic chroots @@ -53,7 +53,6 @@ Config files which allow you to create chroots for: %build -cd etc/host-overrides HOST=none %if 0%{?fedora} HOST="fedora-%{fedora}" @@ -62,13 +61,20 @@ HOST="fedora-%{fedora}" HOST="rhel-%{rhel}" %endif -if [ -d "$HOST" ]; then - pushd "$HOST" - for i in *.cfg; do - cat "$i" >> "../../mock/$i" - done - popd -fi +# host overrides +case $HOST in + rhel-7) + # RPM on EL7 doesn't link against libzstd, and newer Fedora is compressed + # using ZSTD. We need to enable bootstrap image here to be able to + # initialize the Fedora bootstrap chroot. + for config in etc/fedora-*-*.cfg; do + version=$(echo "$config" | cut -d- -f2) + if test $version = rawhide || test $version -ge 31; then + echo "config_opts['use_bootstrap_image'] = True" >> "$config" + fi + done + ;; +esac %install @@ -144,6 +150,14 @@ fi %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg %changelog +* Mon Jan 18 2021 Pavel Raiskup 33.4-1 +- fix bootstrapping of newer Fedora on EL7 +- efine a bootstrap image for openSUSE Tumbleweed (ngompa13@gmail.com) +- use fully qualified paths for Fedora/CentOS/RHEL images (ngompa13@gmail.com) +- rename repoid for centos8 (msuchy@redhat.com) +- EOL CentOS 6 (msuchy@redhat.com) +- EOL Fedora 31 (msuchy@redhat.com) + * Fri Nov 20 2020 Pavel Raiskup 33.3-1 - ELN should use for build Everything repository (jkonecny@redhat.com) diff --git a/sources b/sources index 1c7c7af..2fcdff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-core-configs-33.3.tar.gz) = ba783cf834fc1066977448287b11b545008de4b72804cf965a6cb76e1f439e99688a2c653068ec6c302845c80b067ffb12c0d77477026207cca28766eba9774e +SHA512 (mock-core-configs-33.4.tar.gz) = 0bf7355d94c43c7414420be93f9a413b0bb19d5ba3692a1d5e41c7fb6b5aea12573e1a6823d49de1a5b01dc835640fc02de547e65761e841e105a319f5d79cfe