Commit 0091f181 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- do not use TARGET_DEVICE_TABLE if is is empty

parent 2f67d9e2

target/cpio/cpioroot.mk

+2 −0
Original line number Diff line number Diff line
@@ -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))

target/cramfs/cramfs.mk

+2 −0
Original line number Diff line number Diff line
@@ -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))

target/ext2/ext2root.mk

+2 −0
Original line number Diff line number Diff line
@@ -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//"`; \

target/generic/Makefile.in

+6 −0
Original line number Diff line number Diff line 
# 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

target/jffs2/jffs2root.mk

+3 −1
Original line number Diff line number Diff line
@@ -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))