From patchwork Tue Jan 7 17:12:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1218963 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.138; helo=whitealder.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="uf6qqzZM"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47sf8Z48Pcz9sRG for ; Wed, 8 Jan 2020 04:13:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D6F9886096; Tue, 7 Jan 2020 17:12:59 +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 WbsnEoRxBiJe; Tue, 7 Jan 2020 17:12:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EAD4485F8E; Tue, 7 Jan 2020 17:12:57 +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 CB19E1BF471 for ; Tue, 7 Jan 2020 17:12:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C704785F8E for ; Tue, 7 Jan 2020 17:12:56 +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 vuYODUJEUC72 for ; Tue, 7 Jan 2020 17:12:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id B515F848F5 for ; Tue, 7 Jan 2020 17:12:55 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id t14so313203wmi.5 for ; Tue, 07 Jan 2020 09:12:55 -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:mime-version :content-transfer-encoding; bh=6isVOFk03O2q5xmKWBF3FgFyWmqkXSDyu7uIHWvqWAc=; b=uf6qqzZMMrqdcHt2g7KYlfrYqgjATdfi75lJtmVVT7ugHorCuBwVMkecOPc7MLdxRl 00nl30FT/J7PKF4az19o59E9C5xD/zXiKxt8kB02uEDbcB5OAqanagulpFgDjhydZjT9 ZdzzVPMNwTtFFZlRZpCXGBUNRezPfIrvWmN1N/TbX4PiNxY4M0fGuPxobf7YmvgHMhRR Nfmx+XnESIcMz6p5hBUWTsGr6KuaBiXGXxj2BwqOGKXcHp8JFlYOnZVfb44LX4+5Pneq oifdrX0RHKx5VLy+B/yKNN2Ox4zL2S9VXaOKEefYyAgnT+du0D6UooM0admBl6G63VKC Nl8g== 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 :mime-version:content-transfer-encoding; bh=6isVOFk03O2q5xmKWBF3FgFyWmqkXSDyu7uIHWvqWAc=; b=OZtfmE13rwBva0pxXt4oK54T78WZwbEoS7LP2jJiPqyplvrEBJ3fV8ooImlYuPJKhU xoW7JM4fXAW3TRsed24isT0sAmCSmkDC4IXkPBgJfGsPWCDtu5LDdJbh3ctDRDJ6yCXN d4cCUpvst/f9PaX5EckWbIfKIYWvKcRQTx4OTR5Cqv5/GkgLyf5NE/W+AnAfcfjUVPq1 GFE0k2uBbLLk2gQZy9v4O3vvpGox7f+xLTWKh0XX4iiRwMrOnCqlpSqIWmwW3BPmavre pfrMPYe5kX/eLBfgJF/hW9rkoArf3pSCsOF+90vwJBvXDmzyWFSzaSMCcLpqWVylKwed r/Bg== X-Gm-Message-State: APjAAAW1wr+/MFa2cgMBQavA2krf6ofv/Hzi7fzV7+ZyI4XMsk2xald9 MY0xQpY/3ODUxQTVxrSfX3/SsF1N X-Google-Smtp-Source: APXvYqxf9H2P6yIJZs9zLNAtrVHa3pvLiew/MgGQVi2wOKLGNtpwI8HOlQHf3aJFy+N5Qar66o5XiA== X-Received: by 2002:a05:600c:20c7:: with SMTP id y7mr78224wmm.21.1578417174006; Tue, 07 Jan 2020 09:12:54 -0800 (PST) Received: from scaer.home ([2a01:cb19:8b51:cb00:fcb4:9d79:5a64:43cb]) by smtp.gmail.com with ESMTPSA id v14sm568974wrm.28.2020.01.07.09.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 09:12:53 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 7 Jan 2020 18:12:48 +0100 Message-Id: <20200107171248.15904-1-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/libselinux: fix python module install patch 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 , Thomas Petazzoni , "Yann E. MORIN" , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since commit 2768a0eb4 (package/libselinux: add dependency on host-coreutils for ln --relative), we dropped a previous patch which touched the same line, so the python module install patch no longer applies. Rather than drop use of ln --relative, which we now have (and which was all that fuss was for), just drop the use of the PYCEXT use altogether. Fixes: - http://autobuild.buildroot.org/results/c8f/c8fe5b47e422bac13b4d5fa10bd1ee5218021585/ (host) - http://autobuild.buildroot.org/results/402/4026a34c6c096354ba99e8c202210428fa2795d2/ (target) Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Adam Duskett Cc: Clayton Shotwell Cc: Matt Weber Cc: Marcus Folkesson reviewed-by: Adam Duskett --- ...Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index 57cc151e70..c960e1db7e 100644 --- a/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -37,8 +37,8 @@ index 799df2b0..95684ed7 100644 install-pywrap: pywrap $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -- cd $(DESTDIR)$(PYTHONLIBDIR) && ln -sf selinux/_selinux$(PYCEXT) _selinux$(PYCEXT) -+ cd $(DESTDIR)$(PYTHONLIBDIR) && ln -sf selinux/_selinux*.so . +- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) ++ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL)