diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-13 22:28:47 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-02-14 17:35:37 +0100 |
| commit | 8d64c5b200133f9dddf1e9cf4c63841db28fe31e (patch) | |
| tree | 5dd05aa8e38a9da54d2a32a99390927c0acca97a /patches/policycoreutils-2.1.13 | |
| parent | a92aac4062b2da6b731deb2c63cd975c4eb66906 (diff) | |
| download | ptxdist-8d64c5b200133f9dddf1e9cf4c63841db28fe31e.tar.gz ptxdist-8d64c5b200133f9dddf1e9cf4c63841db28fe31e.tar.xz | |
policycoreutils: cleanup and fix programs using python
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/policycoreutils-2.1.13')
| -rw-r--r-- | patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch (renamed from patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch) | 18 | ||||
| -rw-r--r-- | patches/policycoreutils-2.1.13/series | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch index 27f46209b..dc71a9a5e 100644 --- a/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch +++ b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch @@ -1,28 +1,14 @@ From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Tue, 15 Jan 2013 11:33:01 +0100 -Subject: [PATCH] makefile: Allow PAMH, AUDITH and INOTIFYH to be overwritten - by ENV +Subject: [PATCH] makefile: Allow PAMH and AUDITH to be overwritten by ENV Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Makefile | 2 +- newrole/Makefile | 4 ++-- run_init/Makefile | 4 ++-- setfiles/Makefile | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/Makefile b/Makefile -index 77d8c80..7c85244 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui - --INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -+INOTIFYH ?= $(shell ls /usr/include/sys/inotify.h 2>/dev/null) - - ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) - SUBDIRS += restorecond diff --git a/newrole/Makefile b/newrole/Makefile index e9834a3..96bf978 100644 --- a/newrole/Makefile diff --git a/patches/policycoreutils-2.1.13/series b/patches/policycoreutils-2.1.13/series index ecf4894c9..15ca306be 100644 --- a/patches/policycoreutils-2.1.13/series +++ b/patches/policycoreutils-2.1.13/series @@ -3,6 +3,6 @@ 0001-restorecond-use-pkg-config.patch 0002-makefile-remove-host-path-from-list-of-header-search.patch 0003-makefile-remove-host-path-from-list-of-linker-search.patch -0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch +0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch 0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch -# 19a316f0a1ef9696634d97495449d12e - git-ptx-patches magic +# b68072807b5c8140404f88de335c127e - git-ptx-patches magic |