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