From 63353183b3da4384ba11b0bb22388dcc29dee3d4 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Mon, 6 Nov 2023 18:16:16 +1100 Subject: [PATCH] fix external repos for sme11 & sme12 --- koji-setup/koji-bootstrap-build.sh | 32 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index d098c55..9f3313b 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -113,9 +113,19 @@ done # Releases sme11 and sme12 are based on Rocky 8 PKGMANAGER="dnf" -BOOTSTRAPIMAGE="rocky:8" +BOOTSTRAPIMAGE="rockylinux:8" EL="8" 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 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/ +# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=AppStream-8 +sudo -u kojiadmin koji add-external-repo powertools$EL https://dl.rockylinux.org/pub/rocky/$EL/PowerTools/x86_64/os/ +# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=PowerTools-$EL +sudo -u kojiadmin koji add-external-repo epel$EL https://muug.ca/mirror/fedora-epel/$EL/Everything/x86_64/ +# mirrorList=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64 +sudo -u kojiadmin koji add-external-repo openfusion$EL http://repo.openfusion.net/centos$EL-x86_64 +sudo -u kojiadmin koji add-external-repo rpmfusion$EL http://download1.rpmfusion.org/free/el/updates/$EL/x86_64 for RELEASE in 11 12 ; do # Setup the os repo - parent of others who will inherit most properties TAG="sme$RELEASE-os" @@ -127,18 +137,14 @@ for RELEASE in 11 12 ; do sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build 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 add-group-pkg dist-"$TAG"-build build 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 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 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 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 -t dist-"$TAG"-build appstream https://dl.rockylinux.org/pub/rocky/$EL/AppStream/x86_64/os/ -# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=AppStream-8 - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build powertools https://dl.rockylinux.org/pub/rocky/$EL/PowerTools/x86_64/os/ -# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=PowerTools-$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build epel https://muug.ca/mirror/fedora-epel/8/Everything/x86_64/ -# mirrorList=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64 - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build openfusion http://repo.openfusion.net/centos$EL-x86_64 - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build rpmfusion http://download1.rpmfusion.org/free/el/updates/$EL/x86_64 + 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 regen-repo dist-"$TAG"-build --nowait # Only build for smeos and smecontribs - others are staging TAG="sme$RELEASE-contribs" @@ -150,7 +156,7 @@ 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 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 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 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