On Mon, 2014-06-16 at 22:19 +0100, Ian Campbell wrote: > On Mon, 2014-06-16 at 22:15 +0200, Karsten Merker wrote: > > On Mon, Jun 16, 2014 at 08:08:51PM +0100, Ian Campbell wrote: > > > On Sun, 2014-06-15 at 15:14 +0200, Karsten Merker wrote: > > > > I am not sure that we should handle commandline parameters this way. > > > > > > Do we think the current shortcomings here are worth keeping flash-kernel > > > >3.19 out of Jessie for now? As it stands it will propagate on Wednesday > > > I think. > > > > > > I'm in two minds. > > > > I think we should avoid further migration to Jessie until we have > > finally decided on how to handle the commandline parameter issues. > > At most, we lose a few days for some features introduced after > > 3.19 to migrate to Jessie and I think avoiding potential trouble > > due to unresolved boot parameter issues is worth that delay. > > I buy this argument, so I've just filed a severity: grave bug to hold > the latest flash-kernel in sid for now things while we figure this out.
That was https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751816 BTW. I think the patch below resolves the worst issue and it works for me on cubietruck. The more minor stuff mentioned in that report I'm not sure it is actually worth worrying over. The main one seems to be that /etc/default/flash-kernel:LINUX_KERNEL_CMDLINE is still populated even on systems where there is no way at all for it to get used. Thoughts on that? Ian. commit e141f15eb9b1804839752be98f895ef4c68969cd Author: Ian Campbell <[email protected]> Date: Sun Jul 6 16:52:10 2014 +0100 Append /etc/flash-kernel/default:LINUX_KERNEL_CMDLINE to bootargs. Only for those platforms which set bootargs based on LINUX_KERNEL_COMMAND line, not those which set an unconditional/unconfigurable bootargs. diff --git a/bootscript/bootscr.beaglebone b/bootscript/bootscr.beaglebone index df8af94..a0e5121 100644 --- a/bootscript/bootscr.beaglebone +++ b/bootscript/bootscr.beaglebone @@ -2,7 +2,7 @@ setenv device mmc setenv partition ${bootpart} -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ image_locations='/boot/ /' kvers='@@KERNEL_VERSION@@' diff --git a/bootscript/bootscr.cubox-i b/bootscript/bootscr.cubox-i index f8c69bb..e9b1b09 100644 --- a/bootscript/bootscr.cubox-i +++ b/bootscript/bootscr.cubox-i @@ -2,7 +2,7 @@ setenv device mmc setenv partition ${mmcdev}:${mmcpart} -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ image_locations='/boot/ /' kvers='@@KERNEL_VERSION@@' diff --git a/bootscript/bootscr.highbank b/bootscript/bootscr.highbank index 6827b21..881bb3f 100644 --- a/bootscript/bootscr.highbank +++ b/bootscript/bootscr.highbank @@ -1,4 +1,4 @@ -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ @@UBOOT_ENV_EXTRA@@ ext2load scsi 0 ${kernel_addr_r} vmlinuz ext2load scsi 0 ${ramdisk_addr_r} initrd.img diff --git a/bootscript/bootscr.sunxi b/bootscript/bootscr.sunxi index b2ffe50..16624a9 100644 --- a/bootscript/bootscr.sunxi +++ b/bootscript/bootscr.sunxi @@ -11,7 +11,7 @@ setenv kernel_addr_r 0x46000000 setenv fdt_addr_r 0x47000000 setenv ramdisk_addr_r 0x48000000 -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ @@UBOOT_ENV_EXTRA@@ image_locations='/boot/ /' diff --git a/bootscript/bootscr.wandboard b/bootscript/bootscr.wandboard index 6e1a5c3..847c4ec 100644 --- a/bootscript/bootscr.wandboard +++ b/bootscript/bootscr.wandboard @@ -5,7 +5,7 @@ setenv partition ${mmcdev}:${mmcpart} if test -z "${ramdiskaddr}" ; then setenv ramdiskaddr 0x13000000 fi -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ image_locations='/boot/ /' kvers='@@KERNEL_VERSION@@' diff --git a/bootscript/bootscr.xgene-mustang b/bootscript/bootscr.xgene-mustang index 23c8fa0..919a8e4 100644 --- a/bootscript/bootscr.xgene-mustang +++ b/bootscript/bootscr.xgene-mustang @@ -1,4 +1,4 @@ -setenv bootargs '@@LINUX_KERNEL_CMDLINE@@' +setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@ @@UBOOT_ENV_EXTRA@@ ext4load scsi 0 ${kernel_addr_r} uImage ext4load scsi 0 ${ramdisk_addr_r} uInitrd diff --git a/debian/changelog b/debian/changelog index ed1e883..f0a8f6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ flash-kernel (3.23) UNRELEASED; urgency=medium * Avoid stalling install when debconf frontend is noninteractive. Patch from David Lechner. (Closes: #753059) + * Append command line options from + /etc/default/flash-kernel:LINUX_KERNEL_CMDLINE to ${bootargs} rather than + replacing it entirely. (Partially addresses #751816) -- Ian Campbell <[email protected]> Sun, 06 Jul 2014 16:46:09 +0100 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
