From 6f85299a71765792aa1fba579fb1c2ada2bc99f4 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Tue, 7 Nov 2023 19:46:43 +1100 Subject: [PATCH] move packager and vendor to kojid.conf --- koji-setup/koji-bootstrap-build.sh | 7 ------- koji-setup/koji-deploy-builder.sh | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 8cfbc07..907ef82 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -58,9 +58,6 @@ if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then rm -rf "$STAGING_RPM_DIR" "$HOME/.koji" fi -# Generic settings for smeserver -PACKAGER="Koozali.org " -VENDOR="Koozali.org " # Setup sme10 for building - based on centos 7 (el7) # sme10-os is the parent - all other sme10 repos will inherit most of this... RELEASE=10 @@ -77,8 +74,6 @@ sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG" -sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PKGMANAGER" dist-"$TAG" -sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" sudo -u kojiadmin koji add-group dist-"$TAG"-build build sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build @@ -149,8 +144,6 @@ for RELEASE in 11 12 ; do sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PKGMANAGER" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" 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 curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm rpm-build sed shadow tar unzip wget xz diff --git a/koji-setup/koji-deploy-builder.sh b/koji-setup/koji-deploy-builder.sh index f29efbb..eb80b71 100755 --- a/koji-setup/koji-deploy-builder.sh +++ b/koji-setup/koji-deploy-builder.sh @@ -69,6 +69,8 @@ allowed_scms=$KOJI_ALLOWED_SCMS cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem serverca = $KOJI_PKI_DIR/koji_ca_cert.crt mock_bootstrap_image=False +packager="Koozali.org " +vendor="Koozali.org " EOF if env | grep -q proxy; then