From patchwork Wed Dec 18 20:39:03 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: 1212782 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="LnbvPIkK"; 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 47dRgn71W1z9sPL for ; Thu, 19 Dec 2019 07:39:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C504186D37; Wed, 18 Dec 2019 20:39:15 +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 R285lPg_dB7t; Wed, 18 Dec 2019 20:39:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4ECCE86D42; Wed, 18 Dec 2019 20:39:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A65A21BF410 for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A0ABC8837F for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vP64PxiBOrkq for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id B15F687E63 for ; Wed, 18 Dec 2019 20:39:10 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z3so3747467wru.3 for ; Wed, 18 Dec 2019 12:39:10 -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=HvbYtBvvkxvbTwAOaojXJafay5TmFV25P1LHwBUmP6w=; b=LnbvPIkKIAz+5csf6Pyp/gH3b9IlZqgbGU0mcYxHO4scOBlkLmbx99o6UxwsLiKeM+ 3OGcA2t+2zRC/0wNjoeY6gCW4XF7IQ/tTor+CRlnBBJ8BUWpDNCayx9kLai8xq5kgBqa +lEECP7UIggsmyU08BwemSsqhiqkLKJUQHIu16OuYXm62eRj3NFyhNhG9FF6QHbYfL11 2OJ2/0aY67Gso+ZKXfokfkxRQPx08GJhQzkLFwad4J2NS4Jjr8PeMO7i7TQzYwagYyLY R5iZBbSuO9CiXbsPX/HBIPXuqLw0f4JAXqKE6bf9xoNxnbnuMK7CuOGi2HPvMGckz9wZ M5qg== 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=HvbYtBvvkxvbTwAOaojXJafay5TmFV25P1LHwBUmP6w=; b=Wn5xXAcP2NKLqOtxPDcG+CBhZYZU0ssKciI7J4nX10JhcsCfH1BZp1lyqlL4CeB8Wd 9dOOzxu8+5pj3kgHLVfmZvBc1FnBFbgBAOvwueEPQIPNoT9aAyqT3rhPxLAALIT1W9Hu fSs32bLkPLI2D4zRnBi4WNfLC9+HzrBg7KxeTJo0rVGubsVLcj3pR7vEPmvQRzESH7gT 6AWRtrebh88y+V4B4pK7PTqOnT2+jAuISYkoRCptuE69JRtLJsF0LHQdMBKUQ91xNIS+ a/q1haVIYyUnntr0EmFLvZED4FjyqOokYtqBTbSm4DziKvQYHcKvoatDg4ZGm71Zrv4H ezKg== X-Gm-Message-State: APjAAAUYrTUWor/mARuIir0vaSihGzqSA2LCVl+0e2LtMhGHnL/gbDyN us7ue5QwF34rNxSmTQ3glF9wsQTu X-Google-Smtp-Source: APXvYqynUY52nZBiTMFJxfTu0RJmqqNgLDcAhUVTDjy6it0cG1KfjMXBQu6FmTLncQ5T3OVCscvF3A== X-Received: by 2002:adf:cd0a:: with SMTP id w10mr4826199wrm.107.1576701548763; Wed, 18 Dec 2019 12:39:08 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 12:39:08 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 18 Dec 2019 21:39:03 +0100 Message-Id: <447ec97983b75938b041918f436ba1ab5657093b.1576701539.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/5] package/coreutils: introduce a host variant 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: "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" More and more packages are now depending on ln --relative, some require realpath, both of which only got introduced in "recent" versions of coreutils; older distros had a separate realpath, though, but that is not in the list of our required dependencies, and was not installed by default. So, we introduce a minimal host variant of coreutils to provide those programs. Signed-off-by: Yann E. MORIN --- package/coreutils/coreutils.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index d312197e7e..a8137d1687 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -148,4 +148,18 @@ endef endif COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION +# Explicitly install ln and realpath, which we *are* insterested in. +# A lot of other programs still get installed, however, but disabling +# them does not gain much at build time, and is a loooong list that is +# difficult to maintain... +HOST_COREUTILS_CONF_OPTS = \ + --disable-acl \ + --disable-libcap \ + --disable-rpath \ + --disable-single-binary \ + --disable-xattr \ + --without-gmp \ + --enable-install-program=ln,realpath + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From patchwork Wed Dec 18 20:39:04 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: 1212783 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="PFmAh0b1"; 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 47dRgs2xPbz9sP3 for ; Thu, 19 Dec 2019 07:39:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E78C486D80; Wed, 18 Dec 2019 20:39:17 +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 J0gWv1fDInZZ; Wed, 18 Dec 2019 20:39:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A86A86D8D; Wed, 18 Dec 2019 20:39:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E05081BF9AD for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D8F3A87E63 for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qVxib3jmvTeu for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by hemlock.osuosl.org (Postfix) with ESMTPS id 429B588345 for ; Wed, 18 Dec 2019 20:39:11 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id z3so3747487wru.3 for ; Wed, 18 Dec 2019 12:39:11 -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=0m1HhzpHWaaYOqL8ESD4pT71/OZVesygqQ/0ixpGdZ0=; b=PFmAh0b1XLCJZGN6nZdLpv4zLwZ8k5N2AHACbgVMLL7G1t7Nqvooyaig0XiRwBPHMK v6k8Xb3wM4QhcMh2c54+Cj5w2LUASWvDPCHOYRFVFebX1wqu6awXmgemgV8rxDacHE/i CjzDjC4RxmSn4cH/n6IoBBFZR2IOY14PHQlxWSOfNQmOVZDA7BOQrn56A1OH7YKCNIt6 +NkTDX8V3sEt9MdU8iolti7JpIAdnWl8yjxG3UrVlK6TyXqr61JVMzcrVTnXq9Pu54NZ bJNRhxIImf+MmvfuTUamzxw/KNMZl4tSw03XMyK3A05tx0yr2ZfhzrUYpilqmcTJGWJm L6PA== 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=0m1HhzpHWaaYOqL8ESD4pT71/OZVesygqQ/0ixpGdZ0=; b=Yt9eJ5xjddRXQzFmcQ05p8iISt9RqU/z2JTzTYLn2XFhmqPikTpMOZHmWAwpk0TLw/ LujfP8PRDedHglofip5w9H9TvKiDx9IlgxLzfNTwn5DEGocd3MQLqzrIiBXQAGsPnG80 kaNlHLdUeNz6GmjXPsG9lejEsmYq38/+sR/wXGSzUQS26Ton0A18k9nXwjWhzsqsyCMJ 9Og2tGb6LGjpotE7HworzEL4yx0BzMGatORxuu/Q/jeUaTrSDBLOR/8LLE8B1IXBqFUV gNx+XEWhfDbuda4ib3t1NDlKi+xkvG0lywP9dWzlEC3ZF5VZbMYJ0fEKxhhxT9FxWxjs hKFw== X-Gm-Message-State: APjAAAUhNiGCdKNn9olrLnsMKTSoFsWQIwknoDft9+bu7D58bSBXZU/9 3ostA3XPX/Ow6Xbga5VS7Z0pgK8X X-Google-Smtp-Source: APXvYqw7JsXMiL/axeRZFAB+76h1Ujj6Av1UWTxi0nddo2iYo11jC1ou9S+O0tkPVpuURSCaQ9WeBg== X-Received: by 2002:a05:6000:1241:: with SMTP id j1mr5264640wrx.26.1576701549521; Wed, 18 Dec 2019 12:39:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 12:39:09 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 18 Dec 2019 21:39:04 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/5] core/dependencies: check if we need to build our own 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: "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Yann E. MORIN --- support/dependencies/check-host-coreutils.mk | 6 ++++++ support/dependencies/check-host-coreutils.sh | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 support/dependencies/check-host-coreutils.mk create mode 100755 support/dependencies/check-host-coreutils.sh diff --git a/support/dependencies/check-host-coreutils.mk b/support/dependencies/check-host-coreutils.mk new file mode 100644 index 0000000000..87a3f446ea --- /dev/null +++ b/support/dependencies/check-host-coreutils.mk @@ -0,0 +1,6 @@ +# Check whether the host's coreutils are up to date enough +# to provide 'ln --relative' and 'realpath'. + +ifeq (,$(call suitable-host-package,coreutils)) +BR2_COREUTILS_HOST_DEPENDENCY = host-coreutils +endif diff --git a/support/dependencies/check-host-coreutils.sh b/support/dependencies/check-host-coreutils.sh new file mode 100755 index 0000000000..4d36d74933 --- /dev/null +++ b/support/dependencies/check-host-coreutils.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# Exit on the first error +set -e + +# Does ln supports the --relative/-r option? +ln --relative --help >/dev/null 2>&1 + +# Does realpath exist? +realpath --help >/dev/null 2>&1 + +echo OK 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 \ From patchwork Wed Dec 18 20:39:06 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: 1212785 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.133; helo=hemlock.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="FOdx+zl0"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dRgx4HPZz9sPL for ; Thu, 19 Dec 2019 07:39:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1F56688345; Wed, 18 Dec 2019 20:39:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YYVgffnWtwYt; Wed, 18 Dec 2019 20:39:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B535787E63; Wed, 18 Dec 2019 20:39:18 +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 6D91E1BF410 for ; Wed, 18 Dec 2019 20:39:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 68427203F7 for ; Wed, 18 Dec 2019 20:39:14 +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 pCx0i6YJMJpA for ; Wed, 18 Dec 2019 20:39:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by silver.osuosl.org (Postfix) with ESMTPS id 50AEF203BD for ; Wed, 18 Dec 2019 20:39:13 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id a5so3243211wmb.0 for ; Wed, 18 Dec 2019 12:39:13 -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=IVvXPa87HFjBUqr8YeQwp2+1apEbVsF7bDBg9n8VsjU=; b=FOdx+zl0MKDd6XLNwWFXbk/DpI96XPkeceP3yQGu7kb3RdM+ZRiU84HO21tW3N/HHm FEBVIzQZ95DjYGUyBb7mkUFtMPLiycBonFL0AzxeDEloO+uZCCgGHFrYsAtQnVkZxXSR fFPim1EXZ9oIvsx7apgsL2yH0DxvmTt2CLjjsM2iwQnGAyuj4etNhBwtcxac53Guah2M aJF7fecRobnnkJ4hmv9tuEaNaJa3PZU6Cv7Kt0yFZX5Hg7F8tLc+ZSWOwHjaRTeRW9zg TIzhNSk5QNJ+rVuZJt0Vsav260zIAFy7hpZEbRLYsbOUmEZvUjjlT5NxAmkvoJFLyBy0 +L6w== 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=IVvXPa87HFjBUqr8YeQwp2+1apEbVsF7bDBg9n8VsjU=; b=HLIUIby3hSDMvtJYg89P3ulCCGBrkwsUMHcjW3OBeKZj4wTeZHeV7pGdWPa4JVM6C9 1jzNS8PKdJWH1BHrfQlvGHp8K2rl3LRE/lXchng90aoqkSatNxZtZUr2z6CZAuKmGjxM SeIM9DnX9jB0gXmJplR7I+mL84nbAwldZJednmHOHWN7FQEuR2nW2nGPEmimBfz2cHeT huILxYzVz+syLdyqUGNUbPD5gv8mR77FfRSeglVLpL+AhGGEDu+vYZfki+CDuX60IJ/i bg6P7NGM5HzSllh7/LF9x/UW7K1gmwi2FXKaI2VbV+mW/j2eBMWLGoVeN2+RpPvzYx1v ZI0Q== X-Gm-Message-State: APjAAAX82KrDf6+yOljwVHgFPi9bDZDHImEyvd4YNoikhncsF+VAFV5F hfI3VFAcxHtb+S6V5uk8sxtzCaIW X-Google-Smtp-Source: APXvYqzHgNVvrDH1aAwHYphAkWVi5N3RqQ+dFonEoN4ByqS1+T3RMMOc4VkRFr73wAJhs0DLNrGTYw== X-Received: by 2002:a1c:3803:: with SMTP id f3mr5650030wma.134.1576701551607; Wed, 18 Dec 2019 12:39:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 12:39:11 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 18 Dec 2019 21:39:06 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] package/libselinux: add dependency on host-coreutils for ln --relative 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: Marcus Folkesson , Fabrice Fontaine , Adam Duskett , Thomas Petazzoni , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Clayton Shotwell Cc: Matt Weber Cc: Marcus Folkesson --- .../libselinux/0002-revert-ln-relative.patch | 26 ------------------ ...-ln-relative-usage-in-install-pywrap.patch | 27 ------------------- package/libselinux/libselinux.mk | 2 +- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 package/libselinux/0002-revert-ln-relative.patch delete mode 100644 package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch diff --git a/package/libselinux/0002-revert-ln-relative.patch b/package/libselinux/0002-revert-ln-relative.patch deleted file mode 100644 index f7beab2697..0000000000 --- a/package/libselinux/0002-revert-ln-relative.patch +++ /dev/null @@ -1,26 +0,0 @@ -Makefile: revert libselinux: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Fabrice Fontaine -[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)] - -diff -durNw libselinux-2.7.orig/src/Makefile libselinux-2.7/src/Makefile ---- libselinux-2.7.orig/src/Makefile 2018-01-15 20:53:50.168525700 +0100 -+++ libselinux-2.7/src/Makefile 2018-01-15 20:55:27.061858005 +0100 -@@ -181,7 +181,7 @@ - install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR) - test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig -- ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) -+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET) - - install-pywrap: pywrap - test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux diff --git a/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch b/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch deleted file mode 100644 index bf482af68a..0000000000 --- a/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch +++ /dev/null @@ -1,27 +0,0 @@ -From af2284b8510161e8742787a632ebb2aaef8fc045 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 25 Oct 2019 13:36:29 +0200 -Subject: [PATCH] Remove ln --relative usage in install-pywrap - -[Upstream: https://github.com/SELinuxProject/selinux/pull/184] -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 2b1696a0..799df2b0 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -175,7 +175,7 @@ install: all - install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) -+ cd $(DESTDIR)$(PYTHONLIBDIR) && ln -sf selinux/_selinux$(PYCEXT) _selinux$(PYCEXT) - - install-rubywrap: rubywrap - test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) --- -2.21.0 - diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index b8ef4f5fba..1461e34539 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -9,7 +9,7 @@ LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -LIBSELINUX_DEPENDENCIES = libsepol pcre +LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre LIBSELINUX_INSTALL_STAGING = YES From patchwork Wed Dec 18 20:39:07 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: 1212784 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.136; helo=silver.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="d8vCGa02"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dRgx40LQz9sP3 for ; Thu, 19 Dec 2019 07:39:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E322B203BD; Wed, 18 Dec 2019 20:39:22 +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 0MEwNG8RKQEw; Wed, 18 Dec 2019 20:39:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A1C52203F7; Wed, 18 Dec 2019 20:39:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 081931BF410 for ; Wed, 18 Dec 2019 20:39:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 04BCA87E63 for ; Wed, 18 Dec 2019 20:39:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gDBnlDpIkVCJ for ; Wed, 18 Dec 2019 20:39:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id 474C487DA1 for ; Wed, 18 Dec 2019 20:39:14 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id t14so3362465wmi.5 for ; Wed, 18 Dec 2019 12:39:14 -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=uZvI9fEYZz4EcALkAOSyBZC1D/Kv82bo461/KfemNF0=; b=d8vCGa02jEcG/BbxGgcXcM+aZDbCo7VwV+iEwwQ6jDJr/xAGfYy+ga/rmKtGf9OFQ9 PA9wTTD6j8vcjMyxl9SqrDIXksjOIGGxsaJWOdPv3YPh0FBCeBbX06YTzq604ypRHM9d +PLfEnqmwgugDk2GUqo5zO+q3oTni6JuB6c+vhdsrXedenULQPOldszenmM6ePAaZWtN NJgBGhuWT2u+Z38Yb7UIS7qj8nvffvIFNemq7ID+dUTlgQrhSoKvJgSiELv0HG/j/57Q reB0wbPgmvNoWFYBMn802a94TRPKNFQW+8hzHSLaODa8Qbt9OoZaqkzRWb6SC1xzTRVb 5fAw== 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=uZvI9fEYZz4EcALkAOSyBZC1D/Kv82bo461/KfemNF0=; b=dghQb1YJBf9EULiik0nmBa0nmFTiyqT/GVG6aepjTDunOmU/qS+TFXjLM9qQheXHeA HS1gBQmeXENjNOBrUMAf1rY4zI75n6LGR2hQrUZpNSOmD6FiUXUxe7k1/LIpec2wG8yk E59yrkBH/pov1apRGiP9BDIs+GATw7isItCD78tj9WIdwUIoXex7CDn0WGpwNS+Sa+CM CYa0WNJxAORT/B8rlos5ysJLIykqy/4Ojw0uUdLf35v5sjJgTO7WZVBzAY7pD6quwFm1 rdSbkrr7OxkBG1Qnwlonud+j22RTPZfvm8zLFcToHegA4yc9nqMXd+DKD4rOCwtY3xc9 61Yg== X-Gm-Message-State: APjAAAWk8nGVS35lxi++NoRc8CN+Vt/sWA9zevF8yhI2+BD+5lm4RdJ1 tRLloItKyJv1ZRjJXQ+ZchmQy19z X-Google-Smtp-Source: APXvYqz/blVqtik1bpeHsm7NNEU+ZtRiUep2H+VNHHtJOvJjvy03LcK2tkwRhOK8mgf1GrTLn3OduQ== X-Received: by 2002:a1c:b603:: with SMTP id g3mr5274204wmf.133.1576701552546; Wed, 18 Dec 2019 12:39:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 12:39:12 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 18 Dec 2019 21:39:07 +0100 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/5] package/libsepol: add dependency on host-coreutils for ln --relative 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: Marcus Folkesson , Fabrice Fontaine , Adam Duskett , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Clayton Shotwell Cc: Matt Weber Cc: Marcus Folkesson --- .../libsepol/0002-revert-ln-relative.patch | 29 ------------------- package/libsepol/libsepol.mk | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 package/libsepol/0002-revert-ln-relative.patch diff --git a/package/libsepol/0002-revert-ln-relative.patch b/package/libsepol/0002-revert-ln-relative.patch deleted file mode 100644 index 40dabc38de..0000000000 --- a/package/libsepol/0002-revert-ln-relative.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 16b2b0e21e10727065042a1baabd1a887757c65c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Mon, 9 Oct 2017 16:29:36 -0400 -Subject: [PATCH] Makefile: revert libsepol: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Fabrice Fontaine -[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)] - -diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile ---- libsepol-2.7.orig/src/Makefile 2018-01-15 21:37:12.821831315 +0100 -+++ libsepol-2.7/src/Makefile 2018-01-15 21:38:03.838497434 +0100 -@@ -92,7 +92,7 @@ - endif - test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig -- $(LN) -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) -+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET) - - relabel: - /sbin/restorecon $(LIBINSTALL)/$(LIBSO) diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 58b9b9c374..62b0744aa3 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -11,7 +11,7 @@ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex -HOST_LIBSEPOL_DEPENDENCIES = host-flex +HOST_LIBSEPOL_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) host-flex LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS)