From 4923d17aeaa1e0f4ffdd1cffe72261bfdddda3b1 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Mon, 20 Feb 2012 13:52:55 +0800
Subject: Move S from bb recipes to selinux_git.inc.

---
 recipes-security/selinux/checkpolicy_git.bb     | 2 +-
 recipes-security/selinux/libselinux_git.bb      | 2 +-
 recipes-security/selinux/libsemanage_git.bb     | 2 +-
 recipes-security/selinux/libsepol_git.bb        | 1 -
 recipes-security/selinux/policycoreutils_git.bb | 2 +-
 recipes-security/selinux/selinux_git.inc        | 1 +
 recipes-security/selinux/sepolgen_git.bb        | 1 -
 7 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/recipes-security/selinux/checkpolicy_git.bb b/recipes-security/selinux/checkpolicy_git.bb
index fe624c9..424e6f2 100644
--- a/recipes-security/selinux/checkpolicy_git.bb
+++ b/recipes-security/selinux/checkpolicy_git.bb
@@ -9,7 +9,7 @@ include selinux_git.inc
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "2.1.8+git${SRCPV}"
-S = "${WORKDIR}/git/checkpolicy"
+
 DEPENDS += "libsepol libselinux flex-native"
 
 EXTRA_OEMAKE += "PREFIX=${D}" 
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
index 56a49ca..286af67 100644
--- a/recipes-security/selinux/libselinux_git.bb
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -12,7 +12,7 @@ inherit lib_package
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "2.1.9+git${SRCPV}"
-S = "${WORKDIR}/git/libselinux"
+
 DEPENDS += "libsepol python python-native swig-native"
 
 PACKAGES += "${PN}-python"
diff --git a/recipes-security/selinux/libsemanage_git.bb b/recipes-security/selinux/libsemanage_git.bb
index 698818f..3bcbc05 100644
--- a/recipes-security/selinux/libsemanage_git.bb
+++ b/recipes-security/selinux/libsemanage_git.bb
@@ -13,7 +13,7 @@ inherit lib_package
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "2.1.6+git${SRCPV}"
-S = "${WORKDIR}/git/libsemanage"
+
 DEPENDS += "libsepol libselinux ustr bzip2 python"
 
 SRC_URI += "file://Fix-segfault-for-standard-policy.patch"
diff --git a/recipes-security/selinux/libsepol_git.bb b/recipes-security/selinux/libsepol_git.bb
index 4416ee5..a66fee2 100644
--- a/recipes-security/selinux/libsepol_git.bb
+++ b/recipes-security/selinux/libsepol_git.bb
@@ -13,7 +13,6 @@ inherit lib_package
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "2.1.4+git${SRCPV}"
-S = "${WORKDIR}/git/libsepol"
 
 BBCLASSEXTEND = "native"
 
diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb
index b16a75b..668dec8 100644
--- a/recipes-security/selinux/policycoreutils_git.bb
+++ b/recipes-security/selinux/policycoreutils_git.bb
@@ -13,7 +13,7 @@ include selinux_git.inc
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "2.1.10+git${SRCPV}"
-S = "${WORKDIR}/git/policycoreutils"
+
 DEPENDS += "libsepol libselinux libsemanage libcap-ng libcgroup"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}"
 
diff --git a/recipes-security/selinux/selinux_git.inc b/recipes-security/selinux/selinux_git.inc
index 516ddb7..f635f54 100644
--- a/recipes-security/selinux/selinux_git.inc
+++ b/recipes-security/selinux/selinux_git.inc
@@ -4,6 +4,7 @@ SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http"
 SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464"
 SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520"
 
+S = "${WORKDIR}/git/${BPN}"
 
 # EXTRA_OEMAKE is typically: -e MAKEFLAGS=
 # "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so
diff --git a/recipes-security/selinux/sepolgen_git.bb b/recipes-security/selinux/sepolgen_git.bb
index 90387ff..e665cd0 100644
--- a/recipes-security/selinux/sepolgen_git.bb
+++ b/recipes-security/selinux/sepolgen_git.bb
@@ -9,7 +9,6 @@ include selinux_git.inc
 
 SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
 PV = "1.1.5+git${SRCPV}" 
-S = "${WORKDIR}/git/sepolgen"
  
 FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
 
-- 
cgit v1.2.3-54-g00ecf