diff options
| -rw-r--r-- | fs/initramfs/initramfs.mk | 6 | ||||
| -rw-r--r-- | target/linux/Makefile.in | 2 | ||||
| -rw-r--r-- | target/linux/Makefile.in.advanced | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk index 4a205d1ce..9aaf1b04a 100644 --- 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 f3c7807c7..41e482131 100644 --- 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 f87d14d1b..745224d3f 100644 --- 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 |