Update mock-core-configs to 37.1-1

This commit is contained in:
Pavel Raiskup 2022-02-04 08:53:10 +01:00
parent 66a95cbcbb
commit d159e44c92
2 changed files with 31 additions and 25 deletions

View File

@ -1,5 +1,5 @@
Name: mock-core-configs Name: mock-core-configs
Version: 37 Version: 37.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Mock core config files basic chroots Summary: Mock core config files basic chroots
@ -44,28 +44,6 @@ Config files which allow you to create chroots for:
%build %build
HOST=none
%if 0%{?fedora}
HOST="fedora-%{fedora}"
%endif
%if 0%{?rhel}
HOST="rhel-%{rhel}"
%endif
# 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/mock/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 %install
@ -123,7 +101,30 @@ if [ -s /etc/mageia-release ]; then
else else
mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))") mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))")
fi fi
cfg=%{?fedora:fedora}%{?rhel:epel}%{?mageia:mageia}-$ver-${mock_arch}.cfg
cfg=unknown-distro
%if 0%{?fedora}
cfg=fedora-$ver-$mock_arch.cfg
%endif
%if 0%{?rhel}
# Being installed on RHEL, or a RHEL fork. Detect it.
distro_id=$(. /etc/os-release; echo $ID)
case $distro_id in
centos)
# This package is EL8+, and there's only CentOS Stream now.
distro_id=centos-stream
;;
almalinux)
# AlmaLinux configs look like 'alma+epel'
distro_id=alma
;;
esac
cfg=$distro_id+epel-$ver-$mock_arch.cfg
%endif
%if 0%{?mageia}
cfg=mageia-$ver-$mock_arch.cfg
%endif
if [ -e %{_sysconfdir}/mock/$cfg ]; then if [ -e %{_sysconfdir}/mock/$cfg ]; then
if [ "$(readlink %{_sysconfdir}/mock/default.cfg)" != "$cfg" ]; then if [ "$(readlink %{_sysconfdir}/mock/default.cfg)" != "$cfg" ]; then
ln -s $cfg %{_sysconfdir}/mock/default.cfg 2>/dev/null || ln -s -f $cfg %{_sysconfdir}/mock/default.cfg.rpmnew ln -s $cfg %{_sysconfdir}/mock/default.cfg 2>/dev/null || ln -s -f $cfg %{_sysconfdir}/mock/default.cfg.rpmnew
@ -140,6 +141,11 @@ fi
%ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
%changelog %changelog
* Fri Feb 04 2022 Pavel Raiskup <praiskup@redhat.com> 37.1-1
- drop EL7 related %%build hack
- link default.cfg file to the right EL N config file
- Add centos-stream+epel-8 configs
* Wed Feb 02 2022 Pavel Raiskup <praiskup@redhat.com> 37-1 * Wed Feb 02 2022 Pavel Raiskup <praiskup@redhat.com> 37-1
- move CentOS/EPEL 8 configs to eol/ - move CentOS/EPEL 8 configs to eol/
- Fedora 36 branching, Rawhide == Fedora 37 now - Fedora 36 branching, Rawhide == Fedora 37 now

View File

@ -1 +1 @@
SHA512 (mock-core-configs-37.tar.gz) = 137a3d8de7fab7c46556ebd0c4805d48218471ed12ad6fa9d0e2acf6dca89de4accfb74dbdadcd83c732e5ffa70d6d0df3db0f87683a8e4189f11a6248e60ac6 SHA512 (mock-core-configs-37.1.tar.gz) = 9df88407af742c96500f4e71e434159c2652280563119392ffd7b5a499994ec6802fb0fb02ed17a3f8a9c081b5bc826ac77fcefab51f3b5f2ec17e1b56d16506