Package: flash-kernel Version: 3.37 Severity: wishlist Tags: patch The version of u-boot in experimental, 2015.04+dfsg1-1 contains a patch to the u-boot environment to support distro_bootcmd, but is incompatible with the current bootscript in flash-kernel.
The following patch should fix this by setting device, partition and image_locations variables using values provided by distro_bootcmd, falling back to the old default values. diff --git a/bootscript/bootscr.beaglebone b/bootscript/bootscr.beaglebone index 1d079f8..31ee618 100644 --- a/bootscript/bootscr.beaglebone +++ b/bootscript/bootscr.beaglebone @@ -10,11 +10,30 @@ then exit fi -setenv device mmc -setenv partition ${bootpart} +if test "${devtype}" = "" + setenv device mmc +then + # use device provided by distro_bootcmd + setenv device "${devtype}" +fi + +if test "${devnum}" = "" +then + setenv partition ${bootpart} +else + # use partition provided by distro_bootcmd + setenv partition ${devnum}:${bootpart} +fi + setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ -image_locations='/boot/ /' +if test "${prefix}" = "" +then + image_locations='/boot/ /' +else + # use prefix provided by distro_bootcmd + image_locations="${prefix}" +fi kvers='@@KERNEL_VERSION@@' for pathprefix in ${image_locations} I intend to upload a newer version of u-boot to unstable sometime soonish, so it would be ideal if this patch could be included in flash-kernel before or at the same time as u-boot is uploaded to unstable. live well, vagrant
signature.asc
Description: PGP signature