On Sun, 2013-10-13 at 22:04 +0200, Cyril Brulebois wrote:
> Ben Hutchings <b...@decadent.org.uk> (2013-10-13):
> > Notable packaging changes in 3.11:
> >
> > - armhf single-platform flavours were removed
> > - armhf has an 'armmp-lpae' flavour which, surprise, has LPAE enabled
>
> ISTR Ian mentioned that in his last arm-related changes, so he should be
> ready to do what's necessary for that.
I have patches queued up. I guess the right time to commit is after your
upload of 3.10 based d-i to sid and before / around the same time as
3.11 gets uploaded.
Depending when that window is I can take care of it but patch is below
any way.
Ian.
8>-----------------
>From e423af58f53f94c2fb5926ee6a3cbefc25af8d69 Mon Sep 17 00:00:00 2001
From: Ian Campbell <i...@hellion.org.uk>
Date: Tue, 24 Sep 2013 08:40:29 +0100
Subject: [PATCH] Remove armhf mx5 and vexpress subarches, they are covered by
armmp now
The relevant kernel flavours were removed from the 3.11 kernel
---
build/config/armhf.cfg | 2 +-
build/config/armhf/mx5.cfg | 4 ----
build/config/armhf/mx5/netboot-gtk.cfg | 24 ------------------------
build/config/armhf/mx5/netboot.cfg | 18 ------------------
build/config/armhf/mx5/network-console.cfg | 16 ----------------
build/config/armhf/vexpress.cfg | 4 ----
build/config/armhf/vexpress/netboot.cfg | 8 --------
build/pkg-lists/netboot/armhf/mx5.cfg | 5 -----
build/pkg-lists/netboot/armhf/vexpress.cfg | 1 -
debian/changelog | 1 +
10 files changed, 2 insertions(+), 81 deletions(-)
delete mode 100644 build/config/armhf/mx5.cfg
delete mode 100644 build/config/armhf/mx5/netboot-gtk.cfg
delete mode 100644 build/config/armhf/mx5/netboot.cfg
delete mode 100644 build/config/armhf/mx5/network-console.cfg
delete mode 100644 build/config/armhf/vexpress.cfg
delete mode 100644 build/config/armhf/vexpress/netboot.cfg
delete mode 100644 build/pkg-lists/netboot/armhf/mx5.cfg
delete mode 100644 build/pkg-lists/netboot/armhf/vexpress.cfg
diff --git a/build/config/armhf.cfg b/build/config/armhf.cfg
index 0cd942b..0287ef2 100644
--- a/build/config/armhf.cfg
+++ b/build/config/armhf.cfg
@@ -1,4 +1,4 @@
-SUBARCH_SUPPORTED = mx5 vexpress armmp
+SUBARCH_SUPPORTED = armmp
MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
diff --git a/build/config/armhf/mx5.cfg b/build/config/armhf/mx5.cfg
deleted file mode 100644
index a30c0a2..0000000
--- a/build/config/armhf/mx5.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-MEDIUM_SUPPORTED = netboot network-console netboot-gtk
-
-# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-mx5
diff --git a/build/config/armhf/mx5/netboot-gtk.cfg
b/build/config/armhf/mx5/netboot-gtk.cfg
deleted file mode 100644
index cb0b074..0000000
--- a/build/config/armhf/mx5/netboot-gtk.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
-
-TYPE = netboot/gtk
-EXTRANAME = netboot/gtk/
-
-KEEP_GI_LANGS = 1
-
-# All images that include cdebconf should include symbols needed by these
-# plugins.
-
-EXTRAUDEBS += cdebconf-gtk-entropy
-
-# Genesi Efika MX (nettop and smartbook)
-efikamx:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/efikamx
- install -m 744 boot/arm/bootscr.mx5
$(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
- mkimage -A arm -O linux -T kernel -C none -a 0x90008000 -e 0x90008000
-n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n
"debian-installer ramdisk" -d $(TEMP_INITRD)
$(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd
- mkimage -A arm -O linux -a 0 -e 0 -T script -C none -n "Efika MX Boot
Script" -d $(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
$(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage "Linux kernel
for Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd "initrd for
Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr "U-Boot
Script for Efika MX"
diff --git a/build/config/armhf/mx5/netboot.cfg
b/build/config/armhf/mx5/netboot.cfg
deleted file mode 100644
index 2456c93..0000000
--- a/build/config/armhf/mx5/netboot.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
-EXTRANAME = $(MEDIUM)
-
-MANIFEST-INITRD = "netboot initrd"
-MANIFEST-KERNEL = "kernel image to netboot"
-
-# Genesi Efika MX (nettop and smartbook)
-efikamx:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/efikamx
- install -m 744 boot/arm/bootscr.mx5
$(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
- mkimage -A arm -O linux -T kernel -C none -a 0x90008000 -e 0x90008000
-n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n
"debian-installer ramdisk" -d $(TEMP_INITRD)
$(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd
- mkimage -A arm -O linux -a 0 -e 0 -T script -C none -n "Efika MX Boot
Script" -d $(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
$(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage "Linux kernel
for Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd "initrd for
Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr "U-Boot
Script for Efika MX"
diff --git a/build/config/armhf/mx5/network-console.cfg
b/build/config/armhf/mx5/network-console.cfg
deleted file mode 100644
index df79c50..0000000
--- a/build/config/armhf/mx5/network-console.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-MEDIA_TYPE = netboot image (SSH)
-
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
-EXTRANAME = $(MEDIUM)
-TYPE = netboot/network-console
-
-# Genesi Efika MX (nettop and smartbook)
-efikamx:
- mkdir -p $(SOME_DEST)/$(EXTRANAME)/efikamx
- install -m 744 boot/arm/bootscr.mx5
$(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
- mkimage -A arm -O linux -T kernel -C none -a 0x90008000 -e 0x90008000
-n "Debian kernel" -d $(TEMP_KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
- mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n
"debian-installer ramdisk" -d $(TEMP_INITRD)
$(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd
- mkimage -A arm -O linux -a 0 -e 0 -T script -C none -n "Efika MX Boot
Script" -d $(SOME_DEST)/$(EXTRANAME)/efikamx/bootscript
$(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage "Linux kernel
for Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/uInitrd "initrd for
Efika MX"
- update-manifest $(SOME_DEST)/$(EXTRANAME)/efikamx/boot.scr "U-Boot
Script for Efika MX"
diff --git a/build/config/armhf/vexpress.cfg b/build/config/armhf/vexpress.cfg
deleted file mode 100644
index 7b34ac7..0000000
--- a/build/config/armhf/vexpress.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-MEDIUM_SUPPORTED = netboot
-
-# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-vexpress
diff --git a/build/config/armhf/vexpress/netboot.cfg
b/build/config/armhf/vexpress/netboot.cfg
deleted file mode 100644
index ba79589..0000000
--- a/build/config/armhf/vexpress/netboot.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-MEDIA_TYPE = netboot image
-
-TARGET = $(INITRD) $(KERNEL)
-EXTRANAME = $(MEDIUM)/
-
-MANIFEST-INITRD = "netboot initrd"
-MANIFEST-KERNEL = "kernel image to netboot"
-
diff --git a/build/pkg-lists/netboot/armhf/mx5.cfg
b/build/pkg-lists/netboot/armhf/mx5.cfg
deleted file mode 100644
index d8704c8..0000000
--- a/build/pkg-lists/netboot/armhf/mx5.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-ata-modules-${kernel:Version}
-mmc-modules-${kernel:Version}
-mtd-modules-${kernel:Version}
-pata-modules-${kernel:Version}
-sata-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/armhf/vexpress.cfg
b/build/pkg-lists/netboot/armhf/vexpress.cfg
deleted file mode 100644
index 824a5fb..0000000
--- a/build/pkg-lists/netboot/armhf/vexpress.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nic-modules-${kernel:Version}
diff --git a/debian/changelog b/debian/changelog
index a23e3e8..4c2f224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ debian-installer (2013XXXX) UNRELEASED; urgency=low
[ Ian Campbell ]
* Add armmp flavour to armhf.
+ * Remove mx5 and vexpress flavours from armhf, they are covered by armmp.
-- Samuel Thibault <sthiba...@debian.org> Wed, 01 May 2013 14:18:04 +0200
--
1.7.10.4
--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/1381741082.24708.88.ca...@kazak.uk.xensource.com
