LINARO: PACKAGING: add armhf to mkflavourbranches script

Signed-off-by: John Rigby <john.rigby@linaro.org>

1 files changed, 29 insertions, 25 deletions

diff --git a/debian.linaro/scripts/mkflavourbranches b/debian.linaro/scripts/mkflavourbranches
index 40e20914440..c10d47299a4 100755
--- a/debian.linaro/scripts/mkflavourbranches
+++ b/debian.linaro/scripts/mkflavourbranches
@@ -50,41 +50,45 @@ function do_flavour_branches {
         sed -i -e "s/^${source_pkg_name}/${source_pkg_name}-$flavour/" ${DEBIAN}/changelog
         git add ${DEBIAN}/changelog
 
-        for otherflavour in ${otherflavours[*]}; do
-            git rm ${DEBIAN}/config/armel/config.flavour.${common_flavour_prefix}-$otherflavour
-            git rm ${DEBIAN}/control.d/vars.${common_flavour_prefix}-$otherflavour
-            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" = "$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
-                sed -i -e "s/do_common_headers_indep.*=.*/do_common_headers_indep = true/" ${DEBIAN}/rules.d/armel.mk
-                sed -i -e "s/do_tools.*=.*/do_tools = false/" ${DEBIAN}/rules.d/armel.mk
-            fi
-            git add ${DEBIAN}/rules.d/armel.mk
-        done
-
-        git status
-        if [ "$flavour" != "$sharedflavour" ]; then
-            fakeroot ./debian/rules clean
-            fakeroot ./debian/rules updateconfigs
-            cat >> debian.linaro/config/armel/config.flavour.${common_flavour_prefix}-$flavour << END
+	for arm in armel armhf; do
+	    for otherflavour in ${otherflavours[*]}; do
+		git rm ${DEBIAN}/config/${arm}/config.flavour.${common_flavour_prefix}-$otherflavour
+		git rm ${DEBIAN}/control.d/vars.${common_flavour_prefix}-$otherflavour
+		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/${arm}.mk
+		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/${arm}.mk
+		    sed -i -e "s/do_tools.*=.*/do_tools = true/" ${DEBIAN}/rules.d/${arm}.mk
+		else
+		    sed -i -e "s/do_common_headers_indep.*=.*/do_common_headers_indep = true/" ${DEBIAN}/rules.d/${arm}.mk
+		    sed -i -e "s/do_tools.*=.*/do_tools = false/" ${DEBIAN}/rules.d/${arm}.mk
+		fi
+		git add ${DEBIAN}/rules.d/${arm}.mk
+	    done
+	done
+
+	for arm in armel armhf; do
+	    git status
+	    if [ "$flavour" != "$sharedflavour" ]; then
+		fakeroot ./debian/rules clean
+		fakeroot ./debian/rules updateconfigs
+		cat >> debian.linaro/config/${arm}/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/${arm}/config.common.${arm} << 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
-        fi
+		git commit -s -m "LINARO: Cleanup configs after removing other flavours" debian.linaro/config
+	    fi
+	done
         git commit -s -m "LINARO: Linaro-${source_pkg_version} $flavour only"
         tagname="Linaro-${source_pkg_version}-${flavour}-only"
 	tagname=$(echo $tagname | sed 's/~/-/g')