Now that armhf only has a single kernel flavour I think we can simplify
the installer setup a bit.
Firstly by moving the armmp subarch to the top level and secondly by
dropping the version from the kernel filename. Leading to
installer-armhf/201403XX/images/netboot/initrd.gz
installer-armhf/201403XX/images/netboot/vmlinuz
rather than
installer-armhf/current/images/armmp/netboot/initrd.gz
installer-armhf/current/images/armmp/netboot/vmlinuz-3.13-1-armmp
(similar for netboot-gtk and network-console).
Since dropping the version suffix requires a kernel udeb change as well
I think the best time to make the change would be as kernel 3.14 goes
into unstable. So I plan to make the kernel change in svn soon unless
someone objects and defer the d-i bit until it is uploaded.
I also think it would be useful to include the DTBs in the installer
output, since they are needed almost everywhere these days and are
sometimes not all that easy to get hold of (I had an idea there was a
related bug report, but I can't find it). I've got a patch which copies
all the packaged DTBs into the installer:
moves all
installer-armhf/201403XX/images/device-tree/sun6i-a31-colombus.dtb
installer-armhf/201403XX/images/device-tree/omap3-igep0030.dtb
installer-armhf/201403XX/images/device-tree/imx27-apf27dev.dtb
[... many more...]
This also applies to the armel/kirkwood subarch
installer-armel/201403XX/images/kirkwood/device-tree/kirkwood-mplcec4.dtb
installer-armel/201403XX/images/kirkwood/device-tree/kirkwood-lschlv2.dtb
installer-armel/201403XX/images/kirkwood/device-tree/kirkwood-ns2max.dtb
[...]
I'm a bit worried that this might imply a greater level of support for
any board with a DTB than we actually offer. Not really sure how to deal
with that, probably more of a docs issue than anything.
The commit messages are below for reference and you can find the patches in:
git://gitorious.org/ijc/u-boot.git armhf
The kernel patch is obvious but it's also below.
Ian.
commit f2c9c6d5b975ed534b294a43fddaabd0512f2810
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Fri Apr 18 17:25:09 2014 +0100
armhf: Drop the version from kernel filename.
I suppose thie used to help indicate the subarch, but since we now only have
one dropping it makes scripted downloads etc simpler.
commit fa26f978f6d40b70ca09501f2479ecb1fc94e02d
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Sat Mar 1 03:30:07 2014 +0000
arm: include dtb files for netboot.
More and more platforms require a device tree to boot. We include them in the
kernel package and the udeb, export them into the installer output as well.
This introduces a new "medium" to the relevant architectures. This isn't a true
"medium", but since DTBs are common to the netboot/ network-console etc this
puts them at the top level.
This is enabled for armhf and armel/kirkwood. The other armel subarchs don't
appear to produce any device tree.
commit 4f438be33ca074ecf3f1f641118b09523af5e4e2
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Fri Apr 18 10:18:11 2014 +0100
armhf: move armmp subarch to the toplevel.
Since we now only support a single subarch on armhf (armmp) there isn't much
point in having the subarch explicit in the installer. So make the existing
armmp subarch the toplevel arch.
commit 8bf0e475c6cc600813570d2e82b1f510fa96bf4a
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Fri Apr 18 19:10:18 2014 +0100
[armhf] Drop suffix from kernel udeb
diff --git a/linux/debian/changelog b/linux/debian/changelog
index eb89900..5450f8d 100644
--- a/linux/debian/changelog
+++ b/linux/debian/changelog
@@ -8,6 +8,9 @@ linux (3.14.1-1~exp1) UNRELEASED; urgency=medium
* [armhf] Enable SECURITY_APPARMOR, SECURITY_TOMOYO
* [rt] Update to 3.14.0-rt1 and reenable
+ [ Ian Campbell ]
+ * [armhf] Drop suffix from kernel udeb.
+
-- Ben Hutchings <ben@decadent.org.uk> Mon, 14 Apr 2014 01:58:22 +0100
linux (3.14-1~exp1) experimental; urgency=medium
diff --git a/linux/debian/installer/armhf/kernel-versions b/linux/debian/installer/armhf/kernel-versions
index 83716a3..c73dcc7 100644
--- a/linux/debian/installer/armhf/kernel-versions
+++ b/linux/debian/installer/armhf/kernel-versions
@@ -1,2 +1,2 @@
# arch version flavour installedname suffix build-depends
-armhf - armmp - y -
+armhf - armmp - - -
Attachment:
signature.asc
Description: This is a digitally signed message part