From patchwork Thu Sep 10 12:57:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jo-Philipp Wich X-Patchwork-Id: 1361550 X-Patchwork-Delegate: jow@openwrt.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; dmarc=none (p=none dis=none) header.from=mein.io 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=sJMYOQPr; 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 4BnJqm1xHCz9sTg for ; Thu, 10 Sep 2020 22:59:15 +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: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:In-Reply-To:References:List-Owner; bh=DiaZrg8lCKUOXYPqSUte9aioTF6y6obdvDUCF9X5vqo=; b=sJMYOQPr2aHF3PowujdwlcU8mZ HpL6WeuOLBzE7F4kglo91/F9F+a7ekLFqEetfLzg/6+m3sUkmdFk4lWYgJFOp3BI6lqmd2StZVa6j k4JhsjaHIvdbuNOcIm7fotTNF5y2DfCl52x54S8HR83NFpwA1U5hlpaW5aiuQpJylN7qzehQtemST kfey3mLDjG+xno3Q5ba5qh2WyO4b+W5IRKEnKn0KrIb6f/erA5ErfRMQkbRSCAd7EosJzaOXLLFrW KcmSPjGF3XiS0U8aMQV6U3fhj9iXjdGYAXYDBElyfo9IYz7wAfNfW/zYlXoruUOOjxIkCcocanaWV G12mjYCg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGM8w-0008RO-Jt; Thu, 10 Sep 2020 12:57:38 +0000 Received: from mxout01.bytecamp.net ([212.204.60.217]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGM8s-0008Q9-Cz for openwrt-devel@lists.openwrt.org; Thu, 10 Sep 2020 12:57:35 +0000 Received: by mxout01.bytecamp.net (Postfix, from userid 1001) id 0FFB57F9A2; Thu, 10 Sep 2020 14:57:33 +0200 (CEST) Received: from mail.bytecamp.net (mail.bytecamp.net [212.204.60.9]) by mxout01.bytecamp.net (Postfix) with ESMTP id C88CD7F99F for ; Thu, 10 Sep 2020 14:57:32 +0200 (CEST) Received: (qmail 94879 invoked from network); 10 Sep 2020 14:57:32 +0200 Received: from unknown (HELO j7.lan) (jo%wwsnet.net@95.90.24.103) by mail.bytecamp.net with ESMTPS (DHE-RSA-AES128-GCM-SHA256 encrypted); 10 Sep 2020 14:57:32 +0200 From: Jo-Philipp Wich To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] fakeroot: make fakeroot script relocatable Date: Thu, 10 Sep 2020 14:57:30 +0200 Message-Id: <20200910125731.3415057-1-jo@mein.io> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_085734_582590_F81975C3 X-CRM114-Status: GOOD ( 11.12 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.204.60.217 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender 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: Jo-Philipp Wich , Daniel Golle Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Patch the fakeroot script template to discover faked and libfakeroot.so relative to the STAGING_DIR_HOST environment variable, similar to how it is done for automake, libtool, quilt and autoconf already. This avoids the need for passing the paths to faked and libfakeroot.so manually every time we invoke fakeroot and subsequently allows us to drop OS X specific logic. Signed-off-by: Jo-Philipp Wich --- tools/fakeroot/patches/000-relocatable.patch | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 tools/fakeroot/patches/000-relocatable.patch diff --git a/tools/fakeroot/patches/000-relocatable.patch b/tools/fakeroot/patches/000-relocatable.patch new file mode 100644 index 0000000000..9f6915bfe8 --- /dev/null +++ b/tools/fakeroot/patches/000-relocatable.patch @@ -0,0 +1,25 @@ +--- a/scripts/fakeroot.in ++++ b/scripts/fakeroot.in +@@ -30,12 +30,19 @@ fatal () + } + + # strip /bin/fakeroot to find install prefix +-FAKEROOT_PREFIX=@prefix@ +-FAKEROOT_BINDIR=@bindir@ ++if [ -n "$STAGING_DIR_HOST" ]; then ++ FAKEROOT_PREFIX="${STAGING_DIR_HOST}" ++ FAKEROOT_BINDIR="${STAGING_DIR_HOST}/bin" ++ FAKEROOT_LIBDIR="${STAGING_DIR_HOST}/lib" ++else ++ FAKEROOT_PREFIX=@prefix@ ++ FAKEROOT_BINDIR=@bindir@ ++ FAKEROOT_LIBDIR=@libdir@ ++fi + + USEABSLIBPATH=@LDPRELOADABS@ + LIB=lib@fakeroot_transformed@@DLSUFFIX@ +-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot ++PATHS=${FAKEROOT_LIBDIR}:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot + FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ + + FAKED_MODE="unknown-is-root"