From patchwork Fri Sep 4 22:46:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1357857 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; dmarc=none (p=none dis=none) header.from=aparcar.org 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=pO5/MITu; 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 4BjtBN5MHBz9sSP for ; Sat, 5 Sep 2020 08:48:28 +1000 (AEST) 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=pDlhSqOjwwxR2LHkBnxotxyt265Q2xHKWqE+s/YeR1s=; b=pO5/MITutuuvU3IXeiyeHE7zO au6PzJffsdv4GRRXAdwaZQU0FCo/FHWKLmhGf11HEzvjv5xz2tKZKx44PXuJkxTijtp3yPoRkRguT blRLhYXzMKAQvwgyip+8UPO7A4paHTU83U9HXGos+tJ3nTby482VWEjQiy/Sum/dkVr3afypdEAWn bxli/luKp2EVuxzahHVkIW4279wienPYqYd3ZfMXrJqHqjXuR/+HXhELaURmCYTxcMgEKSYBDyWEx /XBDOrJRfWhKvdihtKWP4edqMgkTi1v0g94jhZSG4zba3f9B5qBgEqWGk38ZsbF+xcG+BMa4pq6uS 9k0WgNLgQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEKTw-0004Vj-03; Fri, 04 Sep 2020 22:46:56 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEKTt-0004V5-9U for openwrt-devel@lists.openwrt.org; Fri, 04 Sep 2020 22:46:54 +0000 X-Originating-IP: 72.234.141.215 Received: from dawn.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPA id 2538E20005; Fri, 4 Sep 2020 22:46:49 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] build: only use fakeroot for packages if required Date: Fri, 4 Sep 2020 12:46:36 -1000 Message-Id: <20200904224636.484105-2-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200904224636.484105-1-mail@aparcar.org> References: <20200904224636.484105-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200904_184653_419434_555962D9 X-CRM114-Status: GOOD ( 10.14 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.70.183.200 listed in list.dnswl.org] -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: Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Fakeroot was recently wrapped around the `ipkg-build` script to allow arbitrary file modes for packages, like setting a SUID. However this slows down the building process while most packages don't make use of that (by defining `PKG_FILE_MODES`). This commit only uses fakeroot if `PKG_FILE_MODES` is set. If it is not defined the newly added *all root* option `-r` is used. Signed-off-by: Paul Spooren --- include/package-ipkg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 0b7a561edc..362fa25307 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -260,7 +260,13 @@ $(_endef) endif $(INSTALL_DIR) $$(PDIR_$(1)) +ifdef PKG_FILE_MODES + echo "Package $(1) is build with fakeroot" >&2 $(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(PKG_FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1)) +else + echo "Package $(1) is build without fakeroot" >&2 + $(SCRIPT_DIR)/ipkg-build -r $$(IDIR_$(1)) $$(PDIR_$(1)) +endif @[ -f $$(IPKG_$(1)) ] $(1)-clean: