From 95387495822427b179b07b4ead711f3bed8d6acb Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 4 Sep 2007 21:24:46 +0000 Subject: - remove initramfs related config settings and configure them back if needed --- target/linux/Makefile.in | 7 ++++--- 1 file 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 -- cgit v1.2.3