summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-04 21:24:46 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-04 21:24:46 +0000
commit95387495822427b179b07b4ead711f3bed8d6acb (patch)
tree7e39d113aa5a6f8b20968a359860ffd0ae400561
parentdbf257270410a67cb3b417f46a87d404a779f253 (diff)
downloadbuildroot-novena-95387495822427b179b07b4ead711f3bed8d6acb.tar.gz
buildroot-novena-95387495822427b179b07b4ead711f3bed8d6acb.zip
- remove initramfs related config settings and configure them back if needed
-rw-r--r--target/linux/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index ba571b56a..25f98a378 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -152,19 +152,20 @@ ifeq ($(BR2_INET_IPV6),y)
else
echo "# CONFIG_IPV6 is not set" >> $(LINUX26_DIR)/.config
endif
-ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+ $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
echo "CONFIG_INITRAMFS_SOURCE=\"$(INITRAMFS_TARGET)\"" >> \
$(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
endif
ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
+ # precedence for a small initramfs
$(SED) '/CONFIG_INITRAMFS_SOURCE/d' $(LINUX26_DIR)/.config
+ $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_SOURCE=\"$(BB_INITRAMFS_TARGET)\"" >> \
$(LINUX26_DIR)/.config
- $(SED) '/INITRAMFS_ROOT_.ID/d' $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
endif