aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-11-11 01:25:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-11-11 01:25:02 +0000
commitbf2fe7ea9a80e4f72afbdc2466f98aa61a978bf5 (patch)
tree841e5d260d7e9aec178d7a5942591b10667ccc57
parenta8ea28ad9064395bf635ecd5d957796e2f0163c4 (diff)
downloadupstream-bf2fe7ea9a80e4f72afbdc2466f98aa61a978bf5.tar.gz
upstream-bf2fe7ea9a80e4f72afbdc2466f98aa61a978bf5.tar.bz2
upstream-bf2fe7ea9a80e4f72afbdc2466f98aa61a978bf5.zip
automatically adjust CONFIG_BLK_DEV_INITRD in the kernel config (thx, sn9)
SVN-Revision: 18361
-rw-r--r--include/kernel-defaults.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index cf3eb31053..35627f7bc4 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -67,7 +67,8 @@ ifeq ($(KERNEL),2.6)
ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
define Kernel/SetInitramfs
mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
- grep -v -e INITRAMFS -e CONFIG_RD_ $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+ grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+ echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_SOURCE="$(strip $(TARGET_DIR) $(INITRAMFS_EXTRA_FILES))"' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config