LINARO: Linaro-3.0.0-1002.2 vexpress onlyLinaro-3.0.0-1002.2-vexpress-only

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

7 files changed, 36 insertions, 72 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 63621413c21..5d57bb52cc4 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -1,4 +1,4 @@
-linux-linaro (3.0.0-1002.2) natty; urgency=low
+linux-linaro-vexpress (3.0.0-1002.2) natty; urgency=low
 
   [ Ricardo Salveti ]
 
@@ -8,7 +8,7 @@ linux-linaro (3.0.0-1002.2) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 28 Jul 2011 10:58:12 -0600
 
-linux-linaro (3.0.0-1001.1) natty; urgency=low
+linux-linaro-vexpress (3.0.0-1001.1) natty; urgency=low
 
   [ John Rigby ]
 
@@ -22,7 +22,7 @@ linux-linaro (3.0.0-1001.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Mon, 25 Jul 2011 14:58:08 -0600
 
-linux-linaro (3.0.0-1000.0) natty; urgency=low
+linux-linaro-vexpress (3.0.0-1000.0) natty; urgency=low
 
   [ John Rigby ]
 
@@ -34,7 +34,7 @@ linux-linaro (3.0.0-1000.0) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 22 Jul 2011 00:11:56 -0600
 
-linux-linaro (2.6.39-1001.2) oneiric; urgency=low
+linux-linaro-vexpress (2.6.39-1001.2) oneiric; urgency=low
 
   [ John Rigby ]
 
@@ -47,7 +47,7 @@ linux-linaro (2.6.39-1001.2) oneiric; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Sun, 26 Jun 2011 18:47:45 +0100
 
-linux-linaro (2.6.39-1000.1) oneiric; urgency=low
+linux-linaro-vexpress (2.6.39-1000.1) oneiric; urgency=low
 
   [ John Rigby ]
 
@@ -55,7 +55,7 @@ linux-linaro (2.6.39-1000.1) oneiric; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 22 Jun 2011 07:22:49 -0600
 
-linux-linaro (2.6.39-1000.0) oneiric; urgency=low
+linux-linaro-vexpress (2.6.39-1000.0) oneiric; urgency=low
 
   [ John Rigby ]
 
@@ -68,7 +68,7 @@ linux-linaro (2.6.39-1000.0) oneiric; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 21 Jun 2011 13:45:49 -0600
 
-linux-linaro (2.6.38-1003.4) natty; urgency=low
+linux-linaro-vexpress (2.6.38-1003.4) natty; urgency=low
 
   [ Avik Sil ]
 
@@ -149,7 +149,7 @@ linux-linaro (2.6.38-1003.4) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 27 May 2011 18:53:05 -0600
 
-linux-linaro (2.6.38-1002.3) natty; urgency=low
+linux-linaro-vexpress (2.6.38-1002.3) natty; urgency=low
 
   [ Upstream Fixes ]
 
@@ -184,7 +184,7 @@ linux-linaro (2.6.38-1002.3) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 14 Apr 2011 12:16:06 -0600
 
-linux-linaro (2.6.38-1001.2) natty; urgency=low
+linux-linaro-vexpress (2.6.38-1001.2) natty; urgency=low
 
   [ John Rigby ]
 
@@ -227,7 +227,7 @@ linux-linaro (2.6.38-1001.2) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 18 Mar 2011 07:36:33 -0600
 
-linux-linaro (2.6.38-1000.1) natty; urgency=low
+linux-linaro-vexpress (2.6.38-1000.1) natty; urgency=low
 
   * Rebase to new upstreams:
     Linux v2.6.38-rc5
@@ -246,7 +246,7 @@ linux-linaro (2.6.38-1000.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 23 Feb 2011 16:57:41 -0700
 
-linux-linaro (2.6.37-1003.6) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1003.6) natty; urgency=low
 
   [ John Rigby ]
 
@@ -277,7 +277,7 @@ linux-linaro (2.6.37-1003.6) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 08 Feb 2011 19:56:22 -0700
 
-linux-linaro (2.6.37-1002.5) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1002.5) natty; urgency=low
 
   [ John Rigby ]
 
@@ -289,7 +289,7 @@ linux-linaro (2.6.37-1002.5) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Sat, 08 Jan 2011 18:34:41 -0700
 
-linux-linaro (2.6.37-1001.4) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1001.4) natty; urgency=low
 
   [ John Rigby ]
 
@@ -303,7 +303,7 @@ linux-linaro (2.6.37-1001.4) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Mon, 13 Dec 2010 16:51:19 -0700
 
-linux-linaro (2.6.37-1000.3) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1000.3) natty; urgency=low
 
   [ John Rigby ]
 
@@ -313,7 +313,7 @@ linux-linaro (2.6.37-1000.3) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 01 Dec 2010 01:07:18 -0700
 
-linux-linaro (2.6.37-1000.2) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1000.2) natty; urgency=low
 
   [ John Rigby ]
 
@@ -321,7 +321,7 @@ linux-linaro (2.6.37-1000.2) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 30 Nov 2010 01:00:49 -0700
 
-linux-linaro (2.6.37-1000.1) natty; urgency=low
+linux-linaro-vexpress (2.6.37-1000.1) natty; urgency=low
 
   [ John Rigby ]
 
@@ -341,7 +341,7 @@ linux-linaro (2.6.37-1000.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 26 Nov 2010 14:20:09 -0700
 
-linux-linaro (2.6.36-1000.1) natty; urgency=low
+linux-linaro-vexpress (2.6.36-1000.1) natty; urgency=low
 
   [ John Rigby ]
 
@@ -372,7 +372,7 @@ linux-linaro (2.6.36-1000.1) natty; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 18 Nov 2010 15:23:03 -0700
 
-linux-linaro (2.6.35-1008.15) maverick-proposed; urgency=low
+linux-linaro-vexpress (2.6.35-1008.15) maverick-proposed; urgency=low
 
   [ Robert Nelson ]
 
@@ -381,7 +381,7 @@ linux-linaro (2.6.35-1008.15) maverick-proposed; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 21 Oct 2010 11:01:14 -0600
 
-linux-linaro (2.6.35-1008.14) maverick-proposed; urgency=low
+linux-linaro-vexpress (2.6.35-1008.14) maverick-proposed; urgency=low
 
   [ Andy Whitcroft ]
 
@@ -457,7 +457,7 @@ linux-linaro (2.6.35-1008.14) maverick-proposed; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 19 Oct 2010 16:09:52 -0600
 
-linux-linaro (2.6.35-1007.13) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1007.13) maverick; urgency=low
 
   [ Upstream Ubuntu ]
 
@@ -523,7 +523,7 @@ linux-linaro (2.6.35-1007.13) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 07 Oct 2010 17:58:05 -0600
 
-linux-linaro (2.6.35-1006.12) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1006.12) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -536,7 +536,7 @@ linux-linaro (2.6.35-1006.12) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Mon, 20 Sep 2010 10:20:21 -0600
 
-linux-linaro (2.6.35-1006.11) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1006.11) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -555,7 +555,7 @@ linux-linaro (2.6.35-1006.11) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Thu, 16 Sep 2010 18:03:14 -0600
 
-linux-linaro (2.6.35-1005.10) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1005.10) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -571,7 +571,7 @@ linux-linaro (2.6.35-1005.10) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 08 Sep 2010 10:03:22 -0600
 
-linux-linaro (2.6.35-1004.9) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1004.9) maverick; urgency=low
 
   [ Upstream Kernel Changes ]
 
@@ -586,7 +586,7 @@ linux-linaro (2.6.35-1004.9) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Fri, 27 Aug 2010 20:27:29 -0600
 
-linux-linaro (2.6.35-1004.8) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1004.8) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -594,7 +594,7 @@ linux-linaro (2.6.35-1004.8) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 25 Aug 2010 19:46:17 -0600
 
-linux-linaro (2.6.35-1003.7) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1003.7) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -606,7 +606,7 @@ linux-linaro (2.6.35-1003.7) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Sun, 22 Aug 2010 21:29:44 -0600
 
-linux-linaro (2.6.35-1002.6) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1002.6) maverick; urgency=low
 
   [ Tim Gardner ]
 
@@ -620,7 +620,7 @@ linux-linaro (2.6.35-1002.6) maverick; urgency=low
 
  --  Tim Gardner <tim.gardner@canonical.com>  Tue, 17 Aug 2010 15:57:51 +0100
 
-linux-linaro (2.6.35-1001.5) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1001.5) maverick; urgency=low
 
   * New upstream trees
 
@@ -640,7 +640,7 @@ linux-linaro (2.6.35-1001.5) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 11 Aug 2010 14:20:28 -0600
 
-linux-linaro (2.6.35-1000.4) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1000.4) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -649,7 +649,7 @@ linux-linaro (2.6.35-1000.4) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 10 Aug 2010 10:23:30 -0600
 
-linux-linaro (2.6.35-1000.3) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1000.3) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -657,7 +657,7 @@ linux-linaro (2.6.35-1000.3) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 03 Aug 2010 10:16:29 -0600
 
-linux-linaro (2.6.35-1000.2) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1000.2) maverick; urgency=low
 
   [ John Rigby ]
 
@@ -665,7 +665,7 @@ linux-linaro (2.6.35-1000.2) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Wed, 28 Jul 2010 11:20:13 -0600
 
-linux-linaro (2.6.35-1000.1) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1000.1) maverick; urgency=low
 
   [ Linaro Kernel Changes ]
 
@@ -673,7 +673,7 @@ linux-linaro (2.6.35-1000.1) maverick; urgency=low
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 27 Jul 2010 17:17:39 -0600
 
-linux-linaro (2.6.35-1000.0) maverick; urgency=low
+linux-linaro-vexpress (2.6.35-1000.0) maverick; urgency=low
 
   [ John Rigby ]
 
diff --git a/debian.linaro/control.d/vars.linaro-mx51 b/debian.linaro/control.d/vars.linaro-mx51
deleted file mode 100644
index d48c7e1b292..00000000000
--- a/debian.linaro/control.d/vars.linaro-mx51
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="Freescale i.MX51"
-desc="Freescale i.MX51 based platforms"
-target="Freescale Babbage platform"
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-omap b/debian.linaro/control.d/vars.linaro-omap
deleted file mode 100644
index a7f41642ba2..00000000000
--- a/debian.linaro/control.d/vars.linaro-omap
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="TI OMAP[34]"
-desc="TI OMAP[34]-based systems"
-target="Targeted towards boards such as Beagleboard, PandaBoard, Gumstix, IGEPv2, etc."
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-s5pv310 b/debian.linaro/control.d/vars.linaro-s5pv310
deleted file mode 100644
index 1839dcf5744..00000000000
--- a/debian.linaro/control.d/vars.linaro-s5pv310
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="Samsung s5pv310"
-desc="Samsung s5pv310 based platforms"
-target="Samsung TBD platform"
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.linaro-u8500 b/debian.linaro/control.d/vars.linaro-u8500
deleted file mode 100644
index e9146437613..00000000000
--- a/debian.linaro/control.d/vars.linaro-u8500
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel"
-supported="ST-Ericsson U8500"
-desc="ST-Ericsson U8500 based platforms"
-target="ST-Ericsson HREF platform"
-bootloader="uboot-mkimage, flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"
diff --git a/debian.linaro/d-i/kernel-versions.in b/debian.linaro/d-i/kernel-versions.in
index 7a3bfe4a660..93cd588aa1f 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,8 +1,4 @@
 # arch	version		flavour		installedname			suffix	bdep
-armel	PKGVER-ABINUM	linaro-mx51	PKGVER-ABINUM-linaro-mx51	-
-armel	PKGVER-ABINUM	linaro-omap	PKGVER-ABINUM-linaro-omap	-
-armel	PKGVER-ABINUM	linaro-s5pv310	PKGVER-ABINUM-linaro-s5pv310	-
-armel	PKGVER-ABINUM	linaro-u8500	PKGVER-ABINUM-linaro-u8500	-
 armel	PKGVER-ABINUM	linaro-vexpress	PKGVER-ABINUM-linaro-vexpress	-
 # Ports
 # arch	version		flavour		installedname			suffix	bdep
diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk
index 6aaab5087a9..191ea5375c7 100644
--- a/debian.linaro/rules.d/armel.mk
+++ b/debian.linaro/rules.d/armel.mk
@@ -2,7 +2,7 @@ build_arch	= arm
 header_arch	= arm
 asm_link	= arm
 defconfig	= defconfig
-flavours	=  linaro-mx51 linaro-omap linaro-s5pv310 linaro-u8500 linaro-vexpress
+flavours	=      linaro-vexpress
 build_image	= zImage
 kernel_file	= arch/$(build_arch)/boot/zImage
 install_file	= vmlinuz
@@ -11,6 +11,6 @@ no_dumpfile = true
 loader		= grub
 do_doc_package	= false
 do_source_package	= false
-do_common_headers_indep = false
+do_common_headers_indep = true
 do_libc_dev_package	= false
-do_tools		= true
+do_tools = false