[Buildroot] [PATCH v2] selinux-python: add patch to make the build process more standard

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] selinux-python: add patch to make the build process more standard
Date: Wed, 17 Jan 2018 15:13:06 +0100	[thread overview]
Message-ID: <20180117141306.15170-1-marcus.folkesson@gmail.com> (raw)

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 <marcus.folkesson@gmail.com>
---

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 <marcus.folkesson@gmail.com>
+
+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
 
-- 
2.15.1

next             reply	other threads:[~2018-01-17 14:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17 14:13 Marcus Folkesson [this message]
2018-01-17 21:26 ` [Buildroot] [PATCH v2] selinux-python: add patch to make the build process more standard Thomas Petazzoni

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:156701a81 dfblob:9a4622da4 dfblob:25a2d0410 )
 OR (
bs:"[Buildroot] [PATCH v2] selinux-python: add patch to make the build process more standard" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180117141306.15170-1-marcus.folkesson@gmail.com \
    --to=marcus.folkesson@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.