From c93ca621128395084b08c7b3f44e02d7b1b3e066 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Tue, 27 Mar 2012 17:35:03 +0800 Subject: setools: Remove the python disabled patch. Before the python modules are needed by policycoreutils. --- ...s-Don-t-build-python-bindings-if-disabled.patch | 29 ---------------------- recipes-security/setools/setools_3.3.7.bb | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 recipes-security/setools/setools/setools-Don-t-build-python-bindings-if-disabled.patch 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 @@ -From 5bf63cd7d9c2af5648b705784a5990414de64a3b Mon Sep 17 00:00:00 2001 -From: Xin Ouyang -Date: Wed, 7 Mar 2012 18:13:00 +0800 -Subject: [PATCH] setools: Don't build python bindings if disabled. - ---- - Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 176c8ea..d33c65c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -10,7 +10,11 @@ if BUILD_GUI - endif - # sediffx is also built conditionally, from sediffx/Makefile.am - --SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) python -+if DO_SWIGIFY_PYTHON -+ MAYBE_PY = python -+endif -+ -+SUBDIRS = libqpol libapol libsefs libpoldiff libseaudit secmds sechecker sediff man packages debian $(MAYBE_APOL) $(MAYBE_GUI) $(MAYBE_PY) - - #old indent opts - #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 --- -1.7.5.4 - 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" SRC_URI += "file://setools-Fix-test-bug-for-unary-operator.patch" SRC_URI += "file://setools-Fix-python-setools-Makefile.am-for-cross.patch" -SRC_URI += "file://setools-Don-t-build-python-bindings-if-disabled.patch" - LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \ file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24" -- cgit v1.2.3-54-g00ecf