Change configs to use cross-packaging branch of linaro-packaging tree

19 files changed, 30 insertions, 18 deletions

diff --git a/configs/arndale-3.7.cfg b/configs/arndale-3.7.cfg
index 16b37e9..89b99a4 100755
--- a/configs/arndale-3.7.cfg
+++ b/configs/arndale-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=arndale
 export nearby_git=~/reference-git
diff --git a/configs/arndale-3.7.cfg.rej b/configs/arndale-3.7.cfg.rej
new file mode 100644
index 0000000..feecc42
--- /dev/null
+++ b/configs/arndale-3.7.cfg.rej
@@ -0,0 +1,11 @@
+--- configs/arndale-3.7.cfg
++++ configs/arndale-3.7.cfg
+@@ -9,7 +9,7 @@
+ export distribution=quantal
+ export kernel_branch=linux-linaro
+ export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
+-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
++export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
+ export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
+ export linaroconfigsboardflavour=arndale
+ export nearby_git=~/reference-git
diff --git a/configs/arndale.cfg b/configs/arndale.cfg
index 8b38da8..502b030 100755
--- a/configs/arndale.cfg
+++ b/configs/arndale.cfg
@@ -10,7 +10,8 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_upstream_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=arndale
 export nearby_git=~/reference-git
diff --git a/configs/highbank-3.7.cfg b/configs/highbank-3.7.cfg
index e20d23f..a53690d 100755
--- a/configs/highbank-3.7.cfg
+++ b/configs/highbank-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/configs.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=highbank
 export nearby_git=~/reference-git
diff --git a/configs/highbank.cfg b/configs/highbank.cfg
index ba82c10..595bfcd 100755
--- a/configs/highbank.cfg
+++ b/configs/highbank.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=highbank
 export nearby_git=~/reference-git
diff --git a/configs/llt-omap-3.4.cfg b/configs/llt-omap-3.4.cfg
index 04074b4..76127e2 100755
--- a/configs/llt-omap-3.4.cfg
+++ b/configs/llt-omap-3.4.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/configs.git
 export distribution=precise
 export kernel_branch=linux-linaro-tracking
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.4
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.4
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-quantal.git
 export nearby_git=~/reference-git
 export ubuntu_and_base_config_branch=config-core-3.4
diff --git a/configs/lt-origen-3.7.cfg b/configs/lt-origen-3.7.cfg
index c86e7ba..91e93c1 100755
--- a/configs/lt-origen-3.7.cfg
+++ b/configs/lt-origen-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/landing-teams/working/samsung/kern
 export distribution=raring
 export kernel_branch=tracking
 export kernel_repo=git://git.linaro.org/landing-teams/working/samsung/kernel.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=origen
 export nearby_git=~/reference-git
diff --git a/configs/lt-origen.cfg b/configs/lt-origen.cfg
index 512044a..0453339 100755
--- a/configs/lt-origen.cfg
+++ b/configs/lt-origen.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/landing-teams/working/samsung/kern
 export distribution=raring
 export kernel_branch=tracking
 export kernel_repo=git://git.linaro.org/landing-teams/working/samsung/kernel.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=origen
 export nearby_git=~/reference-git
diff --git a/configs/lt-vexpress-3.7.cfg b/configs/lt-vexpress-3.7.cfg
index 729fde5..ccf04ac 100755
--- a/configs/lt-vexpress-3.7.cfg
+++ b/configs/lt-vexpress-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/landing-teams/working/arm/kernel.g
 export distribution=raring
 export kernel_branch=integration-ubuntu-vexpress
 export kernel_repo=git://git.linaro.org/landing-teams/working/arm/kernel.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress
 export nearby_git=~/reference-git
diff --git a/configs/lt-vexpress.cfg b/configs/lt-vexpress.cfg
index db99e8a..1cbfbd5 100755
--- a/configs/lt-vexpress.cfg
+++ b/configs/lt-vexpress.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/landing-teams/working/arm/kernel.g
 export distribution=raring
 export kernel_branch=integration-ubuntu-vexpress
 export kernel_repo=git://git.linaro.org/landing-teams/working/arm/kernel.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress
 export nearby_git=~/reference-git
diff --git a/configs/omap.cfg b/configs/omap.cfg
index 98a79fc..e0fa43e 100755
--- a/configs/omap.cfg
+++ b/configs/omap.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=omap
 export nearby_git=~/reference-git
diff --git a/configs/origen-3.7.cfg b/configs/origen-3.7.cfg
index 09cba13..07c546d 100755
--- a/configs/origen-3.7.cfg
+++ b/configs/origen-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=origen
 export nearby_git=~/reference-git
diff --git a/configs/origen.cfg b/configs/origen.cfg
index c057c3b..71cde8c 100755
--- a/configs/origen.cfg
+++ b/configs/origen.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=origen
 export nearby_git=~/reference-git
diff --git a/configs/u8500-3.7.cfg b/configs/u8500-3.7.cfg
index 7b2b9a5..550cd81 100755
--- a/configs/u8500-3.7.cfg
+++ b/configs/u8500-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/configs.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=u8500
 export nearby_git=~/reference-git
diff --git a/configs/u8500.cfg b/configs/u8500.cfg
index 79fbb01..30a65ca 100755
--- a/configs/u8500.cfg
+++ b/configs/u8500.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=u8500
 export nearby_git=~/reference-git
diff --git a/configs/vexpress-3.7.cfg b/configs/vexpress-3.7.cfg
index 1209e01..3ee666a 100755
--- a/configs/vexpress-3.7.cfg
+++ b/configs/vexpress-3.7.cfg
@@ -9,7 +9,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress
 export nearby_git=~/reference-git
diff --git a/configs/vexpress.cfg b/configs/vexpress.cfg
index b98f72d..4f2ee29 100755
--- a/configs/vexpress.cfg
+++ b/configs/vexpress.cfg
@@ -10,7 +10,7 @@ export board_config_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress
 export nearby_git=~/reference-git
diff --git a/configs/vexpress64-3.7.cfg b/configs/vexpress64-3.7.cfg
index 6f46ba7..95473ca 100755
--- a/configs/vexpress64-3.7.cfg
+++ b/configs/vexpress64-3.7.cfg
@@ -14,7 +14,7 @@ export boot_wrapper_repo=git://git.linaro.org/arm/models/boot-wrapper-aarch64.gi
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7-arm64
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7-arm64
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress64
 export nearby_git=~/reference-git
diff --git a/configs/vexpress64.cfg b/configs/vexpress64.cfg
index f07b831..4b413da 100755
--- a/configs/vexpress64.cfg
+++ b/configs/vexpress64.cfg
@@ -14,7 +14,7 @@ export boot_wrapper_repo=git://git.linaro.org/arm/models/boot-wrapper-aarch64.gi
 export distribution=raring
 export kernel_branch=linux-linaro
 export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git
-export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.7-arm64
+export linaro_ubuntu_packaging_branch=linaro-ubuntu-cross-packaging-3.7-arm64
 export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-raring.git
 export linaroconfigsboardflavour=vexpress64
 export nearby_git=~/reference-git