From d51e3546232ce96d8d6cdea4d6b2a93f83940944 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Mon, 6 Nov 2023 20:46:28 +1100 Subject: [PATCH] rpm-build not rpmbuild --- koji-setup/koji-bootstrap-build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index e7643c3..ca4651d 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -125,7 +125,7 @@ EL="8" DIST= ".el$EL.sme" PKGMANAGER="dnf" BOOTSTRAPIMAGE="rockylinux:$EL" -CHROOTSETUPCMD=' install epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpmbuild sed shadow-utils tar unzip util-linux which yum-utils xz ' +CHROOTSETUPCMD=' install 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-external-repo os$EL https://dl.rockylinux.org/pub/rocky/$EL/BaseOS/x86_64/os/ # mirrorList=http://mirrors.rockylinux.org/mirrorlist?release=$EL&arch=x86_64&repo=BaseOS-$EL sudo -u kojiadmin koji add-external-repo appstream$EL https://dl.rockylinux.org/pub/rocky/$EL/AppStream/x86_64/os/ @@ -152,8 +152,8 @@ for RELEASE in 11 12 ; do sudo -u kojiadmin koji edit-tag dist-"$TAG" -x rpm.macro.packager=$PACKAGER sudo -u kojiadmin koji edit-tag dist-"$TAG" -x rpm.macro.vendor=$VENDOR sudo -u kojiadmin koji edit-tag dist-"$TAG" -x rpm.macro.dist=$DIST - 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 rpmbuild 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 curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm rpmbuild sed shadow tar unzip wget xz + 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 curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm rpm-build sed shadow 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 @@ -171,8 +171,8 @@ for RELEASE in 11 12 ; do 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 rpmbuild sed shadow-utils tar unzip util-linux which yum-utils xz - sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build rpmbuild coreutils cpio curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz + 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 curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz 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