[Buildroot] [pull request] Pull request for branch for-2010.11/dont-force-no-initramfs

[Buildroot] [pull request] Pull request for branch for-2010.11/dont-force-no-initramfs

[Thomas Petazzoni]

The following changes since commit 33070528796dafe90ebab836356fea03f2dc24f9:
  Marcus Osdoba (1):
        usbutils: bump to 0.90

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot for-2010.11/dont-force-no-initramfs

Thomas Petazzoni (1):
      linux: don't force no initramfs

 linux/linux.mk |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/1] linux: don't force no initramfs

[Thomas Petazzoni]

When initramfs was not selected as a root filesystem, we forcefully
disabled the initramfs in the kernel configuration.

However, it prevents an user from manually managing its initramfs, as
we override the option he has set in his kernel configuration
file. There's no real reason to do so: when initramfs is not selected
as the root filesystem, just don't touch initramfs related options in
the kernel configuration.

Problem reported by Sergey Naumov <sknaumov@gmail.com>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 3fc259c..ea338fc 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -104,9 +104,6 @@ ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
 	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
-else
-	$(call KCONFIG_DISABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
-	$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"\",$(@D)/.config)
 endif
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
 	$(Q)touch $@
-- 
1.7.0.4

[Buildroot] [PATCH 1/1] linux: don't force no initramfs

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> When initramfs was not selected as a root filesystem, we forcefully
 Thomas> disabled the initramfs in the kernel configuration.

 Thomas> However, it prevents an user from manually managing its initramfs, as
 Thomas> we override the option he has set in his kernel configuration
 Thomas> file. There's no real reason to do so: when initramfs is not selected
 Thomas> as the root filesystem, just don't touch initramfs related options in
 Thomas> the kernel configuration.

 Thomas> Problem reported by Sergey Naumov <sknaumov@gmail.com>.

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard