[releng] move the mock config definition to the common script

Dennis Gilmore ausil at fedoraproject.org
Fri May 15 13:02:28 UTC 2015


commit 97e49090127c43d461c510fdc18e7baa469f5893
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri May 15 08:01:00 2015 -0500

    move the mock config definition to the common script
    
    Signed-off-by: Dennis Gilmore <dennis at ausil.us>

 scripts/build-functions.sh |    3 +++
 scripts/buildbranched      |    1 -
 scripts/buildrawhide       |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 2a3bcd5..b89228a 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -20,6 +20,9 @@ FROM="${ARCH} ${FROM}"
 RSYNCPREFIX=""
 }
 
+# set the Mockconfig to use for composing, all arches except ppc run on x86 boxes
+MOCKCONFIG="fedora-${DIST}-compose-i386"
+
 [ "$ARCH" == "ppc" ] && {
 MOCKCONFIG="fedora-${DIST}-compose-ppc64"
 
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 532b836..6dcc370 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -22,7 +22,6 @@ EXPANDARCH=""
 DEPOPTS="--treename F-$BRANCHED"
 MASHOPTS=""
 MOCK="/usr/bin/mock"
-MOCKCONFIG="fedora-${DIST}-compose-i386"
 TOMAIL="devel at lists.fedoraproject.org test at lists.fedoraproject.org"
 SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
 FROM="Fedora Branched Report <rawhide at fedoraproject.org>"
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index bf1bd2c..efa4935 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -22,7 +22,6 @@ EXPANDARCH=""
 DEPOPTS=""
 MASHOPTS=""
 MOCK="/usr/bin/mock"
-MOCKCONFIG="fedora-${DIST}-compose-i386"
 TOMAIL="devel at lists.fedoraproject.org test at lists.fedoraproject.org"
 SUBJECT='rawhide report: '$DATE' changes'
 FROM="Fedora Rawhide Report <rawhide at fedoraproject.org>"


More information about the rel-eng mailing list