Consolidating armhf installer flavours
With the current trunk/experimental 3.11 kernel the separate omap5, mx5
and vexpress flavours have been removed in favour of the armmp flavour
which supports all of those.
So I think we need to switch the installer over too. Since the 3.10
kernel already has the armmp flavour I don't think we even need wait for
3.11 to be uploaded.
I merged the existing mx5 and vexpress mediums so armmp creates all of
netboot network-console netboot-gtk. I also retained the efikamx uImage
stuff (but using the new kernel) since I guess it is useful?
Should we have more of those uImage things for other armmp supported
platforms?
Ian.
commit 7de47649d4f47225f740d262de8d51c83be73688
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Mon Aug 26 11:25:56 2013 +0100
Switch armhf to armmp kernel.
The other flavours have been removed in the 3.11 kernel, even in 3.10 the armmp
flavour supports mx5 and vexpress.
Merge all of the subtypes over.
diff --git a/build/config/armhf.cfg b/build/config/armhf.cfg
index 73b8a80..0287ef2 100644
--- a/build/config/armhf.cfg
+++ b/build/config/armhf.cfg
@@ -1,4 +1,4 @@
-SUBARCH_SUPPORTED = mx5 vexpress
+SUBARCH_SUPPORTED = armmp
MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
diff --git a/build/config/armhf/mx5.cfg b/build/config/armhf/armmp.cfg
similarity index 69%
rename from build/config/armhf/mx5.cfg
rename to build/config/armhf/armmp.cfg
index a30c0a2..dd24206 100644
--- a/build/config/armhf/mx5.cfg
+++ b/build/config/armhf/armmp.cfg
@@ -1,4 +1,4 @@
MEDIUM_SUPPORTED = netboot network-console netboot-gtk
# The version of the kernel to use.
-KERNELVERSION := $(KERNELVERSION)-mx5
+KERNELVERSION := $(KERNELVERSION)-armmp
diff --git a/build/config/armhf/mx5/netboot-gtk.cfg b/build/config/armhf/armmp/netboot-gtk.cfg
similarity index 81%
rename from build/config/armhf/mx5/netboot-gtk.cfg
rename to build/config/armhf/armmp/netboot-gtk.cfg
index cb0b074..3817048 100644
--- a/build/config/armhf/mx5/netboot-gtk.cfg
+++ b/build/config/armhf/armmp/netboot-gtk.cfg
@@ -1,6 +1,6 @@
MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
+TARGET = $(INITRD) $(KERNEL) efikamx
TYPE = netboot/gtk
EXTRANAME = netboot/gtk/
@@ -16,8 +16,8 @@ EXTRAUDEBS += cdebconf-gtk-entropy
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 -T kernel -C none -a 0x90008000 -e 0x90008000 -n "Debian kernel" -d $(KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(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"
diff --git a/build/config/armhf/mx5/netboot.cfg b/build/config/armhf/armmp/netboot.cfg
similarity index 77%
rename from build/config/armhf/mx5/netboot.cfg
rename to build/config/armhf/armmp/netboot.cfg
index 2456c93..e6886ba 100644
--- a/build/config/armhf/mx5/netboot.cfg
+++ b/build/config/armhf/armmp/netboot.cfg
@@ -1,7 +1,7 @@
MEDIA_TYPE = netboot image
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
-EXTRANAME = $(MEDIUM)
+TARGET = $(INITRD) $(KERNEL) efikamx
+EXTRANAME = $(MEDIUM)/
MANIFEST-INITRD = "netboot initrd"
MANIFEST-KERNEL = "kernel image to netboot"
@@ -10,8 +10,8 @@ MANIFEST-KERNEL = "kernel image to netboot"
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 -T kernel -C none -a 0x90008000 -e 0x90008000 -n "Debian kernel" -d $(KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(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"
diff --git a/build/config/armhf/mx5/network-console.cfg b/build/config/armhf/armmp/network-console.cfg
similarity index 76%
rename from build/config/armhf/mx5/network-console.cfg
rename to build/config/armhf/armmp/network-console.cfg
index df79c50..89d4fdb 100644
--- a/build/config/armhf/mx5/network-console.cfg
+++ b/build/config/armhf/armmp/network-console.cfg
@@ -1,15 +1,15 @@
MEDIA_TYPE = netboot image (SSH)
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) efikamx
-EXTRANAME = $(MEDIUM)
+TARGET = $(INITRD) $(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 -T kernel -C none -a 0x90008000 -e 0x90008000 -n "Debian kernel" -d $(KERNEL) $(SOME_DEST)/$(EXTRANAME)/efikamx/uImage
+ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(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"
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/armmp.cfg b/build/pkg-lists/netboot/armhf/armmp.cfg
new file mode 100644
index 0000000..4c01d74
--- /dev/null
+++ b/build/pkg-lists/netboot/armhf/armmp.cfg
@@ -0,0 +1,2 @@
+nic-modules-${kernel:Version}
+
Reply to: