From patchwork Sun Jan 20 16:03:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 213962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D16AF2C007E for ; Mon, 21 Jan 2013 03:05:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 677DC101A8A; Sun, 20 Jan 2013 16:05:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6RdC+X5slDd5; Sun, 20 Jan 2013 16:05:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2B973101D70; Sun, 20 Jan 2013 16:04:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D785C8F74B for ; Sun, 20 Jan 2013 16:04:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E62F68B70E for ; Sun, 20 Jan 2013 16:04:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 33-IwWEY1WhC for ; Sun, 20 Jan 2013 16:04:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id A08FD8B287 for ; Sun, 20 Jan 2013 16:04:09 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id hm6so6491269wib.3 for ; Sun, 20 Jan 2013 08:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references; bh=1f2Ypfwz7LBzv8AH0dheYr63YnYqDr6dxkAQmnaYuTI=; b=S9nPUkeoSaGb/NG/KbUH4OADsJgv+7qJ9JJ24Amjl33Enl+/0h9LAczPCSbpIMsMCo cO7/wyupVwbGeVQiFrc/Jc7T8tFBSL+uJOZ7UHVmMDtwXYpzxkH0ot1J4dqnij9RnNPX mbjrHK6V14pZe5BzDNnpadLxuCfTeem9S8I0OJQ2MB+i4eFpDsLzoOPARpBNVJPndj+1 Px7aLBCUQFdLyFLJ3oaLbFbaDVDk308h9f6NqaY/vNqudgT8oxMUQ1LPNfg4TS/L1fnV ntewa9ZF7D27tTX2aEAqMzd6S4xWsPLvcPbutjRXN/6D6rs8gTikJU7AYBThtZqRzsPF 4amA== X-Received: by 10.180.99.129 with SMTP id eq1mr11498860wib.30.1358697847808; Sun, 20 Jan 2013 08:04:07 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-68-44.w90-32.abo.wanadoo.fr. [90.32.147.44]) by mx.google.com with ESMTPS id bw9sm12874953wib.5.2013.01.20.08.04.06 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 20 Jan 2013 08:04:07 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net, Arnout Vandecappelle Date: Sun, 20 Jan 2013 17:03:50 +0100 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 6/7] fs/common.mk: delay evaluation of variables. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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) [yann.morin.1998@free.fr: fix some "no newline at end of file"] Tested-by: "Yann E. MORIN" Signed-off-by: "Yann E. MORIN" --- fs/cloop/cloop.mk | 4 ++-- fs/common.mk | 44 ++++++++++++++++++++++---------------------- fs/cpio/cpio.mk | 2 +- fs/cramfs/cramfs.mk | 2 +- fs/ext2/ext2.mk | 2 +- fs/jffs2/jffs2.mk | 8 ++++---- fs/romfs/romfs.mk | 4 ++-- fs/squashfs/squashfs.mk | 4 ++-- fs/tar/tar.mk | 2 +- fs/ubifs/ubi.mk | 4 ++-- fs/ubifs/ubifs.mk | 4 ++-- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/fs/cloop/cloop.mk b/fs/cloop/cloop.mk index c1d6abb..7c22bcf 100644 --- 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 +$(eval $(call ROOTFS_TARGET,cloop)) diff --git a/fs/common.mk b/fs/common.mk index b1512dd..8b5b2f2 100644 --- 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 5533322..5bcec13 100644 --- 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 55f6bdb..6549f39 100644 --- 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 cc8da0e..7b71592 100644 --- 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 2a69849..b5423a8 100644 --- 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 9719478..1a11fbe 100644 --- 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 +$(eval $(call ROOTFS_TARGET,romfs)) diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index a680dae..d4b56f4 100644 --- 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 4d435cb..1d327fa 100644 --- 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 c88e336..51ab42d 100644 --- 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 337180e..cbb6026 100644 --- 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 +$(eval $(call ROOTFS_TARGET,ubifs))