From 879bff3a4c2422467d533929a8b74bb63b8faaa9 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Wed, 6 Mar 2024 17:03:20 +1100 Subject: [PATCH] add -m bare to el8 external repos --- koji-setup/koji-bootstrap-build.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 5e4067b..b50fcf4 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -158,12 +158,12 @@ for RELEASE in 11 12 ; do sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build os$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build appstream$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build powertools$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build epel$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build openfusion$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build rpmfusion$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait # Only build for smeos and smecontribs - others are staging TAG="sme$RELEASE-contribs" @@ -172,11 +172,17 @@ for RELEASE in 11 12 ; do sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build sudo -u kojiadmin koji add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10 sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" - sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" +# sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" sudo -u kojiadmin koji add-group dist-"$TAG"-build build sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio elfutils file grep gzip make pigz rpm sed tar unzip wget xz + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait # setup the rest of the repos for REPO in addons updates updates-testing testing ; do