Commit 847895d2 authored by Arnout Vandecappelle (Essensium/Mind)'s avatar Arnout Vandecappelle (Essensium/Mind) Committed by Peter Korsgaard
Browse files

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: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 26f16d0f

fs/cloop/cloop.mk

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

fs/common.mk

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

fs/cpio/cpio.mk

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

fs/cramfs/cramfs.mk

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

fs/ext2/ext2.mk

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