[releng] buildbranched/rawhide: Introduce $SPIN_KICKSTARTS_BRANCH

Till Maas till at fedoraproject.org
Tue Sep 30 20:47:57 UTC 2014


commit b1d5c2380ca81d896dc28593b3fb8f56ba22615c
Author: Till Maas <opensource at till.name>
Date:   Tue Sep 30 22:48:45 2014 +0200

    buildbranched/rawhide: Introduce $SPIN_KICKSTARTS_BRANCH

 scripts/buildbranched |    3 ++-
 scripts/buildrawhide  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 86071dc..a66369f 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -11,6 +11,7 @@ ARCH=$2
 BRANCHED="21"
 DIST=branched
 COMPSFILE="comps-f${BRANCHED}.xml"
+SPIN_KICKSTARTS_BRANCH="f${BRANCHED}"
 
 TREEPREFIX="/pub/fedora/linux"
 RSYNC_EXTRA_OPTS="--link-dest=$TREEPREFIX/development/rawhide/"
@@ -209,7 +210,7 @@ log "started checking out spin-kickstarts"
 pushd ../
 git clone https://git.fedorahosted.org/git/spin-kickstarts.git
 pushd spin-kickstarts
-git checkout f$BRANCHED
+git checkout "${SPIN_KICKSTARTS_BRANCH}"
 log "finished checking out spin-kickstarts"
 log "started building live/arm/cloud images"
 ../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index e88debf..0de0d6c 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -11,6 +11,7 @@ ARCH=$2
 BRANCHED=rawhide
 DIST=rawhide
 COMPSFILE=comps-rawhide.xml
+SPIN_KICKSTARTS_BRANCH="master"
 
 TREEPREFIX="/pub/fedora/linux"
 RSYNC_EXTRA_OPTS=
@@ -201,7 +202,7 @@ log "started checking out spin-kickstarts"
 pushd ../
 git clone https://git.fedorahosted.org/git/spin-kickstarts.git
 pushd spin-kickstarts
-#git checkout f$BRANCHED
+git checkout "${SPIN_KICKSTARTS_BRANCH}"
 log "finished checking out spin-kickstarts"
 log "started building live/arm/cloud images"
 ../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED


More information about the rel-eng mailing list