From patchwork Wed Jan 17 14:13:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 862281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eGl/1pMl"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zM8Fq51JCz9sP1 for ; Thu, 18 Jan 2018 01:13:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 915912FABC; Wed, 17 Jan 2018 14:13:28 +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 9WsU+HUUlW6G; Wed, 17 Jan 2018 14:13:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 67A6B2FA8D; Wed, 17 Jan 2018 14:13:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 97F601C156B for ; Wed, 17 Jan 2018 14:13:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9401286F73 for ; Wed, 17 Jan 2018 14:13: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 oQRgwmozXBYs for ; Wed, 17 Jan 2018 14:13:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D3D5586DE7 for ; Wed, 17 Jan 2018 14:13:19 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id t79so6795554lfe.3 for ; Wed, 17 Jan 2018 06:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=5lX54c5h8DUoSv3h5KeW8TfuUm4VmPpVLUFmHCO+qaM=; b=eGl/1pMlHhvr/T1i5PkbvLioGigt5fDj6sA2CdyotcijMO/0SfF1y1dPz9+edPw2NZ jvYCuDwgUNM9+rMz0707EyCwyKEejPQ/ALcosjcwEFkRcoPzoLKZDUouYglCXWnz0oQa R99/XpH4YI3kVBM+/yHeONgDzCMVq9eSip8Qr00PVHSrQIJLBBIXzdsTVEwtrgGVWlHW zjymvddy32O36ECPZbfArbSfIJDuel0E5oELMyO+K7tIN7Hr82kU2qxn+XsPhrIIryIG 6POG2/tpWtoztsb1ZEN/U+OYHWe6Y42MWUooWXI1EwqitRiXbGzJm6hcWK3uaya5PBCC Yp/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5lX54c5h8DUoSv3h5KeW8TfuUm4VmPpVLUFmHCO+qaM=; b=dNgshMlE2wLAoyvHWTyR0SN4AaHkQ+sJJs+r7B20WJ5JtEq9bPzr4QwJUlWXLmiDPj hcmi79bf29U857SgYHoBtd5bdd0nY/DtBvU83ozmfCxI5uEEeqqDZ6XvUbdyKm8o3EKB hyol4UydShaWFUvWW1i77zdroKo3hLY+B/UKQIuiDM9RukNwv8R/jj5N6Mdm2ndnRkcM uOmk0wUAmeKqVOc+uWiqj6PBAEkFeUoYp/MCVNnwvS6fcw9yPdHPZdyjfvYQ2Kbv9jM+ rDu+ehr0G7cgSRkMocWu/jH7Z8b8qIoEHqR0xfZ3BC21FvQ7jnd0HR+i90uDGjxPpSVP NBYg== X-Gm-Message-State: AKGB3mLunA/j4mbgz29wKdLXTJi+seU1oeGfkNLlk7ryYyZswmdZHEqx XpxXjZlZ1N7gtL1ahAjRaitiIhK3 X-Google-Smtp-Source: ACJfBos1jMGrd8JpZTnpg00l68lhypBQFBccX0FKmWnawO+ZBRC/ctrhDn+1df9ISCDLnPbyeLEscQ== X-Received: by 10.46.48.25 with SMTP id w25mr26590179ljw.86.1516198397914; Wed, 17 Jan 2018 06:13:17 -0800 (PST) Received: from localhost.localdomain (c-2ec2e669-74736162.cust.telenor.se. [46.194.230.105]) by smtp.gmail.com with ESMTPSA id s65sm810805lfk.68.2018.01.17.06.13.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 06:13:17 -0800 (PST) From: Marcus Folkesson To: buildroot@buildroot.org Date: Wed, 17 Jan 2018 15:13:06 +0100 Message-Id: <20180117141306.15170-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.15.1 Subject: [Buildroot] [PATCH v2] selinux-python: add patch to make the build process more standard X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Patch the Makefiles to make PREFIX and DESTDIR follow standard semantics to get rid of DESTDIR during compile time in selinux-python.mk. Signed-off-by: Marcus Folkesson --- v2: - Add description and signed-of-by-tag for patch ...build-follow-standard-semantics-for-DESTD.patch | 117 +++++++++++++++++++++ package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch diff --git a/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch b/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch new file mode 100644 index 0000000000..156701a818 --- /dev/null +++ b/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch @@ -0,0 +1,117 @@ +python: build: follow standard semantics for DESTDIR and PREFIX + +Signed-off-by: Marcus Folkesson + +diff -durN python.orig/audit2allow/Makefile python/audit2allow/Makefile +--- python.orig/audit2allow/Makefile 2017-08-04 15:31:00.000000000 +0200 ++++ python/audit2allow/Makefile 2018-01-17 09:44:35.659573123 +0100 +@@ -1,19 +1,17 @@ + PYTHON ?= python + + # Installation directories. +-PREFIX ?= $(DESTDIR)/usr +-BINDIR ?= $(PREFIX)/bin +-LIBDIR ?= $(PREFIX)/lib +-MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= /usr/share/locale +-INCLUDEDIR ?= $(PREFIX)/include +-LIBSEPOLA ?= $(LIBDIR)/libsepol.a ++PREFIX ?= /usr ++BINDIR ?= $(DESTDIR)$(PREFIX)/bin ++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib ++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man + + CFLAGS ?= -Werror -Wall -W + + all: audit2why sepolgen-ifgen-attr-helper + +-sepolgen-ifgen-attr-helper: sepolgen-ifgen-attr-helper.o $(LIBSEPOLA) ++sepolgen-ifgen-attr-helper: sepolgen-ifgen-attr-helper.o ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -l:libsepol.a + + audit2why: + ln -sf audit2allow audit2why +diff -durN python.orig/chcat/Makefile python/chcat/Makefile +--- python.orig/chcat/Makefile 2017-08-04 15:31:00.000000000 +0200 ++++ python/chcat/Makefile 2018-01-17 09:44:35.659573123 +0100 +@@ -1,8 +1,8 @@ + # Installation directories. +-PREFIX ?= $(DESTDIR)/usr +-BINDIR ?= $(PREFIX)/bin +-MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= $(PREFIX)/share/locale ++PREFIX ?= /usr ++BINDIR ?= $(DESTDIR)$(PREFIX)/bin ++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man ++LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale + + .PHONY: all + all: chcat +diff -durN python.orig/semanage/Makefile python/semanage/Makefile +--- python.orig/semanage/Makefile 2017-08-04 15:31:00.000000000 +0200 ++++ python/semanage/Makefile 2018-01-17 09:44:43.676239705 +0100 +@@ -1,13 +1,12 @@ + PYTHON ?= python + + # Installation directories. +-PREFIX ?= $(DESTDIR)/usr +-LIBDIR ?= $(PREFIX)/lib +-SBINDIR ?= $(PREFIX)/sbin +-MANDIR = $(PREFIX)/share/man +-PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(1))") ++PREFIX ?= /usr ++SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin ++MANDIR = $(DESTDIR)$(PREFIX)/share/man ++PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))") + PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR) +-BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions ++BASHCOMPLETIONDIR ?= $(DESTDIR)$(PREFIX)/share/bash-completion/completions + + TARGETS=semanage + +diff -durN python.orig/sepolgen/src/sepolgen/Makefile python/sepolgen/src/sepolgen/Makefile +--- python.orig/sepolgen/src/sepolgen/Makefile 2017-08-04 15:31:00.000000000 +0200 ++++ python/sepolgen/src/sepolgen/Makefile 2018-01-17 09:44:35.659573123 +0100 +@@ -1,5 +1,6 @@ ++PREFIX ?= /usr + PYTHON ?= python +-PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(1))") ++PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))") + PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/sepolgen + + all: +diff -durN python.orig/sepolicy/Makefile python/sepolicy/Makefile +--- python.orig/sepolicy/Makefile 2017-08-04 15:31:00.000000000 +0200 ++++ python/sepolicy/Makefile 2018-01-17 09:44:35.659573123 +0100 +@@ -1,14 +1,14 @@ + PYTHON ?= python + + # Installation directories. +-PREFIX ?= $(DESTDIR)/usr +-LIBDIR ?= $(PREFIX)/lib +-BINDIR ?= $(PREFIX)/bin +-DATADIR ?= $(PREFIX)/share +-MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= /usr/share/locale +-BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions +-SHAREDIR ?= $(PREFIX)/share/sandbox ++PREFIX ?= /usr ++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib ++BINDIR ?= $(DESTDIR)$(PREFIX)/bin ++DATADIR ?= $(DESTDIR)$(PREFIX)/share ++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man ++LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale ++BASHCOMPLETIONDIR ?= $(DESTDIR)$(PREFIX)/share/bash-completion/completions ++SHAREDIR ?= $(DESTDIR)$(PREFIX)/share/sandbox + CFLAGS ?= -Wall -Werror -Wextra -W + override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared + +@@ -30,7 +30,7 @@ + @$(PYTHON) test_sepolicy.py -v + + install: +- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` ++ $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + [ -d $(BINDIR) ] || mkdir -p $(BINDIR) + install -m 755 sepolicy.py $(BINDIR)/sepolicy + (cd $(BINDIR); ln -sf sepolicy sepolgen) diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 9a4622da44..25a2d04105 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -36,7 +36,7 @@ endif define SELINUX_PYTHON_BUILD_CMDS $(foreach d,$(SELINUX_PYTHON_MAKE_DIRS), $(MAKE) -C $(@D)/$(d) $(SELINUX_PYTHON_MAKE_OPTS) \ - DESTDIR=$(STAGING_DIR) all + all ) endef