commit 51fd8c1eaea547141ac58721fbe233ff0f58f6d2 Author: Ralph Bean rbean@redhat.com Date: Thu Nov 13 15:30:02 2014 -0500
Drop cvs.
It seems unlikely that we would actually need it here.
scripts/build-functions.sh | 2 +- scripts/buildepelbeta | 2 +- scripts/mashcompose | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh index 04c1a69..b245c27 100644 --- a/scripts/build-functions.sh +++ b/scripts/build-functions.sh @@ -92,7 +92,7 @@ log "git clone of comps finished" log "mock init" $MOCK -r $MOCKCONFIG --uniqueext=$DATE --init log "mock install base packages" -$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink +$MOCK -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink if [[ "${DIST}" == "branched" ]] then # until we move to bodhi lets not be strict about the gpg keys diff --git a/scripts/buildepelbeta b/scripts/buildepelbeta index 8223a4d..efe2bb5 100755 --- a/scripts/buildepelbeta +++ b/scripts/buildepelbeta @@ -39,7 +39,7 @@ popd [ -f /mnt/koji/mash/epel-$DATE/logs/comps-epel7.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$DATE --init -mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview +mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview # Copy in the hosts file so that we get the right address for koji mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works mock -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/mash/epel7.mash /etc/mash/epel7.mash > /dev/null 2>&1 # this reports to fail, but actually works diff --git a/scripts/mashcompose b/scripts/mashcompose index 101db3d..5023797 100755 --- a/scripts/mashcompose +++ b/scripts/mashcompose @@ -47,7 +47,7 @@ popd [ -f $MASHDIR/comps-f$BRANCHED.xml ] || exit 1
mock -r $MOCKCONFIG --uniqueext=$COMPOSE --init -mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink +mock -r $MOCKCONFIG --uniqueext=$COMPOSE --no-clean --install koji yum createrepo make intltool findutils mash yum-utils rsync repoview hardlink # disable deltas mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|delta = True|delta = False|g' /etc/mash/branched.mash" mock -r $MOCKCONFIG --uniqueext=$COMPOSE --chroot "sed -i -e 's|[$BRANCHED]|[Everything]|g' /etc/mash/branched.mash"
rel-eng@lists.fedoraproject.org