fs/common.mk: delay evaluation of variables

This makes things easier to understand and more consistent with the pkg-infra.
For example, it removes the need for '$$@' in the CMD variables of fs/*/*.mk.

It also makes it possible to update the variables later, e.g. in the package
override file.

It also makes sure that the date will be recorded correctly in Yann E. Morin's
patch that logs the MESSAGE macros to a file.

The fs/*/*.mk must be updated as well because the '$@' shouldn't be quoted
anymore in the CMD variables or the hooks.

The $(eval ...) for the dependencies is redundant, because the $(ROOTFS_TARGET)
variable is already eval'd. Note that it is only redundant if the evaluation of
the uses of the variable is also delayed.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/fs/cloop/cloop.mk b/fs/cloop/cloop.mk
index c1d6abb80201025f2e8cb487b3ea1eaef6b7824e..c918684073a12e53c5c07dd1713d8fa9e7d91302 100644 (file)
--- a/fs/cloop/cloop.mk
+++ b/fs/cloop/cloop.mk
@@ -7,7 +7,7 @@
 ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
 
 define ROOTFS_CLOOP_CMD
-       $(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $$@
+       $(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
 endef
 
 $(eval $(call ROOTFS_TARGET,cloop))
\ No newline at end of file

diff --git a/fs/common.mk b/fs/common.mk
index b1512dd957e25caf5c338497db3f547ca61549bf..8b5b2f2e8601cecd2fa5c7a253900c05a756e264 100644 (file)
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -39,28 +39,28 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE)) \
 define ROOTFS_TARGET_INTERNAL
 
 # extra deps
-$(eval ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma))
+ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
 
-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
-       @$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-       $(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
-       rm -f $(FAKEROOT_SCRIPT)
-       rm -f $(TARGET_DIR_WARNING_FILE)
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
-ifneq ($(ROOTFS_DEVICE_TABLES),)
-       cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)
-ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
-       printf '$(subst $(sep),\n,$(PACKAGES_DEVICES_TABLE))' >> $(FULL_DEVICE_TABLE)
+$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
+       @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+       $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
+       rm -f $$(FAKEROOT_SCRIPT)
+       rm -f $$(TARGET_DIR_WARNING_FILE)
+       echo "chown -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
+ifneq ($$(ROOTFS_DEVICE_TABLES),)
+       cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)
+ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
+       printf '$$(subst $$(sep),\n,$$(PACKAGES_DEVICES_TABLE))' >> $$(FULL_DEVICE_TABLE)
 endif
-       printf '$(subst $(sep),\n,$(PACKAGES_PERMISSIONS_TABLE))' >> $(FULL_DEVICE_TABLE)
-       echo "$(HOST_DIR)/usr/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
+       printf '$$(subst $$(sep),\n,$$(PACKAGES_PERMISSIONS_TABLE))' >> $$(FULL_DEVICE_TABLE)
+       echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
 endif
-       echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT)
-       chmod a+x $(FAKEROOT_SCRIPT)
-       $(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT)
-       cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
-       -@rm -f $(FAKEROOT_SCRIPT) $(FULL_DEVICE_TABLE)
-       $(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep))
+       echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
+       chmod a+x $$(FAKEROOT_SCRIPT)
+       $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
+       cp support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
+       -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
+       $$(foreach hook,$$(ROOTFS_$(2)_POST_GEN_HOOKS),$$(call $$(hook))$$(sep))
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
        gzip -9 -c $$@ > $$@.gz
 endif
@@ -68,13 +68,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y)
        bzip2 -9 -c $$@ > $$@.bz2
 endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
-       $(LZMA) -9 -c $$@ > $$@.lzma
+       $$(LZMA) -9 -c $$@ > $$@.lzma
 endif
 
 rootfs-$(1)-show-depends:
-       @echo $(ROOTFS_$(2)_DEPENDENCIES)
+       @echo $$(ROOTFS_$(2)_DEPENDENCIES)
 
-rootfs-$(1): $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
+rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
 
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
 TARGETS += rootfs-$(1)

diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
index 5533322d1c97bef1d32c21a8ed62adb54c430ecc..5bcec13908b5464bab7aa4faa4c2ba7e36c66fcc 100644 (file)
--- a/fs/cpio/cpio.mk
+++ b/fs/cpio/cpio.mk
@@ -28,7 +28,7 @@ endif # BR2_ROOTFS_DEVICE_CREATION_STATIC
 ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_ADD_INIT
 
 define ROOTFS_CPIO_CMD
-       cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@
+       cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
 endef
 
 $(eval $(call ROOTFS_TARGET,cpio))

diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk
index 55f6bdbf98736dddc5c990cb72b51c20835d75d3..6549f39ead8f3027ec80eb53d7e62a3cb554915a 100644 (file)
--- a/fs/cramfs/cramfs.mk
+++ b/fs/cramfs/cramfs.mk
@@ -10,7 +10,7 @@ CRAMFS_OPTS=-l
 endif
 
 define ROOTFS_CRAMFS_CMD
- $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $$@
+ $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index cc8da0e4ddb1969cb7ef565955e3e4a24ae2f2fe..7b71592d9773979a8dda5af468deeb0b2f5dc125 100644 (file)
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -21,7 +21,7 @@ endif
 ROOTFS_EXT2_DEPENDENCIES = host-genext2fs
 
 define ROOTFS_EXT2_CMD
-       PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $$@
+       PATH=$(TARGET_PATH) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ext2))

diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk
index 2a69849cd538bccd520bb63ac1dc7b2e2fe59bd9..b5423a8cb2cd499d3e9d26b55e6d4ec0e46b4b26 100644 (file)
--- a/fs/jffs2/jffs2.mk
+++ b/fs/jffs2/jffs2.mk
@@ -36,13 +36,13 @@ ROOTFS_JFFS2_DEPENDENCIES = host-mtd
 
 ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),)
 define ROOTFS_JFFS2_CMD
-       $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \
-       $(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \
-       rm $$@.nosummary
+       $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@.nosummary && \
+       $(SUMTOOL) $(SUMTOOL_OPTS) -i $@.nosummary -o $@ && \
+       rm $@.nosummary
 endef
 else
 define ROOTFS_JFFS2_CMD
-       $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@
+       $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $@
 endef
 endif
 

diff --git a/fs/romfs/romfs.mk b/fs/romfs/romfs.mk
index 971947880b7d19e26075ed3f279f7c730bcdf2a2..1a9f49927e2544639c0e7fcbcc84f0996ef312ce 100644 (file)
--- a/fs/romfs/romfs.mk
+++ b/fs/romfs/romfs.mk
@@ -9,7 +9,7 @@ ROMFS_TARGET=$(IMAGE).romfs
 ROOTFS_ROMFS_DEPENDENCIES = host-genromfs
 
 define ROOTFS_ROMFS_CMD
-       $(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $$@
+       $(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $@
 endef
 
 $(eval $(call ROOTFS_TARGET,romfs))
\ No newline at end of file

diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index a680dae0f07e7ff844d275f4fb67ee6d62b00749..d4b56f4958a6866f45adaca54c828957f8e1c5ca 100644 (file)
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -33,9 +33,9 @@ endif
 endif
 
 define ROOTFS_SQUASHFS_CMD
-       $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend \
+       $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
                $(ROOTFS_SQUASHFS_ARGS) && \
-       chmod 0644 $$@
+       chmod 0644 $@
 endef
 
 $(eval $(call ROOTFS_TARGET,squashfs))

diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
index 4d435cb33bcd2075f180f5d1dfaf51afc0fd93fc..1d327fa868ad047c1506d1433b45ceec96a53dfe 100644 (file)
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -7,7 +7,7 @@
 TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS)
 
 define ROOTFS_TAR_CMD
- tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) .
+ tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
 endef
 
 $(eval $(call ROOTFS_TARGET,tar))

diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index c88e33639fee5d787e027e6c0734662b48695d23..51ab42d15c344b53d4c1b82d4a9b39c49c457d65 100644 (file)
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -14,9 +14,9 @@ ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 define ROOTFS_UBI_CMD
        cp fs/ubifs/ubinize.cfg . ;\
-       echo "image=$$@fs" \
+       echo "image=$@fs" \
                >> ./ubinize.cfg ;\
-       $(HOST_DIR)/usr/sbin/ubinize -o $$@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
+       $(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) ubinize.cfg ;\
        rm ubinize.cfg
 endef
 

diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index 337180edc008f707b9ab32ad547aee479ca5d8ea..8506dbdb8dec08877f1dbb9e690ec3eca7c2b3dc 100644 (file)
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -19,7 +19,7 @@ endif
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
-       $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@
+       $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
 $(eval $(call ROOTFS_TARGET,ubifs))
\ No newline at end of file