diff options
| -rw-r--r-- | target/cpio/cpioroot.mk | 2 | ||||
| -rw-r--r-- | target/cramfs/cramfs.mk | 2 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 2 | ||||
| -rw-r--r-- | target/generic/Makefile.in | 6 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 4 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 2 | ||||
| -rw-r--r-- | target/tar/tarroot.mk | 2 |
7 files changed, 19 insertions, 1 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 8f460c713..6cff4dde6 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -20,9 +20,11 @@ cpioroot: host-fakeroot makedevs cpioroot-init touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET)) +endif # Use fakeroot so tar believes the previous fakery echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_TARGET)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET)) diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index f7e867a84..0f488e143 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -72,9 +72,11 @@ cramfsroot: host-fakeroot makedevs cramfs touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) +endif # Use fakeroot so mkcramfs believes the previous fakery echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) " \ "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 5f9a59bb2..82912df5c 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -97,9 +97,11 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) +endif # Use fakeroot so genext2fs believes the previous fakery ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) GENEXT2_REALSIZE=`LC_ALL=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \ diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in index 51b5338a9..9fa7a6be8 100644 --- a/target/generic/Makefile.in +++ b/target/generic/Makefile.in @@ -1,3 +1,9 @@ # Default target skeleton stuff, may be overridden TARGET_SKELETON=target/generic/target_skeleton TARGET_DEVICE_TABLE=target/generic/device_table.txt + +ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y) +TARGET_SKELETON=target/generic/target_busybox_skeleton +TARGET_DEVICE_TABLE= +endif + diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index db0489d9a..c00cace27 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -37,7 +37,7 @@ JFFS2_TARGET := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))) #")) JFFS2_DEVFILE = $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_DEVFILE))) #")) -ifneq ($(JFFS2_DEVFILE),) +ifneq ($(JFFS2_DEVFILE)$(TARGET_DEVICE_TABLE),) JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) endif @@ -59,9 +59,11 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) +endif # Use fakeroot so mkfs.jffs2 believes the previous fakery echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(BUILD_DIR)/root -o $(JFFS2_TARGET)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index ba6450fdb..0ec6f85d2 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -67,9 +67,11 @@ squashfsroot: host-fakeroot makedevs squashfs touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) +endif # Use fakeroot so mksquashfs believes the previous fakery echo "$(SQUASHFS_DIR)/squashfs-tools/mksquashfs " \ "$(TARGET_DIR) $(SQUASHFS_TARGET) " \ diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index 943cc171b..19aff6109 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -32,9 +32,11 @@ tarroot: host-fakeroot makedevs touch $(STAGING_DIR)/.fakeroot.00000 cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) +ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) +endif # Use fakeroot so tar believes the previous fakery echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) |