From patchwork Wed Dec 18 20:39:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1212786 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=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UFnxMw9r"; 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 47dRh06fYQz9sP3 for ; Thu, 19 Dec 2019 07:39:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C5AD286DB0; Wed, 18 Dec 2019 20:39:21 +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 nKFUuGPvbqW8; Wed, 18 Dec 2019 20:39:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 16CD186DAC; Wed, 18 Dec 2019 20:39:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AF7AC1BF410 for ; Wed, 18 Dec 2019 20:39:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC4EE878E5 for ; Wed, 18 Dec 2019 20:39:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YQATG9Tdo9UJ for ; Wed, 18 Dec 2019 20:39:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 80D5887985 for ; Wed, 18 Dec 2019 20:39:12 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id q10so3709270wrm.11 for ; Wed, 18 Dec 2019 12:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PhiOoxrsiJD+xX98x7Aw1loXVQ30RUzu7rKxuZrlcnw=; b=UFnxMw9rYNV+dADtpS3KGXAC/P2h0xbPqn1fD2gPU/zXIqfSZL8vWTlZ1antgxtbWl R0tDoqGUb6H12iq48t2g4JycAoo7SBcpQQpWSok0rLAggwwZ/TZEbdshPHm6Ugza8Fzh gItUP4ehM9KdLsly6SMOAY69kt1eYzgB3iIi5D8oSVF9Qplr67gSqqv5rvxGZ7STBm6m u04B232NCfVIf1feWQahdkYN+SW/ArTrwlpwhdW3VKDVO6yOPyrMe2vk0NY/fiAAuEvV VJpBOfrCrdM73ca0bGG8cJfrRCAucmW7DaTyoa7Kk50U3I1YaSeAk5fFSpdUaxmgccS1 7/IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PhiOoxrsiJD+xX98x7Aw1loXVQ30RUzu7rKxuZrlcnw=; b=p3lr7HO8O+2cotWlvLWlNHDS0ZoNCU53Z4id4oZKUmfKE1vvU/Y5aBmLL2uo9rwJd9 zGB7JMe9gpaYmJr8fkInbSp4xwjk1k8Hejo3KJyhahIYGil2XgMIuHNYyIz0/oK8J7d+ e0ypIGKFrPldiHmYNZHhDOdtxZJKM1oAFI9wZDlNREf38HUTaJ8WpXmvsi5o58W/iowu yABckWMOg/bRONSrbLtnttwGiurQ9mCvSIwA8nsVLh9UJI6llIOfdHOOWF5beMK8v6k6 PglgckK5b0kmCT9DDv17xoOIKGARTy2CRgmmXa4WWr8ymjN+zzJoqwxErHgIKBZo1g58 1EUA== X-Gm-Message-State: APjAAAV23BTpvlld0xmghJJH2q4RuFkqcAd8LkMO3CmvK3LdC8XffEMY Rr4MXXmw3o4CbkwYvQ2yVEPUEyuN X-Google-Smtp-Source: APXvYqy+nKBnEwHZ5HJ+hcwRwpSOcMh5rLLZDk4kzPSn9hHWSh8Od00ecUO0NX4SWsgO1r1fhk9vlw== X-Received: by 2002:adf:f850:: with SMTP id d16mr5028708wrq.161.1576701550540; Wed, 18 Dec 2019 12:39:10 -0800 (PST) Received: from scaer.home ([2a01:cb19:8b51:cb00:d010:e813:2e1b:ba63]) by smtp.gmail.com with ESMTPSA id w22sm3508758wmk.34.2019.12.18.12.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 12:39:10 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 18 Dec 2019 21:39:05 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] package/systemd: add dependency on host-coreutils 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: Trent Piepho , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is needed as systemd has gained a dependency on realpath(1) which was introduced in coreutils too recently for our supported distro to have it (Ubuntu 14.04 does not have it from coreutils, although there is a dedicated package for it). This also means that we now have a ln that understands --relative, so we can drop our workaround, that upstream said they would never accept anyway [0]. [0] https://github.com/systemd/systemd/pull/5682 Fixes: http://autobuild.buildroot.org/results/a9a/a9a285e482285d062892bab0d1a2e2f89928c92d/ http://autobuild.buildroot.org/results/6f5/6f5b1065859d866af6fa719f611c3ea7f4b88760/ ... Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Maxime Hadjinlian --- .../0001-install-don-t-use-ln-relative.patch | 80 ------------------- package/systemd/systemd.mk | 2 + 2 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 package/systemd/0001-install-don-t-use-ln-relative.patch diff --git a/package/systemd/0001-install-don-t-use-ln-relative.patch b/package/systemd/0001-install-don-t-use-ln-relative.patch deleted file mode 100644 index 9201724da1..0000000000 --- a/package/systemd/0001-install-don-t-use-ln-relative.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 006b1d65fd5ea6555fcb72054ecc20234f4175db Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sun, 31 Dec 2017 12:46:04 -0500 -Subject: [PATCH] install: don't use ln --relative - -Oldish enterprise-class distributions have too old versions of -coreutils, with ln not supporting --relative. - -So we fake it. - -ln --relative would create minimalist relative paths, but they are not -trivial to generate. Instead, we always create paths relative to the -root, i.e.: - - ln -s --relative /usr/bin/foo /usr/sbin/foo - -would create: /usr/sbin/foo -> ../bin/foo -while we do : /usr/sbin/foo -> ../../usr/bin/foo - -Signed-off-by: "Yann E. MORIN" -[aduskett@gmail.com: Added meson.build section and dirname wrapper in add-wants] -[aduskett@gmail.com: Update for systemd v237] -Signed-off-by: Adam Duskett -[tpiepho@impinj.com: Fix add-wants wrapper] -Signed-off-by: Trent Piepho ---- - meson.build | 2 +- - tools/meson-make-symlink.sh | 3 ++- - units/meson-add-wants.sh | 6 ++++-- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index e5ceb1e169..9d3c746da4 100644 ---- a/meson.build -+++ b/meson.build -@@ -591,7 +591,7 @@ endforeach - conf.set_quoted('TELINIT', get_option('telinit-path')) - - if run_command('ln', '--relative', '--help').returncode() != 0 -- error('ln does not support --relative (added in coreutils 8.16)') -+ message('ln does not support --relative (added in coreutils 8.16)') - endif - - ############################################################ -diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh -index da0d13a341..4917eff7d1 100755 ---- a/tools/meson-make-symlink.sh -+++ b/tools/meson-make-symlink.sh -@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" - if [ "$(dirname $1)" = . ]; then - ln -vfs -T "$1" "${DESTDIR:-}$2" - else -- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" -+ dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )" -+ ln -vfs -T "${dds}$1" "${DESTDIR:-}$2" - fi -diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh -index a483d75b86..4642673d98 100755 ---- a/units/meson-add-wants.sh -+++ b/units/meson-add-wants.sh -@@ -14,7 +14,7 @@ case "$target" in - ;; - esac - --unitpath="${DESTDIR:-}${unitdir}/${unit}" -+unitpath="${unitdir}/${unit}" - - case "$target" in - */) -@@ -25,4 +25,6 @@ case "$target" in - ;; - esac - --ln -vfs --relative "$unitpath" "$dir" -+[ ! -d "${dir}" ] && linkdir=`dirname "${dir}"` || linkdir="${dir}" -+dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')" -+ln -vfs "$dds$unitpath" "$dir" --- -2.20.1 - diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cfe4e2a108..3c44b039b5 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -10,6 +10,7 @@ SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, s SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ + $(BR2_COREUTILS_HOST_DEPENDENCY) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ kmod \ @@ -553,6 +554,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysvinit-path='' HOST_SYSTEMD_DEPENDENCIES = \ + $(BR2_COREUTILS_HOST_DEPENDENCY) \ host-util-linux \ host-patchelf \ host-libcap \