From patchwork Mon Jun 15 21:40:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1309847 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KA9q+bix; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49m4WV4DLRz9s1x for ; Tue, 16 Jun 2020 07:40:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7D6B78641E; Mon, 15 Jun 2020 21:40:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nZD9Z2IhvOM0; Mon, 15 Jun 2020 21:40:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8E6D786374; Mon, 15 Jun 2020 21:40:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 67F0D1BF27E for ; Mon, 15 Jun 2020 21:40:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 599C92474E for ; Mon, 15 Jun 2020 21:40:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nlb3ep5rarst for ; Mon, 15 Jun 2020 21:40:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id D4CEF234BD for ; Mon, 15 Jun 2020 21:40:24 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id q11so18672745wrp.3 for ; Mon, 15 Jun 2020 14:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/PnU69hxzouTbhjtNhK5OIvlCgoO0xa5rxuP+O2fvHQ=; b=KA9q+bixBWkfz2hCP2QK9WWgRfOEmm/aXMBptZWJzbJSgFyqrO42XkuO21zvtXQm/F AjGpoBIoXsdvRP592/QYKjXfe1wFQKd6p96TUMmAIL8ps3qXtlPlyF9nzfX63QQ4/BIf owki15eu6647HGTpGHvL0VtpYKEuI2keg0y1M6hO56JKjm4VRxajm5c1XXkhAr5H6cxB 0bFvrHRWE46F0+9xbFyfW2MES3tdZtkZ8LrWWVz/8jtYCIReNigS9Yi5Cb8q2uMyQjBX QL2X7GPVxvs2//ZFONc/P167ZQZo0OulGxssTImip2qnYBkZmwz7JSMFADLOg7fFC1Ib ve7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/PnU69hxzouTbhjtNhK5OIvlCgoO0xa5rxuP+O2fvHQ=; b=TKUGgm2+0admk8sjuI90/5hmg3ulKZoU1OzV/aTUG3pLt0g/9L4U8tqadsZxNrYMSc xNqHgLPcz8uaZ5nqD3v37e/2NR3f0ES4ANo14C+5Xr2cl3WOrxZsiGP4YsF3v40dqZr5 gqmnrk/vZCACYgd1jbSqLxqDiSHi0MulPkOFj9ZXDozcVRV//D8Z/fEgu+CnHb/St1VF Yda+iR45oRxerU2Kq9v+XC0ENnsgcc8LTfDTMDVTpAhE2y84Na3F8oHShM00YaRGJKy4 vDAR4FYX3KFNcjk0/6nMLYthP1XXR9ha4k3yTfzKaHv5zRRTT/ZocmMprZfp+hR80z7b iM6w== X-Gm-Message-State: AOAM531tzSRJq06wOqqunah429gTmcqV7g6lRp5h1nEmsT1F9Kz025Ro 3fdbaHOsaA2CNLQMkwdpxoNZkTX1V4w= X-Google-Smtp-Source: ABdhPJwD/pi3vLhgVv9ZRcGKQ/E4M2MKxUk2AnHdcYYN9xqxYx712IRgy+0bP0kvedPvsdpR9UPgHA== X-Received: by 2002:adf:f2cd:: with SMTP id d13mr29594172wrp.378.1592257222995; Mon, 15 Jun 2020 14:40:22 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id h29sm28470101wrc.78.2020.06.15.14.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 14:40:22 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 15 Jun 2020 23:40:07 +0200 Message-Id: <20200615214007.200671-1-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/systemd: fixup RPATH for more systemd host binaries X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Norbert Lange , yann.morin.1998@free.fr, Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" All systemd binaries depend on libsystemd-shared and need their RPATH fixed. Use a glob to catch them all Signed-off-by: Norbert Lange --- v1->v2: - dont ignore failure from patchelf --- package/systemd/systemd.mk | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2cc71ee667..ae0de067e1 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -659,6 +659,8 @@ HOST_SYSTEMD_DEPENDENCIES = \ host-libcap \ host-gperf +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + # Fix RPATH After installation # * systemd provides a install_rpath instruction to meson because the binaries # need to link with libsystemd which is not in a standard path @@ -667,19 +669,10 @@ HOST_SYSTEMD_DEPENDENCIES = \ # * the original path had been tweaked by buildroot via LDFLAGS to add # $(HOST_DIR)/lib # * thus re-tweak rpath after the installation for all binaries that need it -HOST_SYSTEMD_HOST_TOOLS = \ - systemd-analyze \ - systemd-machine-id-setup \ - systemd-mount \ - systemd-nspawn \ - systemctl \ - udevadm - -HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) define HOST_SYSTEMD_FIX_RPATH - $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ - $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) + $(foreach f,$(wildcard $(addprefix $(HOST_DIR)/bin/,journalctl systemctl udevadm systemd-*)), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(f) ) endef HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH