Pārlūkot izejas kodu

target/cramfs/cramfs.mk: Fix device table not being passed to mkcramfs

While mkcramfs was being patched to support a device table, the target device table was not being passed to the mkcramfs options. This patch fixes that

Signed-off-by: Jared Holzman <j.holzman@genesysdesign.com.au>
Peter Korsgaard 16 gadi atpakaļ
vecāks
revīzija
63402d7737
1 mainītis faili ar 7 papildinājumiem un 3 dzēšanām
  1. 7 3
      target/cramfs/cramfs.mk

+ 7 - 3
target/cramfs/cramfs.mk

@@ -40,9 +40,13 @@ cramfs-dirclean:
 #
 #############################################################
 ifeq ($(BR2_ENDIAN),"BIG")
-CRAMFS_ENDIANNESS=-b
+CRAMFS_OPTS=-b
 else
-CRAMFS_ENDIANNESS=-l
+CRAMFS_OPTS=-l
+endif
+
+ifneq ($(TARGET_DEVICE_TABLE),)
+CRAMFS_OPTS += -D $(TARGET_DEVICE_TABLE)
 endif
 
 CRAMFS_TARGET=$(IMAGE).cramfs
@@ -68,7 +72,7 @@ ifneq ($(TARGET_DEVICE_TABLE),)
 		>> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 endif
 	# Use fakeroot so mkcramfs believes the previous fakery
-	echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) " \
+	echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_OPTS) " \
 		"$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 	chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 	$(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))