From patchwork Sun Nov 12 17:45:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 837228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uhKFdJT4"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yZh5z56k9z9sRq for ; Mon, 13 Nov 2017 04:46:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 913B4885E2; Sun, 12 Nov 2017 17:46:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Um93qE-LYAPa; Sun, 12 Nov 2017 17:46:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0D54F8857B; Sun, 12 Nov 2017 17:46:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8F4D91CEA08 for ; Sun, 12 Nov 2017 17:46:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 83D5C884D9 for ; Sun, 12 Nov 2017 17:46:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yPp2cpqRtfPR for ; Sun, 12 Nov 2017 17:46:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4A93B88408 for ; Sun, 12 Nov 2017 17:46:05 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 9so5516777wme.4 for ; Sun, 12 Nov 2017 09:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pU59CjaipP5lyKXbp+NfBgeceRBZ7/yEOntThAj/u9k=; b=uhKFdJT4FXUC+8cP2n2X3nPVlZcyh4/fnmtWeCkfAewfVuEm5tqfXkK5IL9IV0Ugu3 aBFW1NY31fKDWcaUyE8uTF1dpA+bGXQfbNDqjxmZx5aK1bv8YBLSCTa5lwH/whEm/iRf QAeBRCGeAv1fLVvBKxvZRiQv2PNNDcmwEYI1KG7qiSJQzP5O+gFqzm0uS0scPACJoKrt Rcu7fYZe6A1XYFMLa9Cm05F6B/tF7Tolfuugt4PE5Kl8KIVhqzTs5h0uW41i3aevsoTX VfGV/GIW6w+yU2WVbEtv+8gxqQY5Zdu421qGYGrtgsHCIfqKJm6jxyl/jcL/CRLMYmk5 L+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pU59CjaipP5lyKXbp+NfBgeceRBZ7/yEOntThAj/u9k=; b=eNTQzVeKtdmQJs55Lbd3Jms5e2/59pgEZ+ebMUMSFse2s3TXGtiDlTvzwVJ9cJc11r DA5lmxiHSMaom6MFMFbESPMvG0qYstIvdTzJzMNaxVdRdzAqc1aFQgk4VJRjTNp5gwyl 7/xJ3gQCVmgkHGcToJ2EZMyqnEO1ZfCv9hNHNjfC1OfwO4EtaVKaFnxDk8UaLmikKUa7 TB998/D7uiB4a2ygRq4KDaPpf+pIbpomFscToyfRKU7VH0UpNlcKSHGvYlzu2t+a5/F4 5J4bLtvLDZulnDwv326wfen4VBzZrPcCSokcUNDZcsKhertEW23dcg9qAmbViAGzDYQ5 P/Lg== X-Gm-Message-State: AJaThX4Ad/ihYThXv+0gMN0Qr6qL0Xs0Q40gkxlVBGvppphphmkGltci aNjy2p6GIYYwq1eQ3auCl1B0Yg== X-Google-Smtp-Source: AGs4zMZLfezrkfV9AMhRqh6hsqp6lUsglZhSd4BdbgG5BfeFcWj8ThjI8RrqItTKIDLLc2wDFHxwGQ== X-Received: by 10.28.194.139 with SMTP id s133mr2184138wmf.14.1510508763504; Sun, 12 Nov 2017 09:46:03 -0800 (PST) Received: from localhost.localdomain (2a01cb0886107300fc501d253e69f7ad.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:fc50:1d25:3e69:f7ad]) by smtp.gmail.com with ESMTPSA id b15sm14334449wrh.35.2017.11.12.09.46.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 09:46:02 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 12 Nov 2017 18:45:44 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Subject: [Buildroot] [PATCH 06/14] fs/cpio: use a post-gen hook rather than a post-target rule X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , "Yann E. MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We already have a mechanism for running stuff after the filesystem is generated, and that's called post-gen hooks. Use those hooks. Note: for cpio (and unlike ext2 previously), the dependency chain was correct, in that the post-target rule correctly depended on the image rule. Nonetheless, we still want to fix it for consistency. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Romain Naour --- fs/cpio/cpio.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index e82167e512..c68e0bfb97 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -31,12 +31,13 @@ define ROOTFS_CPIO_CMD cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@ endef -$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools - $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \ - -C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@ - ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) -ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot +ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools +define ROOTFS_CPIO_UBOOT_MKIMAGE + $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \ + -C none -d $@$(ROOTFS_CPIO_COMPRESS_EXT) $@.uboot +endef +ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE endif $(eval $(call ROOTFS_TARGET,cpio))