From patchwork Sat Feb 27 18:12:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1445199 X-Patchwork-Delegate: daniel@makrotopia.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Y/iFI7R3; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnvnM3sXkz9sVs for ; Sun, 28 Feb 2021 05:14:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DtwOqhptDqK4/YWsilG52g4VMV538sP5Hb6EytQbaRo=; b=Y/iFI7R3paOakJSWDuMlzEgXa jWxMRgKgB12GZ4uSQBu4Y6sLtxX3BzKgEK2qQi4n+WjywgriV99/8GFFucW4npqk42Ew1xdopNHYL FrvtoQxwSSDeWGsQ6xEPbojtUdZaVZCpVRZPeICOO2ECbgQBdnV92xc4xyfpbrGY5C7xaMAW7Zwcy 8+i7RWwLK0bT3JmFqwaaMekERtCNZPPwiWXYGSUvK4SZmibcOdp0prd/BDoWIdYX7nbvU3UqWS81E t5ibpLxMSL7CvzzTdAPv2FnOv5iwhtL7YQr8cdWrBbUT11C69uAlSVjNhxHT237jPyaB7yREwzTuP +/tKXLM4A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lG44u-0001Ot-Vo; Sat, 27 Feb 2021 18:12:33 +0000 Received: from mars.blocktrron.ovh ([2001:41d0:401:3000::cbd] helo=mail.blocktrron.ovh) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lG44r-0001Np-BX for openwrt-devel@lists.openwrt.org; Sat, 27 Feb 2021 18:12:30 +0000 Received: from dbauer-t470.fritz.box (p200300c63f2bcd0084629dac7ce72b91.dip0.t-ipconnect.de [IPv6:2003:c6:3f2b:cd00:8462:9dac:7ce7:2b91]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.blocktrron.ovh (Postfix) with ESMTPSA id F1B9323421; Sat, 27 Feb 2021 19:12:24 +0100 (CET) From: David Bauer To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] include: use cpio from staging dir Date: Sat, 27 Feb 2021 19:12:10 +0100 Message-Id: <20210227181210.90007-2-mail@david-bauer.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210227181210.90007-1-mail@david-bauer.net> References: <20210227181210.90007-1-mail@david-bauer.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210227_131229_526355_7DC3C484 X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniel@makrotopia.org Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org As we built our own CPIO now, use this version instead of whatever the host may or may not provide. Signed-off-by: David Bauer --- include/image.mk | 2 +- include/kernel-defaults.mk | 2 +- include/unpack.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/image.mk b/include/image.mk index 48911e4057..7f0d27b746 100644 --- a/include/image.mk +++ b/include/image.mk @@ -301,7 +301,7 @@ endif ifdef CONFIG_TARGET_ROOTFS_CPIOGZ define Image/Build/cpiogz - ( cd $(TARGET_DIR); find . | cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz ) + ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R root:root | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz ) endef endif diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 4b39296f8c..c246857cd3 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -163,7 +163,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPERATE),y) ifeq ($(CONFIG_EXTERNAL_CPIO),y) $(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd.cpio else - ( cd $(TARGET_DIR); find . | cpio -o -H newc -R root:root > $(KERNEL_BUILD_DIR)/initrd.cpio ) + ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R root:root > $(KERNEL_BUILD_DIR)/initrd.cpio ) endif $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd.cpio > $(KERNEL_BUILD_DIR)/initrd.cpio.bzip2) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),gzip -f -S .gzip -9n $(KERNEL_BUILD_DIR)/initrd.cpio) diff --git a/include/unpack.mk b/include/unpack.mk index 6a56b8e742..ebece69978 100644 --- a/include/unpack.mk +++ b/include/unpack.mk @@ -40,7 +40,7 @@ ifeq ($(strip $(UNPACK_CMD)),) UNPACK_CMD=$(DECOMPRESS_CMD) $(TAR_CMD) endif ifeq ($(EXT),cpio) - UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..; cpio -i -d) + UNPACK_CMD=$(DECOMPRESS_CMD) (cd $(1)/..; $(STAGING_DIR_HOST)/bin/cpio -i -d) endif ifeq ($(EXT),zip) UNPACK_CMD=$(UNZIP_CMD)