Repair initramfs dependancies after move to fs

The restructure for building root filesystems changed the target name
for the initramfs file, to build the file the trget is now
initramfs-root but the generated file is rootfs.initramfs

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index 4a205d1ce3d4d915b6837379c0881f8985093ad2..9aaf1b04abcb09c71fe049ce15cb1a0c1dffd4d5 100644 (file)
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -6,6 +6,12 @@
 #
 #############################################################
 
+ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
+INITRAMFS_TARGET:=initramfs-root
+else
+INITRAMFS_TARGET:= #nothing
+endif
+
 define ROOTFS_INITRAMFS_INIT_SYMLINK
        rm -f $(TARGET_DIR)/init
        ln -s sbin/init $(TARGET_DIR)/init

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index f3c7807c7aea843ac50236169cb1fec01b2c4e02..41e482131010b6b326c600b0c4ab4f33f43878ec 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -153,7 +153,7 @@ endif
        $(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)\"" >> \
+       echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
                $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index f87d14d1bfe1564587ed957d06c70faa8ccebc22..745224d3fc199ef97f8439a7a32e49af4f34c756 100644 (file)
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -344,7 +344,7 @@ endif
        $(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)\"" >> \
+       echo "CONFIG_INITRAMFS_SOURCE=\"$(BINARIES_DIR)/rootfs.initramfs\"" >> \
                $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
        echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config