From ff3cf3fe7142ba4f404708202dacb56d6c049384 Mon Sep 17 00:00:00 2001 From: George T Kramer Date: Thu, 25 Oct 2018 12:45:50 -0700 Subject: [PATCH] Make external repository usage optional Making external repository usage optional based on how it's defined or not defined in parameter.sh so users do not need to edit any script besides this one. Signed-off-by: George T Kramer --- koji-setup/bootstrap-build.sh | 4 +++- koji-setup/parameters.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koji-setup/bootstrap-build.sh b/koji-setup/bootstrap-build.sh index 25203e1..66824c1 100755 --- a/koji-setup/bootstrap-build.sh +++ b/koji-setup/bootstrap-build.sh @@ -8,7 +8,9 @@ sudo -u kojiadmin koji add-tag --parent dist-"$TAG_NAME" --arches "x86_64" dist- sudo -u kojiadmin koji add-group dist-"$TAG_NAME"-build build sudo -u kojiadmin koji add-group dist-"$TAG_NAME"-build srpm-build sudo -u kojiadmin koji add-target dist-"$TAG_NAME" dist-"$TAG_NAME"-build -#sudo -u kojiadmin koji add-external-repo -t dist-"$TAG_NAME"-build dist-"$TAG_NAME"-external-repo "$EXTERNAL_REPO" +if [[ -n "$EXTERNAL_REPO" ]]; then + sudo -u kojiadmin koji add-external-repo -t dist-"$TAG_NAME"-build dist-"$TAG_NAME"-external-repo "$EXTERNAL_REPO" +fi sudo -u kojiadmin koji taginfo dist-"$TAG_NAME"-build sudo -u kojiadmin koji add-group-pkg dist-"$TAG_NAME"-build build autoconf automake automake-dev binutils bzip2 clr-rpm-config coreutils diffutils g++ gawk gcc gcc-dev gettext gettext-bin git glibc-dev glibc-locale glibc-utils grep gzip hostname lib6-locale libc6-dev libcap libgcc-s-dev libstdc++-dev libtool libtool-dev linux-libc-headers linux-libc-headers-dev m4 make netbase nss-altfiles patch pigz pkg-config pkg-config-dev rpm-build sed sed-doc shadow systemd-libs tar unzip which xz sudo -u kojiadmin koji add-group-pkg dist-"$TAG_NAME"-build srpm-build coreutils cpio curl-bin git glibc-utils grep gzip make pigz rpm-build sed shadow tar unzip wget xz diff --git a/koji-setup/parameters.sh b/koji-setup/parameters.sh index 3c99e27..f385e12 100644 --- a/koji-setup/parameters.sh +++ b/koji-setup/parameters.sh @@ -7,5 +7,5 @@ export KOJI_MASTER_FQDN=$(hostname -f) export KOJI_SLAVE_FQDN="$KOJI_MASTER_FQDN" export KOJI_DIR=/srv/koji export CGIT_FQDN="$KOJI_MASTER_FQDN" -export EXTERNAL_REPO=https://cdn.download.clearlinux.org/current/\$arch/os/ +#export EXTERNAL_REPO=https://cdn.download.clearlinux.org/releases/"$(curl https://download.clearlinux.org/latest)"/clear/\$arch/os/ export TAG_NAME=clear