From b27f3c18811cf739a70d9ba6f5f5695a5b76610f Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Sun, 15 Oct 2023 11:22:13 +1100 Subject: [PATCH] add in sme10 --- install-koji-farm.sh | 2 +- koji-setup/koji-bootstrap-build.sh | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/install-koji-farm.sh b/install-koji-farm.sh index 3c09a1e..f6f7df1 100644 --- a/install-koji-farm.sh +++ b/install-koji-farm.sh @@ -105,7 +105,7 @@ done HTTPD_USER=apache HTTPD_DOCUMENT_ROOT=/var/www/html KOJI_DIR="/mnt/koji" -TAG_NAME='smeos11 smecontribs11' +TAG_NAME='smeos10 smecontribs10 smeos11 smecontribs11' KOJI_PKI_DIR=/etc/pki/koji RPM_ARCH="x86_64" KOJID_CAPACITY=16 diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index eaf3a32..f079ac4 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -60,7 +60,11 @@ if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then fi for TAG in ${TAG_NAME} ; do sudo -u kojiadmin koji add-tag dist-"$TAG" - sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager=dnf + if [[ $TAG == "smeos10" || $TAG == "smecontribs10" ]] ; then + sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager=yum + else + sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager=dnf + fi if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then sudo -u kojiadmin koji list-pkgs --quiet | xargs sudo -u kojiadmin koji add-pkg --owner kojiadmin dist-"$TAG" sudo -u kojiadmin koji list-untagged | xargs -n 1 -P 100 sudo -u kojiadmin koji call tagBuildBypass dist-"$TAG" > /dev/null @@ -71,7 +75,25 @@ for TAG in ${TAG_NAME} ; do sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build build autoconf automake automake-dev binutils bzip2 clr-rpm-config coreutils cpio diffutils elfutils file gawk gcc gcc-dev gettext gettext-bin git glibc-dev glibc-locale glibc-utils grep gzip hostname libc6-dev libcap libtool libtool-dev linux-libc-headers m4 make netbase nss-altfiles patch pigz pkg-config pkg-config-dev rpm sed shadow systemd-lib tar unzip 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 - if [[ -n "$EXTERNAL_REPO" ]]; then + if [[ $TAG == "smeos10" || $TAG == "smecontribs10" ]] ; then + 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/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build smeupdates http://buildsys.koozali.org/build/10/smeupdates/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build fastrack http://buildsys.koozali.org/build/7/fastrack/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build opt1 http://buildsys.koozali.org/build/7/opt1/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build opt2 http://buildsys.koozali.org/build/7/opt2/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build opt3 http://buildsys.koozali.org/build/7/opt3/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build epel http://download.fedoraproject.org/pub/epel/7/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build epel http://repo.openg=fusion.net/centos7-\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build openfusion http://repo.openfusion.net/centos7-\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build rpmfusion http://download1.rpmfusion.org/free/el/updates/7/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build sclo-sclo http://mirror.centos.org/centos/7/sclo/\$arch/sclo + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build sclo-rh http://mirror.centos.org/centos/7/sclo/\$arch/rh + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build buildsys-core http://buildsys.koozali.org/build/10/smeserver-core/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build buildsys-contribs http://buildsys.koozali.org/build/10/smeserver-contribs/\$arch/ + sudo - u kojiadmin koji add-external-repo -t dist-smeos10-build groups http://buildsys.koozali.org/build/10/smeserver-groups/\$arch/ + elif [[ -n "$EXTERNAL_REPO" ]]; then sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build dist-"$TAG"-external-repo "$EXTERNAL_REPO" fi sudo -u kojiadmin koji regen-repo dist-"$TAG"-build