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)