Message ID | 20210507193521.27838-2-devel-sven@geroedel.de |
---|---|
State | Accepted |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) 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=desiato.20200630 header.b=ptnh7Lto; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4FcLMB143Kz9sVv for <incoming@patchwork.ozlabs.org>; Sat, 8 May 2021 05:37:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:References:In-Reply-To:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+BXBgoamMRxNqfboxqqmD7P742kjtTCQZJc9l7YFE0I=; b=ptnh7LtoAr/bs72nDn/BW48fs/ 0CMPHzdi91ZJdNqlLVwcZxYZoyJPV9CjQMa+YNmATgdkQUOFlfMqpwL48l1ZNLbUI5q073O1OCzWc V2nOxw6WnppEML3yvVilKcrE5KEQb3wv65Did6299w59gsHDJdoNxcWe3dOOfCWijMa6tOLkNC5x4 CzaTDGnUbgJOL/ixXazdhaZk4RADvqMO/1k2vVvwoYIgdG6F8bVbfjFAmXmcvy5p9sfzvTJt6P2i/ HO1CGmcQbszbA5gbGa6d9azv6DCGo/u0PrLk8WqkxzAR0Ah3TZUyHMBo2YA2La84EiEn3GozddbS+ aGwmg+yw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lf6GR-007sRH-QN; Fri, 07 May 2021 19:35:55 +0000 Received: from dazzle.geroedel.de ([91.143.85.9]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lf6GF-007sPI-QV for openwrt-devel@lists.openwrt.org; Fri, 07 May 2021 19:35:46 +0000 Received: from [192.168.15.2] (helo=feeble.bln.roederer.dhs.org) by dazzle.geroedel.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from <devel-sven@geroedel.de>) id 1lf6GD-00031o-A6 for openwrt-devel@lists.openwrt.org; Fri, 07 May 2021 21:35:43 +0200 Received: from strike.bln.roederer.dhs.org ([192.168.8.36]) by feeble.bln.roederer.dhs.org with smtp (Exim 4.92) (envelope-from <devel-sven@geroedel.de>) id 1lf6GC-0007VB-Ur for openwrt-devel@lists.openwrt.org; Fri, 07 May 2021 21:35:41 +0200 Received: (nullmailer pid 27978 invoked by uid 10000); Fri, 07 May 2021 19:35:40 -0000 From: Sven Roederer <devel-sven@geroedel.de> To: openwrt-devel@lists.openwrt.org Date: Fri, 7 May 2021 21:35:20 +0200 Message-Id: <20210507193521.27838-2-devel-sven@geroedel.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210507193521.27838-1-devel-sven@geroedel.de> References: <5609443.HjInUDa7Oa@strike> <20210507193521.27838-1-devel-sven@geroedel.de> X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam_report: Spam detection software, running on the system "dazzle", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Using these config-options to customize the folders used at build-time makes these folder settings appear in generated archive. This causes the imagebuilder to be not portable, as it's going to use th [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-SA-Exim-Connect-IP: 192.168.15.2 X-SA-Exim-Mail-From: devel-sven@geroedel.de X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dazzle X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 1/2] imagebuilder: unset BINARY_FOLDER and DOWNLOAD_FOLDER in final archive X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on dazzle.geroedel.de) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210507_203543_981355_F2FE06AF X-CRM114-Status: UNSURE ( 6.11 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Using these config-options to customize the folders used at build-time makes these folder settings appear in generated archive. This causes the imagebuilder to be not portable, as it's going to use th [...] Content analysis details: (0.0 points, 5.0 required) 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.34 Precedence: list List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
imagebuilder, sdk: unset BINARY_FOLDER and DOWNLOAD_FOLDER in final archives
|
expand
|
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index f9c08776a8..0580e41c57 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -29,6 +29,8 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \ $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR) -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config + $(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config + $(SED) 's/^CONFIG_DOWNLOAD_FOLDER=.*/# CONFIG_DOWNLOAD_FOLDER is not set/' $(PKG_BUILD_DIR)/.config $(CP) -L \ $(INCLUDE_DIR) $(SCRIPT_DIR) \ $(TOPDIR)/rules.mk \
Using these config-options to customize the folders used at build-time makes these folder settings appear in generated archive. This causes the imagebuilder to be not portable, as it's going to use the build-time folders on the new systems. Errors look like: mkdir: cannot create directory '/mnt/build': Permission denied Makefile:116: recipe for target '_call_image' failed make[2]: *** [_call_image] Error 1 Makefile:241: recipe for target 'image' failed make[1]: *** [image] Error 2 The build-time settings of these folders are passed into the archives via .config file. The expected behavior is that after unpacking the imagebuilder acts like these settings have their defaults, using intree folders. So unset the build-time settings. Signed-off-by: Sven Roederer <devel-sven@geroedel.de> --- target/imagebuilder/Makefile | 2 ++ 1 file changed, 2 insertions(+)