From c47e4fca254482f546acb03da573096e8bfb490e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Jul 2025 16:24:52 +0200 Subject: use epel-rpm-macros --- el10a.tpl | 2 +- el10x.tpl | 2 +- el8a.tpl | 4 +--- el8x.tpl | 4 +--- el9a.tpl | 4 +--- el9x.tpl | 4 +--- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/el10a.tpl b/el10a.tpl index 86fd235..fea6b06 100644 --- a/el10a.tpl +++ b/el10a.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'aarch64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy' +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy epel-rpm-macros' config_opts['dist'] = 'el10' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '10' diff --git a/el10x.tpl b/el10x.tpl index f638776..110f24c 100644 --- a/el10x.tpl +++ b/el10x.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'x86_64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy' +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy epel-rpm-macros' config_opts['dist'] = 'el10' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '10' diff --git a/el8a.tpl b/el8a.tpl index cd64166..b752543 100644 --- a/el8a.tpl +++ b/el8a.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'aarch64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz epel-rpm-macros' config_opts['dist'] = 'el8' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '8' @@ -65,13 +65,11 @@ name=epel #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=aarch64 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=aarch64 #baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/aarch64/ -exclude=epel-rpm-macros enabled=1 [epel-playground] name=epel mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=playground-epel8&arch=aarch64 -exclude=epel-rpm-macros includepkgs=GeoIP* enabled=0 diff --git a/el8x.tpl b/el8x.tpl index f1dbb29..48e9b37 100644 --- a/el8x.tpl +++ b/el8x.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'x86_64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install platform-python bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' +config_opts['chroot_setup_cmd'] = 'install platform-python bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz epel-rpm-macros' config_opts['dist'] = 'el8' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '8' @@ -64,13 +64,11 @@ name=epel #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=x86_64 #baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/ -exclude=epel-rpm-macros enabled=1 [epel-playground] name=epel mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=playground-epel8&arch=x86_64 -exclude=epel-rpm-macros includepkgs=GeoIP* enabled=0 diff --git a/el9a.tpl b/el9a.tpl index b44bc71..d350c7c 100644 --- a/el9a.tpl +++ b/el9a.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'aarch64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy' +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy epel-rpm-macros' config_opts['dist'] = 'el9' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '9' @@ -66,13 +66,11 @@ name=epel #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=aarch64 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=aarch64 #baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/aarch64/ -exclude=epel-rpm-macros enabled=1 [epel-testing] name=epel mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel9&arch=aarch64 -exclude=epel-rpm-macros enabled=0 [remi] diff --git a/el9x.tpl b/el9x.tpl index ab1be45..26871a3 100644 --- a/el9x.tpl +++ b/el9x.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['target_arch'] = 'x86_64' #config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy' +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz remi-crypto-legacy epel-rpm-macros' config_opts['dist'] = 'el9' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '9' @@ -64,13 +64,11 @@ name=epel #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-9&arch=x86_64 #metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=x86_64 baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/ -exclude=epel-rpm-macros enabled=1 [epel-testing] name=epel-testing mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel9&arch=x86_64 -exclude=epel-rpm-macros enabled=0 [remi] -- cgit