From f7aeb58ef3fca1339ad1965b9d0e0025ad4b28dc Mon Sep 17 00:00:00 2001
From: John Rigby <john.rigby@linaro.org>
Date: Fri, 19 Aug 2011 14:39:27 -0600
Subject: LINARO: New shared flavour for arch headers and tools

First flavour is no longer special.  Now the arch headers and
tools can be rebuilt on their own.

Signed-off-by: John Rigby <john.rigby@linaro.org>
---
 debian.linaro/scripts/mkflavourbranches | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian.linaro/scripts/mkflavourbranches b/debian.linaro/scripts/mkflavourbranches
index 1469aa57d33..9df01ddae8f 100755
--- a/debian.linaro/scripts/mkflavourbranches
+++ b/debian.linaro/scripts/mkflavourbranches
@@ -29,12 +29,13 @@ function cleanup {
     git clean -d -f -x
 }
 
-flavours=(${DEBIAN}/control.d/vars.*)
+flavours=(shared ${DEBIAN}/control.d/vars.*)
 flavours=(${flavours[*]##*vars.${common_flavour_prefix}-})
-firstflavour=${flavours[0]}
+sharedflavour=${flavours[0]}
 
 function do_flavour_branches {
     for flavour in ${flavours[*]}; do
+        echo sharedflavour is $sharedflavour
         echo flavour is $flavour
         otherflavours=(${flavours[*]##$flavour})
         echo otherflavours are ${otherflavours[*]}
@@ -52,8 +53,8 @@ function do_flavour_branches {
             sed -i -e "/${common_flavour_prefix}-$otherflavour/d" ${DEBIAN}/d-i/kernel-versions.in
             git add ${DEBIAN}/d-i/kernel-versions.in
             sed -i -e "s/${common_flavour_prefix}-$otherflavour//" ${DEBIAN}/rules.d/armel.mk
-            if [ "$flavour" = "$firstflavour" ]; then
-                # for first flavour only make the common header and tools deb
+            if [ "$flavour" = "$sharedflavour" ]; then
+                # shared is where arch headers and tools debs are made
                 sed -i -e "s/do_common_headers_indep.*=.*/do_common_headers_indep = false/" ${DEBIAN}/rules.d/armel.mk
                 sed -i -e "s/do_tools.*=.*/do_tools = true/" ${DEBIAN}/rules.d/armel.mk
             else
@@ -64,21 +65,23 @@ function do_flavour_branches {
         done
 
         git status
-        fakeroot ./debian/rules clean
-        fakeroot ./debian/rules updateconfigs
-	cat >> debian.linaro/config/armel/config.flavour.${common_flavour_prefix}-$flavour << END
+        if [ "$flavour" != "$sharedflavour" ]; then
+            fakeroot ./debian/rules clean
+            fakeroot ./debian/rules updateconfigs
+            cat >> debian.linaro/config/armel/config.flavour.${common_flavour_prefix}-$flavour << END
 #
 # Single flavour kernel packages have no flavour dependent config options
 # look in ../config.common.ubuntu for full config
 #
 END
-	cat >> debian.linaro/config/armel/config.common.armel << END
+            cat >> debian.linaro/config/armel/config.common.armel << END
 #
 # Single flavour kernel packages have no arch dependent config options
 # look in ../config.common.ubuntu for full config
 #
 END
-        git commit -s -m "LINARO: Cleanup configs after removing other flavours" debian.linaro/config
+            git commit -s -m "LINARO: Cleanup configs after removing other flavours" debian.linaro/config
+        fi
         git commit -s -m "LINARO: Linaro-${source_pkg_version} $flavour only"
         tagname="Linaro-${source_pkg_version}-${flavour}-only"
         git tag -f -s -m "$tagname" $tagname HEAD
@@ -100,7 +103,6 @@ echo Using $working_branch as working branch name
 
 remote_push=$1
 
-
 orig_branch=$(git symbolic-ref HEAD 2>/dev/null)
 orig_branch=${orig_branch##refs/heads/}
 
@@ -118,6 +120,4 @@ do_flavour_branches
 git checkout $orig_branch
 git branch -D $working_branch
 
-
 cleanup
-
-- 
cgit v1.2.3