On Tue, 2012-07-10 at 17:35 -0600, Ian Campbell wrote:
> On Tue, 2012-07-10 at 16:37 -0600, Ian Campbell wrote:
> > On Wed, 2012-07-11 at 00:33 +0200, Hector Oron wrote:
> > > Hello Ian,
> > >
> > > 2012/7/10 Ian Campbell <ijc@hellion.org.uk>:
> > > > Martin tells me this is necessary for d-i to pick the correct kernel
> > > > while installing. I believe him ;-)
> > >
> > > Thanks for the patch, it looks fine to me, but incomplete for d-i.
> > > You need to add Dreamplug platform in debian-installer configuration
> > > (see installer/build/config/armel/kirkwood/* )
> >
> > Thanks for the pointer. I'll cook something up shortly...
>
> Here we are (patch follow pull request). I've built it but not booted
> it...
I've now run through an install on a DP and found that I needed the
following, or else the flash-kernel invocation fails due to lack of
mkimage. This is because get_cpuinfo_hardware doesn't check dt model so
flash-kernel-installer doesn't correctly detect DreamPlug and we don't
process Required-Packages: u-boot-tools.
I manually installed u-boot-tools in the target and the installation
completed.
The use of get_cpuinfo_hardware in initramfs tools hooks doesn't seem to
have any bad impact, although I think it should still be changed.
I'm continuing to hold off on committing anything until after the beta.
I'll also rebuild and retest with the the fixed flash-kernel udebs.
Ian.
diff --git a/debian/changelog b/debian/changelog
index 9edf023..c5f7181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flash-kernel (3.2) UNRELEASED; urgency=low
+
+ * Use get_machine in flash-kernel-installer udeb. Fixes flash-kernel at
+ install time on Dreamplug failure to install u-boot-tools.
+
+ -- Ian Campbell <Ian.Campbell@citrix.com> Tue, 17 Jul 2012 21:15:21 +0000
+
flash-kernel (3.2~exp.1) UNRELEASED; urgency=low
[ Ian Campbell ]
diff --git a/debian/flash-kernel-installer.postinst b/debian/flash-kernel-installer.postinst
index c7846e5..c07dee5 100755
--- a/debian/flash-kernel-installer.postinst
+++ b/debian/flash-kernel-installer.postinst
@@ -24,7 +24,7 @@ findfs () {
mount | grep "on /target${1%/} " | tail -n1 | cut -d' ' -f1
}
-machine="$(get_cpuinfo_hardware)"
+machine="$(get_machine)"
if machine_uses_flash "$machine"; then
db_progress START 0 3 flash-kernel-installer/progress
diff --git a/initramfs-tools/hooks/flash_kernel_set_root b/initramfs-tools/hooks/flash_kernel_set_root
index e78f76a..38a0bf8 100755
--- a/initramfs-tools/hooks/flash_kernel_set_root
+++ b/initramfs-tools/hooks/flash_kernel_set_root
@@ -91,7 +91,7 @@ if [ ! -e "$rootdev" ]; then
pause_error
fi
-machine="$(get_cpuinfo_hardware)"
+machine="$(get_machine)"
# Should we override the root device or merely provide a default root
# device?
--
Ian Campbell
It's not whether you win or lose, it's how you look playing the game.
Attachment:
signature.asc
Description: This is a digitally signed message part