From patchwork Mon Jan 25 20:49:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander 'lynxis' Couzens X-Patchwork-Id: 572916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 07242140CA8 for ; Tue, 26 Jan 2016 08:19:44 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2DB7728C6CE; Mon, 25 Jan 2016 22:17:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9DA8428C6C9 for ; Mon, 25 Jan 2016 22:16:50 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from mail.base45.de (mail.base45.de [80.241.61.77]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 25 Jan 2016 22:16:50 +0100 (CET) Received: from [2001:1a80:2259:d21a:9432:feb0:15e7:1734] (helo=lazus.yip) by mail.base45.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.82) (envelope-from ) id 1aNo5e-00074z-29; Mon, 25 Jan 2016 21:50:22 +0100 From: Alexander Couzens To: openwrt-devel@lists.openwrt.org Date: Mon, 25 Jan 2016 21:49:35 +0100 Message-Id: <1453754975-18721-14-git-send-email-lynxis@fe80.eu> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453754975-18721-1-git-send-email-lynxis@fe80.eu> References: <1453754975-18721-1-git-send-email-lynxis@fe80.eu> Cc: bnewbold@robocracy.org Subject: [OpenWrt-Devel] [PATCH 13/13] Makefile: fix --mtime usage with SOURCE_DATE_EPOCH fixup X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" --- include/image.mk | 4 ++-- include/kernel-build.mk | 2 +- scripts/sysupgrade-nand.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/image.mk b/include/image.mk index 044dd1a..bfdfab9 100644 --- a/include/image.mk +++ b/include/image.mk @@ -188,7 +188,7 @@ ifneq ($(CONFIG_NAND_SUPPORT),) [ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel" (cd "$(KDIR_TMP)"; $(TAR) cvf \ "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1) \ - $(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") endef # $(1) board name @@ -251,7 +251,7 @@ endef define Image/mkfs/targz $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \ - $(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \ + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz endef diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 39bdd01..7b951ba 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,7 +57,7 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG $(KERNEL_BUILD_DIR)/debug/modules/ $(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug $(TAR) c -C $(KERNEL_BUILD_DIR) debug \ - $(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \ + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ | bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2 endef endif diff --git a/scripts/sysupgrade-nand.sh b/scripts/sysupgrade-nand.sh index 73881e0..45b17da 100755 --- a/scripts/sysupgrade-nand.sh +++ b/scripts/sysupgrade-nand.sh @@ -58,7 +58,7 @@ echo "BOARD=${board}" > "${tmpdir}/sysupgrade-${board}/CONTROL" mtime="" if [ -n "$SOURCE_DATE_EPOCH" ]; then - mtime="--mtime=${SOURCE_DATE_EPOCH}" + mtime="--mtime=@${SOURCE_DATE_EPOCH}" fi (cd "$tmpdir"; tar cvf sysupgrade.tar sysupgrade-${board} ${mtime})