diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 9392d1b..c3b6f2f 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -62,15 +62,19 @@ fi sme10-os is the parent - all other sme10 repos will inherit most of this... RELEASE=10 PKGMANAGER = "yum" +BOOTSTRAPIMAGE = "centos:7" +CHROOTSETUPCMD = ' install @buildsys-build @buildsys scl-utils-build python27-build ' TAG = "sme$RELEASE-os" sudo -u kojiadmin koji add-tag dist-"$TAG" sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager=$PKGMANAGER sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches "$RPM_ARCH" dist-"$TAG"-build sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build +sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" +sudo -u kojiadmin koji edit-tage 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 @buildsys-build @buildsys scl-utils-build python27-build -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 sed shadow tar unzip wget 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 add-external-repo -t dist-smeos10-build os http://buildsys.koozali.org/build/7/os/\$arch/ sudo -u kojiadmin koji add-external-repo -t dist-smeos10-build updates http://buildsys.koozali.org/build/7/updates/\$arch/ sudo -u kojiadmin koji add-external-repo -t dist-smeos10-build smeos http://buildsys.koozali.org/build/10/smeos/\$arch/ @@ -96,6 +100,8 @@ for REPO in (contribs addons updates updates-testing testing) ; do done # Releases sme11 and sme12 are based on Rocky 8 PKGMANAGER = "dnf" +BOOTSTRAPIMAGE = "rocky:8" +CHROOTSETUPCMD = ' install @buildsys-build @buildsys scl-utils-build python27-build ' for RELEASE in (11 12) ; do # Setup the os repo - parent of others who will inherit most properties TAG = "sme$RELEASE-os" @@ -105,6 +111,8 @@ for RELEASE in (11 12) ; do sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build 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 edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" + sudo -u kojiadmin koji edit-tage 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 srpm-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 add-external-repo -t dist-smeos10-build os http://buildsys.koozali.org/build/7/os/\$arch/