From 00137225282b4338f56d91313637bea0d8956742 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Mon, 20 Feb 2012 10:29:10 +0800
Subject: Rename all git bb recipes.

---
 recipes-security/selinux/checkpolicy_2.1.8.bb      | 23 --------
 recipes-security/selinux/checkpolicy_git.bb        | 23 ++++++++
 recipes-security/selinux/libselinux_2.1.9.bb       | 47 ---------------
 recipes-security/selinux/libselinux_git.bb         | 47 +++++++++++++++
 .../Fix-segfault-for-standard-policy.patch         | 37 ------------
 .../Fix-segfault-for-standard-policy.patch         | 37 ++++++++++++
 recipes-security/selinux/libsemanage_2.1.6.bb      | 44 --------------
 recipes-security/selinux/libsemanage_git.bb        | 44 ++++++++++++++
 recipes-security/selinux/libsepol_2.1.4.bb         | 18 ------
 recipes-security/selinux/libsepol_git.bb           | 18 ++++++
 recipes-security/selinux/policycoreutils_2.1.10.bb | 68 ----------------------
 recipes-security/selinux/policycoreutils_git.bb    | 68 ++++++++++++++++++++++
 recipes-security/selinux/sepolgen_1.1.5.bb         | 28 ---------
 recipes-security/selinux/sepolgen_git.bb           | 28 +++++++++
 14 files changed, 265 insertions(+), 265 deletions(-)
 delete mode 100644 recipes-security/selinux/checkpolicy_2.1.8.bb
 create mode 100644 recipes-security/selinux/checkpolicy_git.bb
 delete mode 100644 recipes-security/selinux/libselinux_2.1.9.bb
 create mode 100644 recipes-security/selinux/libselinux_git.bb
 delete mode 100644 recipes-security/selinux/libsemanage-2.1.6/Fix-segfault-for-standard-policy.patch
 create mode 100644 recipes-security/selinux/libsemanage/Fix-segfault-for-standard-policy.patch
 delete mode 100644 recipes-security/selinux/libsemanage_2.1.6.bb
 create mode 100644 recipes-security/selinux/libsemanage_git.bb
 delete mode 100644 recipes-security/selinux/libsepol_2.1.4.bb
 create mode 100644 recipes-security/selinux/libsepol_git.bb
 delete mode 100644 recipes-security/selinux/policycoreutils_2.1.10.bb
 create mode 100644 recipes-security/selinux/policycoreutils_git.bb
 delete mode 100644 recipes-security/selinux/sepolgen_1.1.5.bb
 create mode 100644 recipes-security/selinux/sepolgen_git.bb

diff --git a/recipes-security/selinux/checkpolicy_2.1.8.bb b/recipes-security/selinux/checkpolicy_2.1.8.bb
deleted file mode 100644
index 8c5b788..0000000
--- a/recipes-security/selinux/checkpolicy_2.1.8.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "SELinux policy compiler"
-DESCRIPTION = "SELinux policy compiler"
-SECTION = "base"
-PR = "r1"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-include selinux_git.inc
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
-S = "${WORKDIR}/git/checkpolicy"
-DEPENDS += "libsepol libselinux flex-native"
-
-EXTRA_OEMAKE += "PREFIX=${D}" 
-EXTRA_OEMAKE += "LEX='flex'"
-
-BBCLASSEXTEND = "native"
-
-do_install_append() {
-	install test/dismod ${D}/${bindir}/sedismod
-	install test/dispol ${D}/${bindir}/sedispol
-}
-
diff --git a/recipes-security/selinux/checkpolicy_git.bb b/recipes-security/selinux/checkpolicy_git.bb
new file mode 100644
index 0000000..8c5b788
--- /dev/null
+++ b/recipes-security/selinux/checkpolicy_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "SELinux policy compiler"
+DESCRIPTION = "SELinux policy compiler"
+SECTION = "base"
+PR = "r1"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+include selinux_git.inc
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+S = "${WORKDIR}/git/checkpolicy"
+DEPENDS += "libsepol libselinux flex-native"
+
+EXTRA_OEMAKE += "PREFIX=${D}" 
+EXTRA_OEMAKE += "LEX='flex'"
+
+BBCLASSEXTEND = "native"
+
+do_install_append() {
+	install test/dismod ${D}/${bindir}/sedismod
+	install test/dispol ${D}/${bindir}/sedispol
+}
+
diff --git a/recipes-security/selinux/libselinux_2.1.9.bb b/recipes-security/selinux/libselinux_2.1.9.bb
deleted file mode 100644
index 8de51e0..0000000
--- a/recipes-security/selinux/libselinux_2.1.9.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "SELinux library and simple utilities"
-DESCRIPTION = "libselinux provides an API for SELinux applications to get and set \
-process and file security contexts and to obtain security policy \
-decisions.  Required for any applications that use the SELinux API."
-SECTION = "base"
-PR = "r1"
-LICENSE = "NSA-Public_Domain"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
-
-include selinux_git.inc
-inherit lib_package
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
-S = "${WORKDIR}/git/libselinux"
-DEPENDS += "libsepol python python-native swig-native"
-
-PACKAGES += "${PN}-python"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*"
-FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/.debug/*"
-
-python __anonymous () {
-	import re
-	target = d.getVar('TARGET_ARCH', True)
-	extra_oemake = d.getVar('EXTRA_OEMAKE', True)
-	p = re.compile('i.86')
-	target = p.sub('i386',target)
-	d.setVar("EXTRA_OEMAKE", extra_oemake + " ARCH='" + target + "'")
-}
-
-do_compile_append() {
-    oe_runmake pywrap -j1 \
-            INCLUDEDIR='${STAGING_INCDIR}' \
-            LIBDIR='${STAGING_LIBDIR}' \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYINC='-I${STAGING_INCDIR}/$(PYLIBVER)' \
-            PYLIB='-L${STAGING_LIBDIR}/$(PYLIBVER) -l$(PYLIBVER)' \
-            PYTHONLIBDIR='${PYLIB}'
-}
-
-do_install_append() {
-    oe_runmake install-pywrap swigify \
-            DESTDIR=${D} \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
new file mode 100644
index 0000000..8de51e0
--- /dev/null
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -0,0 +1,47 @@
+SUMMARY = "SELinux library and simple utilities"
+DESCRIPTION = "libselinux provides an API for SELinux applications to get and set \
+process and file security contexts and to obtain security policy \
+decisions.  Required for any applications that use the SELinux API."
+SECTION = "base"
+PR = "r1"
+LICENSE = "NSA-Public_Domain"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
+
+include selinux_git.inc
+inherit lib_package
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+S = "${WORKDIR}/git/libselinux"
+DEPENDS += "libsepol python python-native swig-native"
+
+PACKAGES += "${PN}-python"
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*"
+FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/.debug/*"
+
+python __anonymous () {
+	import re
+	target = d.getVar('TARGET_ARCH', True)
+	extra_oemake = d.getVar('EXTRA_OEMAKE', True)
+	p = re.compile('i.86')
+	target = p.sub('i386',target)
+	d.setVar("EXTRA_OEMAKE", extra_oemake + " ARCH='" + target + "'")
+}
+
+do_compile_append() {
+    oe_runmake pywrap -j1 \
+            INCLUDEDIR='${STAGING_INCDIR}' \
+            LIBDIR='${STAGING_LIBDIR}' \
+            PYLIBVER='python${PYTHON_BASEVERSION}' \
+            PYINC='-I${STAGING_INCDIR}/$(PYLIBVER)' \
+            PYLIB='-L${STAGING_LIBDIR}/$(PYLIBVER) -l$(PYLIBVER)' \
+            PYTHONLIBDIR='${PYLIB}'
+}
+
+do_install_append() {
+    oe_runmake install-pywrap swigify \
+            DESTDIR=${D} \
+            PYLIBVER='python${PYTHON_BASEVERSION}' \
+            PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'
+}
+
+BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/libsemanage-2.1.6/Fix-segfault-for-standard-policy.patch b/recipes-security/selinux/libsemanage-2.1.6/Fix-segfault-for-standard-policy.patch
deleted file mode 100644
index 8672b63..0000000
--- a/recipes-security/selinux/libsemanage-2.1.6/Fix-segfault-for-standard-policy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64aff2c80f28280724f64628d6bf4c4722b4f75f Mon Sep 17 00:00:00 2001
-From: Xin Ouyang <xinpascal@gmail.com>
-Date: Thu, 12 Jan 2012 16:58:34 +0800
-Subject: [PATCH] libsemanage: Fix segfault for building standard policies.
-
-If you are building "standard" policies(not MCS/MLS), libsemanage
-will crash, which caused by strdup() to "level" NULL pointers.
-For example, semodule -s refpolicy -b base.pp -i a.pp
----
- src/genhomedircon.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/genhomedircon.c b/src/genhomedircon.c
-index d2646ae..262a6cd 100644
---- a/src/genhomedircon.c
-+++ b/src/genhomedircon.c
-@@ -778,6 +778,8 @@ static int setup_fallback_user(genhomedircon_settings_t * s)
- 			{
- 				prefix = semanage_user_get_prefix(u);
- 				level = semanage_user_get_mlslevel(u);
-+				if (level == NULL)
-+					level = "";
- 			}
- 
- 			if (set_fallback_user(s, seuname, prefix, level) != 0)
-@@ -861,6 +863,8 @@ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s,
- 		if (u) {
- 			prefix = semanage_user_get_prefix(*u);
- 			level = semanage_user_get_mlslevel(*u);
-+			if (level == NULL)
-+				level = "";
- 		} else {
- 			prefix = name;
- 			level = "s0";
--- 
-1.7.7.3
-
diff --git a/recipes-security/selinux/libsemanage/Fix-segfault-for-standard-policy.patch b/recipes-security/selinux/libsemanage/Fix-segfault-for-standard-policy.patch
new file mode 100644
index 0000000..8672b63
--- /dev/null
+++ b/recipes-security/selinux/libsemanage/Fix-segfault-for-standard-policy.patch
@@ -0,0 +1,37 @@
+From 64aff2c80f28280724f64628d6bf4c4722b4f75f Mon Sep 17 00:00:00 2001
+From: Xin Ouyang <xinpascal@gmail.com>
+Date: Thu, 12 Jan 2012 16:58:34 +0800
+Subject: [PATCH] libsemanage: Fix segfault for building standard policies.
+
+If you are building "standard" policies(not MCS/MLS), libsemanage
+will crash, which caused by strdup() to "level" NULL pointers.
+For example, semodule -s refpolicy -b base.pp -i a.pp
+---
+ src/genhomedircon.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/genhomedircon.c b/src/genhomedircon.c
+index d2646ae..262a6cd 100644
+--- a/src/genhomedircon.c
++++ b/src/genhomedircon.c
+@@ -778,6 +778,8 @@ static int setup_fallback_user(genhomedircon_settings_t * s)
+ 			{
+ 				prefix = semanage_user_get_prefix(u);
+ 				level = semanage_user_get_mlslevel(u);
++				if (level == NULL)
++					level = "";
+ 			}
+ 
+ 			if (set_fallback_user(s, seuname, prefix, level) != 0)
+@@ -861,6 +863,8 @@ static genhomedircon_user_entry_t *get_users(genhomedircon_settings_t * s,
+ 		if (u) {
+ 			prefix = semanage_user_get_prefix(*u);
+ 			level = semanage_user_get_mlslevel(*u);
++			if (level == NULL)
++				level = "";
+ 		} else {
+ 			prefix = name;
+ 			level = "s0";
+-- 
+1.7.7.3
+
diff --git a/recipes-security/selinux/libsemanage_2.1.6.bb b/recipes-security/selinux/libsemanage_2.1.6.bb
deleted file mode 100644
index aabb472..0000000
--- a/recipes-security/selinux/libsemanage_2.1.6.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "SELinux binary policy manipulation library"
-DESCRIPTION = "libsemanage provides an API for the manipulation of SELinux binary policies. \
-It is used by checkpolicy (the policy compiler) and similar tools, as well \
-as by programs like load_policy that need to perform specific transformations \
-on binary policies such as customizing policy boolean settings."
-SECTION = "base"
-PR = "r1"
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-include selinux_git.inc
-inherit lib_package
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
-S = "${WORKDIR}/git/libsemanage"
-DEPENDS += "libsepol libselinux ustr bzip2 python"
-
-SRC_URI += "file://Fix-segfault-for-standard-policy.patch"
-
-PACKAGES += "${PN}-python"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
-FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*"
-
-do_compile_append() {
-    oe_runmake pywrap -j1 \
-            INCLUDEDIR='${STAGING_INCDIR}' \
-            LIBDIR='${STAGING_LIBDIR}' \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYINC='-I${STAGING_INCDIR}/$(PYLIBVER)' \
-            PYLIB='-L${STAGING_LIBDIR}/$(PYLIBVER) -l$(PYLIBVER)' \
-            PYTHONLIBDIR='${PYLIB}'
-}
-
-do_install_append() {
-    oe_runmake install-pywrap swigify \
-            DESTDIR=${D} \
-            PYLIBVER='python${PYTHON_BASEVERSION}' \
-            PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'
-    cd ${D}${libdir} && \
-            rm -f libsemanage.so && \
-            ln -s ../../`basename ${libdir}`/libsemanage.so.1 libsemanage.so
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/libsemanage_git.bb b/recipes-security/selinux/libsemanage_git.bb
new file mode 100644
index 0000000..aabb472
--- /dev/null
+++ b/recipes-security/selinux/libsemanage_git.bb
@@ -0,0 +1,44 @@
+SUMMARY = "SELinux binary policy manipulation library"
+DESCRIPTION = "libsemanage provides an API for the manipulation of SELinux binary policies. \
+It is used by checkpolicy (the policy compiler) and similar tools, as well \
+as by programs like load_policy that need to perform specific transformations \
+on binary policies such as customizing policy boolean settings."
+SECTION = "base"
+PR = "r1"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+include selinux_git.inc
+inherit lib_package
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+S = "${WORKDIR}/git/libsemanage"
+DEPENDS += "libsepol libselinux ustr bzip2 python"
+
+SRC_URI += "file://Fix-segfault-for-standard-policy.patch"
+
+PACKAGES += "${PN}-python"
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*"
+
+do_compile_append() {
+    oe_runmake pywrap -j1 \
+            INCLUDEDIR='${STAGING_INCDIR}' \
+            LIBDIR='${STAGING_LIBDIR}' \
+            PYLIBVER='python${PYTHON_BASEVERSION}' \
+            PYINC='-I${STAGING_INCDIR}/$(PYLIBVER)' \
+            PYLIB='-L${STAGING_LIBDIR}/$(PYLIBVER) -l$(PYLIBVER)' \
+            PYTHONLIBDIR='${PYLIB}'
+}
+
+do_install_append() {
+    oe_runmake install-pywrap swigify \
+            DESTDIR=${D} \
+            PYLIBVER='python${PYTHON_BASEVERSION}' \
+            PYLIBDIR='${D}/${libdir}/$(PYLIBVER)'
+    cd ${D}${libdir} && \
+            rm -f libsemanage.so && \
+            ln -s ../../`basename ${libdir}`/libsemanage.so.1 libsemanage.so
+}
+
+BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/libsepol_2.1.4.bb b/recipes-security/selinux/libsepol_2.1.4.bb
deleted file mode 100644
index ab49f41..0000000
--- a/recipes-security/selinux/libsepol_2.1.4.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "SELinux binary policy manipulation library"
-DESCRIPTION = "libsepol provides an API for the manipulation of SELinux binary policies. \
-It is used by checkpolicy (the policy compiler) and similar tools, as well \
-as by programs like load_policy that need to perform specific transformations \
-on binary policies such as customizing policy boolean settings."
-SECTION = "base"
-PR = "r1"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-include selinux_git.inc
-inherit lib_package
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
-S = "${WORKDIR}/git/libsepol"
-
-BBCLASSEXTEND = "native"
-
diff --git a/recipes-security/selinux/libsepol_git.bb b/recipes-security/selinux/libsepol_git.bb
new file mode 100644
index 0000000..ab49f41
--- /dev/null
+++ b/recipes-security/selinux/libsepol_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "SELinux binary policy manipulation library"
+DESCRIPTION = "libsepol provides an API for the manipulation of SELinux binary policies. \
+It is used by checkpolicy (the policy compiler) and similar tools, as well \
+as by programs like load_policy that need to perform specific transformations \
+on binary policies such as customizing policy boolean settings."
+SECTION = "base"
+PR = "r1"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+include selinux_git.inc
+inherit lib_package
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+S = "${WORKDIR}/git/libsepol"
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes-security/selinux/policycoreutils_2.1.10.bb b/recipes-security/selinux/policycoreutils_2.1.10.bb
deleted file mode 100644
index a213096..0000000
--- a/recipes-security/selinux/policycoreutils_2.1.10.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-SUMMARY = "SELinux policy core utilities"
-DESCRIPTION = "policycoreutils contains the policy core utilities that are required \
-for basic operation of a SELinux system.  These utilities include \
-load_policy to load policies, setfiles to label filesystems, newrole \
-to switch roles, and run_init to run /etc/init.d scripts in the proper \
-context."
-SECTION = "base"
-PR = "r1"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-include selinux_git.inc
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
-S = "${WORKDIR}/git/policycoreutils"
-DEPENDS += "libsepol libselinux libsemanage libcap-ng libcgroup"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}"
-
-RDEPENDS_${PN} += "\
-	libselinux-python \
-	libsemanage-python \
-	sepolgen \
-	"
-RDEPENDS_${PN} += "\
-	python \
-	python-unixadmin \
-	python-shell \
-	python-crypt \
-	python-subprocess \
-	python-syslog \
-	python-textutils \
-	python-IPy \
-	"
-#RDEPENDS_${PN} += "setools"
-
-RDEPENDS_${PN}_virtclass-native = "python-native sepolgen-native"
-
-
-PACKAGES =+ "${PN}-python ${PN}-sandbox"
-FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
-FILES_${PN}-sandbox = "${datadir}/sandbox/*"
-FILES_${PN}-sandbox += "${bindir}/sandbox"
-FILES_${PN}-sandbox += "${sbindir}/seunshare"
-
-CFLAGS_append = " -Wno-error=format-security"
-EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=y AUDITH=y', '', d)}"
-EXTRA_OEMAKE += "PREFIX=${D}"
-
-BBCLASSEXTEND = "native"
-
-PCU_NATIVE_CMDS = "setfiles semodule_package semodule semodule_link semodule_expand semodule_deps"
-
-do_compile_virtclass-native() {
-	for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
-		oe_runmake -C $PCU_CMD \
-			INCLUDEDIR='${STAGING_INCDIR}' \
-			LIBDIR='${STAGING_LIBDIR}'
-	done
-}
-
-do_install_virtclass-native() {
-	for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
-	     oe_runmake -C $PCU_CMD install \
-			DESTDIR="${D}" \
-			PREFIX="${D}/${prefix}" \
-			SBINDIR="${D}/${base_sbindir}"
-	done
-}
diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb
new file mode 100644
index 0000000..a213096
--- /dev/null
+++ b/recipes-security/selinux/policycoreutils_git.bb
@@ -0,0 +1,68 @@
+SUMMARY = "SELinux policy core utilities"
+DESCRIPTION = "policycoreutils contains the policy core utilities that are required \
+for basic operation of a SELinux system.  These utilities include \
+load_policy to load policies, setfiles to label filesystems, newrole \
+to switch roles, and run_init to run /etc/init.d scripts in the proper \
+context."
+SECTION = "base"
+PR = "r1"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+include selinux_git.inc
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+S = "${WORKDIR}/git/policycoreutils"
+DEPENDS += "libsepol libselinux libsemanage libcap-ng libcgroup"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}"
+
+RDEPENDS_${PN} += "\
+	libselinux-python \
+	libsemanage-python \
+	sepolgen \
+	"
+RDEPENDS_${PN} += "\
+	python \
+	python-unixadmin \
+	python-shell \
+	python-crypt \
+	python-subprocess \
+	python-syslog \
+	python-textutils \
+	python-IPy \
+	"
+#RDEPENDS_${PN} += "setools"
+
+RDEPENDS_${PN}_virtclass-native = "python-native sepolgen-native"
+
+
+PACKAGES =+ "${PN}-python ${PN}-sandbox"
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-sandbox = "${datadir}/sandbox/*"
+FILES_${PN}-sandbox += "${bindir}/sandbox"
+FILES_${PN}-sandbox += "${sbindir}/seunshare"
+
+CFLAGS_append = " -Wno-error=format-security"
+EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=y AUDITH=y', '', d)}"
+EXTRA_OEMAKE += "PREFIX=${D}"
+
+BBCLASSEXTEND = "native"
+
+PCU_NATIVE_CMDS = "setfiles semodule_package semodule semodule_link semodule_expand semodule_deps"
+
+do_compile_virtclass-native() {
+	for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
+		oe_runmake -C $PCU_CMD \
+			INCLUDEDIR='${STAGING_INCDIR}' \
+			LIBDIR='${STAGING_LIBDIR}'
+	done
+}
+
+do_install_virtclass-native() {
+	for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
+	     oe_runmake -C $PCU_CMD install \
+			DESTDIR="${D}" \
+			PREFIX="${D}/${prefix}" \
+			SBINDIR="${D}/${base_sbindir}"
+	done
+}
diff --git a/recipes-security/selinux/sepolgen_1.1.5.bb b/recipes-security/selinux/sepolgen_1.1.5.bb
deleted file mode 100644
index 56b1ddf..0000000
--- a/recipes-security/selinux/sepolgen_1.1.5.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Python modules for supporting various SELinux utilities."
-DESCRIPTION = "Python modules for supporting various SELinux utilities."
-SECTION = "base"
-PR = "r1"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-include selinux_git.inc
-
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
- 
-S = "${WORKDIR}/git/sepolgen"
- 
-FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
-
-DEPENDS += "python"
-
-FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/site-packages \
-		/var/lib/sepolgen"
-
-do_install() {
-	oe_runmake DESTDIR=${D} \
-			PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
-			install
-}
-
-BBCLASSEXTEND = "native"
-
diff --git a/recipes-security/selinux/sepolgen_git.bb b/recipes-security/selinux/sepolgen_git.bb
new file mode 100644
index 0000000..56b1ddf
--- /dev/null
+++ b/recipes-security/selinux/sepolgen_git.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Python modules for supporting various SELinux utilities."
+DESCRIPTION = "Python modules for supporting various SELinux utilities."
+SECTION = "base"
+PR = "r1"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+include selinux_git.inc
+
+SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+ 
+S = "${WORKDIR}/git/sepolgen"
+ 
+FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+
+DEPENDS += "python"
+
+FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/site-packages \
+		/var/lib/sepolgen"
+
+do_install() {
+	oe_runmake DESTDIR=${D} \
+			PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
+			install
+}
+
+BBCLASSEXTEND = "native"
+
-- 
cgit v1.2.3-54-g00ecf