diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-02-20 13:52:55 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-02-20 13:52:55 +0800 |
commit | 4923d17aeaa1e0f4ffdd1cffe72261bfdddda3b1 (patch) | |
tree | 6072fa152b39adbb03f05f928638a20506fcff26 | |
parent | 91dc1e97b48aa46d008f86d4548506105ebc5367 (diff) | |
download | meta-selinux-4923d17aeaa1e0f4ffdd1cffe72261bfdddda3b1.tar.gz |
Move S from bb recipes to selinux_git.inc.
-rw-r--r-- | recipes-security/selinux/checkpolicy_git.bb | 2 | ||||
-rw-r--r-- | recipes-security/selinux/libselinux_git.bb | 2 | ||||
-rw-r--r-- | recipes-security/selinux/libsemanage_git.bb | 2 | ||||
-rw-r--r-- | recipes-security/selinux/libsepol_git.bb | 1 | ||||
-rw-r--r-- | recipes-security/selinux/policycoreutils_git.bb | 2 | ||||
-rw-r--r-- | recipes-security/selinux/selinux_git.inc | 1 | ||||
-rw-r--r-- | 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 | |||
9 | 9 | ||
10 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 10 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
11 | PV = "2.1.8+git${SRCPV}" | 11 | PV = "2.1.8+git${SRCPV}" |
12 | S = "${WORKDIR}/git/checkpolicy" | 12 | |
13 | DEPENDS += "libsepol libselinux flex-native" | 13 | DEPENDS += "libsepol libselinux flex-native" |
14 | 14 | ||
15 | EXTRA_OEMAKE += "PREFIX=${D}" | 15 | 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 | |||
12 | 12 | ||
13 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 13 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
14 | PV = "2.1.9+git${SRCPV}" | 14 | PV = "2.1.9+git${SRCPV}" |
15 | S = "${WORKDIR}/git/libselinux" | 15 | |
16 | DEPENDS += "libsepol python python-native swig-native" | 16 | DEPENDS += "libsepol python python-native swig-native" |
17 | 17 | ||
18 | PACKAGES += "${PN}-python" | 18 | 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 | |||
13 | 13 | ||
14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
15 | PV = "2.1.6+git${SRCPV}" | 15 | PV = "2.1.6+git${SRCPV}" |
16 | S = "${WORKDIR}/git/libsemanage" | 16 | |
17 | DEPENDS += "libsepol libselinux ustr bzip2 python" | 17 | DEPENDS += "libsepol libselinux ustr bzip2 python" |
18 | 18 | ||
19 | SRC_URI += "file://Fix-segfault-for-standard-policy.patch" | 19 | 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 | |||
13 | 13 | ||
14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
15 | PV = "2.1.4+git${SRCPV}" | 15 | PV = "2.1.4+git${SRCPV}" |
16 | S = "${WORKDIR}/git/libsepol" | ||
17 | 16 | ||
18 | BBCLASSEXTEND = "native" | 17 | BBCLASSEXTEND = "native" |
19 | 18 | ||
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 | |||
13 | 13 | ||
14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
15 | PV = "2.1.10+git${SRCPV}" | 15 | PV = "2.1.10+git${SRCPV}" |
16 | S = "${WORKDIR}/git/policycoreutils" | 16 | |
17 | DEPENDS += "libsepol libselinux libsemanage libcap-ng libcgroup" | 17 | DEPENDS += "libsepol libselinux libsemanage libcap-ng libcgroup" |
18 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" | 18 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" |
19 | 19 | ||
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" | |||
4 | SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464" | 4 | SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464" |
5 | SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520" | 5 | SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520" |
6 | 6 | ||
7 | S = "${WORKDIR}/git/${BPN}" | ||
7 | 8 | ||
8 | # EXTRA_OEMAKE is typically: -e MAKEFLAGS= | 9 | # EXTRA_OEMAKE is typically: -e MAKEFLAGS= |
9 | # "MAKEFLAGS= " causes problems as ENV variables will not pass to subdirs, so | 10 | # "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 | |||
9 | 9 | ||
10 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 10 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
11 | PV = "1.1.5+git${SRCPV}" | 11 | PV = "1.1.5+git${SRCPV}" |
12 | S = "${WORKDIR}/git/sepolgen" | ||
13 | 12 | ||
14 | FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" | 13 | FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" |
15 | 14 | ||