summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-09-26 10:17:04 +0800
committerXin Ouyang <Xin.Ouyang@windriver.com>2012-09-26 13:28:31 +0800
commit4d2acedb685851a6c9998284f03ddec6043c2383 (patch)
tree1ae6f63429bc5d2fd5ff83517ea751f07915ca62
parent91707923a298ec7c0507fbca1aa8ce03db50d93f (diff)
downloadmeta-selinux-4d2acedb685851a6c9998284f03ddec6043c2383.tar.gz
selinux recipes: inherit pythonnative
With new changes in oe-core, recipes which need python-native should "inherit pythonnative". Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-rw-r--r--recipes-security/refpolicy/refpolicy_common.inc4
-rw-r--r--recipes-security/selinux/libselinux_2.1.9.bb6
-rw-r--r--recipes-security/selinux/libselinux_git.bb6
-rw-r--r--recipes-security/selinux/policycoreutils_2.1.10.bb4
-rw-r--r--recipes-security/selinux/policycoreutils_git.bb4
5 files changed, 14 insertions, 10 deletions
diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc
index 4831678..e47b754 100644
--- a/recipes-security/refpolicy/refpolicy_common.inc
+++ b/recipes-security/refpolicy/refpolicy_common.inc
@@ -8,12 +8,12 @@ S = "${WORKDIR}/refpolicy"
8FILES_${PN} = "${sysconfdir}/selinux/${POLICY_NAME}/ \ 8FILES_${PN} = "${sysconfdir}/selinux/${POLICY_NAME}/ \
9 ${datadir}/selinux/${POLICY_NAME}/" 9 ${datadir}/selinux/${POLICY_NAME}/"
10 10
11DEPENDS += "checkpolicy-native policycoreutils-native python-native m4-native" 11DEPENDS += "checkpolicy-native policycoreutils-native m4-native"
12RDEPENDS_${PN} += "policycoreutils" 12RDEPENDS_${PN} += "policycoreutils"
13 13
14PACKAGE_ARCH = "${MACHINE_ARCH}" 14PACKAGE_ARCH = "${MACHINE_ARCH}"
15 15
16inherit autotools 16inherit autotools pythonnative
17 17
18PARALLEL_MAKE = "" 18PARALLEL_MAKE = ""
19 19
diff --git a/recipes-security/selinux/libselinux_2.1.9.bb b/recipes-security/selinux/libselinux_2.1.9.bb
index 25d8519..28c7b15 100644
--- a/recipes-security/selinux/libselinux_2.1.9.bb
+++ b/recipes-security/selinux/libselinux_2.1.9.bb
@@ -3,19 +3,19 @@ DESCRIPTION = "libselinux provides an API for SELinux applications to get and se
3process and file security contexts and to obtain security policy \ 3process and file security contexts and to obtain security policy \
4decisions. Required for any applications that use the SELinux API." 4decisions. Required for any applications that use the SELinux API."
5SECTION = "base" 5SECTION = "base"
6PR = "r1" 6PR = "r2"
7LICENSE = "Public Domain" 7LICENSE = "Public Domain"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
9 9
10include selinux_20120216.inc 10include selinux_20120216.inc
11inherit lib_package 11inherit lib_package pythonnative
12 12
13SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221" 13SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221"
14SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f" 14SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f"
15 15
16SRC_URI += "file://libselinux-fix-init-load-policy.patch" 16SRC_URI += "file://libselinux-fix-init-load-policy.patch"
17 17
18DEPENDS += "libsepol python python-native swig-native" 18DEPENDS += "libsepol python swig-native"
19 19
20PACKAGES += "${PN}-python" 20PACKAGES += "${PN}-python"
21FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*" 21FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*"
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
index 719ce4c..e85a3f7 100644
--- a/recipes-security/selinux/libselinux_git.bb
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -3,18 +3,18 @@ DESCRIPTION = "libselinux provides an API for SELinux applications to get and se
3process and file security contexts and to obtain security policy \ 3process and file security contexts and to obtain security policy \
4decisions. Required for any applications that use the SELinux API." 4decisions. Required for any applications that use the SELinux API."
5SECTION = "base" 5SECTION = "base"
6PR = "r1" 6PR = "r2"
7LICENSE = "Public Domain" 7LICENSE = "Public Domain"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
9DEFAULT_PREFERENCE = "-1" 9DEFAULT_PREFERENCE = "-1"
10 10
11include selinux_git.inc 11include selinux_git.inc
12inherit lib_package 12inherit lib_package pythonnative
13 13
14SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" 14SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
15PV = "2.1.9+git${SRCPV}" 15PV = "2.1.9+git${SRCPV}"
16 16
17DEPENDS += "libsepol python python-native swig-native" 17DEPENDS += "libsepol python swig-native"
18 18
19PACKAGES += "${PN}-python" 19PACKAGES += "${PN}-python"
20FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*" 20FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*"
diff --git a/recipes-security/selinux/policycoreutils_2.1.10.bb b/recipes-security/selinux/policycoreutils_2.1.10.bb
index 10bc771..1990977 100644
--- a/recipes-security/selinux/policycoreutils_2.1.10.bb
+++ b/recipes-security/selinux/policycoreutils_2.1.10.bb
@@ -5,7 +5,7 @@ load_policy to load policies, setfiles to label filesystems, newrole \
5to switch roles, and run_init to run /etc/init.d scripts in the proper \ 5to switch roles, and run_init to run /etc/init.d scripts in the proper \
6context." 6context."
7SECTION = "base" 7SECTION = "base"
8PR = "r2" 8PR = "r3"
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 10LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
11 11
@@ -45,6 +45,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*"
45FILES_${PN}-sandbox += "${bindir}/sandbox" 45FILES_${PN}-sandbox += "${bindir}/sandbox"
46FILES_${PN}-sandbox += "${sbindir}/seunshare" 46FILES_${PN}-sandbox += "${sbindir}/seunshare"
47 47
48inherit pythonnative
49
48AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" 50AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `"
49PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" 51PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `"
50EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" 52EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n"
diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb
index d02c0d9..373cdb0 100644
--- a/recipes-security/selinux/policycoreutils_git.bb
+++ b/recipes-security/selinux/policycoreutils_git.bb
@@ -5,7 +5,7 @@ load_policy to load policies, setfiles to label filesystems, newrole \
5to switch roles, and run_init to run /etc/init.d scripts in the proper \ 5to switch roles, and run_init to run /etc/init.d scripts in the proper \
6context." 6context."
7SECTION = "base" 7SECTION = "base"
8PR = "r2" 8PR = "r3"
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 10LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
11DEFAULT_PREFERENCE = "-1" 11DEFAULT_PREFERENCE = "-1"
@@ -46,6 +46,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*"
46FILES_${PN}-sandbox += "${bindir}/sandbox" 46FILES_${PN}-sandbox += "${bindir}/sandbox"
47FILES_${PN}-sandbox += "${sbindir}/seunshare" 47FILES_${PN}-sandbox += "${sbindir}/seunshare"
48 48
49inherit pythonnative
50
49AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" 51AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `"
50PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" 52PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `"
51EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" 53EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n"