summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-03-27 17:35:03 +0800
committerXin Ouyang <Xin.Ouyang@windriver.com>2012-03-27 17:35:03 +0800
commitc93ca621128395084b08c7b3f44e02d7b1b3e066 (patch)
tree2183db3b87a4380bd5b9d1415293b708e4018c1d
parent171760b17ac2726a7c650c01ff5f5413579e7ede (diff)
downloadmeta-selinux-c93ca621128395084b08c7b3f44e02d7b1b3e066.tar.gz
setools: Remove the python disabled patch.
Before the python modules are needed by policycoreutils.
-rw-r--r--recipes-security/setools/setools/setools-Don-t-build-python-bindings-if-disabled.patch29
-rw-r--r--recipes-security/setools/setools_3.3.7.bb2
2 files changed, 0 insertions, 31 deletions
diff --git a/recipes-security/setools/setools/setools-Don-t-build-python-bindings-if-disabled.patch b/recipes-security/setools/setools/setools-Don-t-build-python-bindings-if-disabled.patch
deleted file mode 100644
index 9a93d86..0000000
--- a/recipes-security/setools/setools/setools-Don-t-build-python-bindings-if-disabled.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 5bf63cd7d9c2af5648b705784a5990414de64a3b Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Wed, 7 Mar 2012 18:13:00 +0800
4Subject: [PATCH] setools: Don't build python bindings if disabled.
5
6---
7 Makefile.am | 6 +++++-
8 1 files changed, 5 insertions(+), 1 deletions(-)
9
10diff --git a/Makefile.am b/Makefile.am
11index 176c8ea..d33c65c 100644
12--- a/Makefile.am
13+++ b/Makefile.am
14@@ -10,7 +10,11 @@ if BUILD_GUI
15 endif
16 # sediffx is also built conditionally, from sediffx/Makefile.am
17
18-SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python
19+if DO_SWIGIFY_PYTHON
20+ MAYBE_PY = python
21+endif
22+
23+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) $(MAYBE_PY)
24
25 #old indent opts
26 #INDENT_OPTS = -npro -nbad -bap -sob -ss -l132 -di1 -nbc -br -nbbb -c40 -cd40 -ncdb -ce -cli0 -cp40 -ncs -d0 -nfc1 -nfca -i8 -ts8 -ci8 -lp -ip0 -npcs -npsl -sc
27--
281.7.5.4
29
diff --git a/recipes-security/setools/setools_3.3.7.bb b/recipes-security/setools/setools_3.3.7.bb
index f12cc56..bb6dcf0 100644
--- a/recipes-security/setools/setools_3.3.7.bb
+++ b/recipes-security/setools/setools_3.3.7.bb
@@ -28,8 +28,6 @@ SRC_URI += "file://setools-cross-ar.patch"
28SRC_URI += "file://setools-Fix-test-bug-for-unary-operator.patch" 28SRC_URI += "file://setools-Fix-test-bug-for-unary-operator.patch"
29SRC_URI += "file://setools-Fix-python-setools-Makefile.am-for-cross.patch" 29SRC_URI += "file://setools-Fix-python-setools-Makefile.am-for-cross.patch"
30 30
31SRC_URI += "file://setools-Don-t-build-python-bindings-if-disabled.patch"
32
33LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \ 31LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \
34 file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ 32 file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
35 file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24" 33 file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24"