From patchwork Thu Nov 29 03:11:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Weber X-Patchwork-Id: 1005004 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=reject dis=none) header.from=collins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=collins.com header.i=@collins.com header.b="Qwp+DTl8"; 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 4352d22Dmjz9s47 for ; Thu, 29 Nov 2018 14:12:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AB7702EABC; Thu, 29 Nov 2018 03:12:16 +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 TsG1-iIk61Kr; Thu, 29 Nov 2018 03:12:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B0B672E8FE; Thu, 29 Nov 2018 03:12:14 +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 0390F1C3B0F for ; Thu, 29 Nov 2018 03:12:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F35B287FB8 for ; Thu, 29 Nov 2018 03:12:12 +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 xDtRsfL3u1bL for ; Thu, 29 Nov 2018 03:12:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx0a-00105401.pphosted.com (mx0b-00105401.pphosted.com [67.231.152.184]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5177B87E91 for ; Thu, 29 Nov 2018 03:12:09 +0000 (UTC) Received: from pps.filterd (m0075420.ppops.net [127.0.0.1]) by mx0a-00105401.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wAT39wMt003084; Wed, 28 Nov 2018 22:12:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=collins.com; h=from : to : cc : subject : date : message-id; s=POD051818; bh=v2jyhI63rxOW9pGSUg9Mo290/BkAaVjySDb0qGUxxQU=; b=Qwp+DTl89AAjBcOjIjbA/bAHBarhJQm+mH4fQV3/1BbCNKfaY2OeYf1gUgBqZaZRAqJh fAfO/zOzy6s7uAux2hYtvmFwY4a/iehvCTBAQucs756YIihaBvXBEYoH59q4FV+cWETI 2xJTArfF+II0w8+jxF6scNUGBtUy0ejHo5VKCKux/kIVVuYQ+8+t/jloTCjD+Ic2EJsq v7hBJQWaVIaY5h1wMtGpihS31KtPqyTOGRODr7XvXrejl85AwwS4FtZVwijyLf7gNroB flzAxnH9n2/WQSlqkjQCjAp3LNNgcFhe/xI2e3kjYqu302vZJpha7zYqCjNZS2VcV2I5 9g== Received: from xnwpv37.utc.com ([167.17.239.17]) by mx0a-00105401.pphosted.com with ESMTP id 2p1s9tcejw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 28 Nov 2018 22:12:08 -0500 Received: from uusnwa4u.utc.com (uusnwa4u.utc.com [159.82.101.254]) by xnwpv37.utc.com (8.16.0.21/8.16.0.21) with ESMTPS id wAT3C1h0005160 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Nov 2018 22:12:01 -0500 Received: from ch3vs03.rockwellcollins.com ([10.172.224.19]) by uusnwa4u.utc.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id wAT3BsjH013377 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Nov 2018 22:12:00 -0500 Received: from ofwch3n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.226.14]) by ch3vs03.rockwellcollins.com with ESMTP; 28 Nov 2018 21:12:00 -0600 X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id B4227600C6; Wed, 28 Nov 2018 21:11:59 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Wed, 28 Nov 2018 21:11:58 -0600 Message-Id: <1543461118-61712-1-git-send-email-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1811290024 Subject: [Buildroot] [PATCH] package/setools: drop path prefix from man install 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For this man file install scenario, joining the sys.prefix makes the path absolute (this was previously working by accident). It was found when e94280e5a537b "package/pkg-python: use proper --prefix and --root values" was merged. Fixes: http://autobuild.buildroot.net/results/e214e1a539cdac07028fb58c3822f89886d86f1f Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Cc: Angelo Compagnucci Cc: Arnout Vandecappelle Signed-off-by: Matthew Weber --- ...etup.py-drop-path-prefix-from-man-install.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch diff --git a/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch new file mode 100644 index 0000000..6334450 --- /dev/null +++ b/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch @@ -0,0 +1,42 @@ +From bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Wed, 28 Nov 2018 20:49:00 -0600 +Subject: [PATCH] setup.py: drop path prefix from man install + +If the directory is a relative path, it is interpreted relative to the +installation prefix (Python's sys.prefix for pure-Python packages, +sys.exec_prefix for packages that contain extension modules). +So the sys.prefix should not be joined because the correct one will be +added regardless. The reason why a relative path is going to work is +because the installation path is built internally joining python root +with python prefix, thus forming the correct path $(TARGET_DIR)/usr. +(https://docs.python.org/3/distutils/setupscript.html#installing-additional-files) + +For this man file install scenario, joining the sys.prefix makes the +path absolute (this was previously working by accident). + +Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7 + +Cc: Angelo Compagnucci +Cc: Arnout Vandecappelle +Signed-off-by: Matthew Weber +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 3767fbc..80e0400 100644 +--- a/setup.py ++++ b/setup.py +@@ -136,7 +136,7 @@ setup(name='setools', + cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, + packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], + scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], +- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], ++ data_files=[('share/man/man1', glob.glob("man/*.1"))], + package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, + ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], + annotate=cython_annotate, +-- +1.9.1 +