diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-09-26 10:17:04 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-09-26 13:28:31 +0800 |
commit | 4d2acedb685851a6c9998284f03ddec6043c2383 (patch) | |
tree | 1ae6f63429bc5d2fd5ff83517ea751f07915ca62 | |
parent | 91707923a298ec7c0507fbca1aa8ce03db50d93f (diff) | |
download | meta-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.inc | 4 | ||||
-rw-r--r-- | recipes-security/selinux/libselinux_2.1.9.bb | 6 | ||||
-rw-r--r-- | recipes-security/selinux/libselinux_git.bb | 6 | ||||
-rw-r--r-- | recipes-security/selinux/policycoreutils_2.1.10.bb | 4 | ||||
-rw-r--r-- | recipes-security/selinux/policycoreutils_git.bb | 4 |
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" | |||
8 | FILES_${PN} = "${sysconfdir}/selinux/${POLICY_NAME}/ \ | 8 | FILES_${PN} = "${sysconfdir}/selinux/${POLICY_NAME}/ \ |
9 | ${datadir}/selinux/${POLICY_NAME}/" | 9 | ${datadir}/selinux/${POLICY_NAME}/" |
10 | 10 | ||
11 | DEPENDS += "checkpolicy-native policycoreutils-native python-native m4-native" | 11 | DEPENDS += "checkpolicy-native policycoreutils-native m4-native" |
12 | RDEPENDS_${PN} += "policycoreutils" | 12 | RDEPENDS_${PN} += "policycoreutils" |
13 | 13 | ||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
15 | 15 | ||
16 | inherit autotools | 16 | inherit autotools pythonnative |
17 | 17 | ||
18 | PARALLEL_MAKE = "" | 18 | PARALLEL_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 | |||
3 | process and file security contexts and to obtain security policy \ | 3 | process and file security contexts and to obtain security policy \ |
4 | decisions. Required for any applications that use the SELinux API." | 4 | decisions. Required for any applications that use the SELinux API." |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | LICENSE = "Public Domain" | 7 | LICENSE = "Public Domain" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" |
9 | 9 | ||
10 | include selinux_20120216.inc | 10 | include selinux_20120216.inc |
11 | inherit lib_package | 11 | inherit lib_package pythonnative |
12 | 12 | ||
13 | SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221" | 13 | SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221" |
14 | SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f" | 14 | SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f" |
15 | 15 | ||
16 | SRC_URI += "file://libselinux-fix-init-load-policy.patch" | 16 | SRC_URI += "file://libselinux-fix-init-load-policy.patch" |
17 | 17 | ||
18 | DEPENDS += "libsepol python python-native swig-native" | 18 | DEPENDS += "libsepol python swig-native" |
19 | 19 | ||
20 | PACKAGES += "${PN}-python" | 20 | PACKAGES += "${PN}-python" |
21 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*" | 21 | FILES_${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 | |||
3 | process and file security contexts and to obtain security policy \ | 3 | process and file security contexts and to obtain security policy \ |
4 | decisions. Required for any applications that use the SELinux API." | 4 | decisions. Required for any applications that use the SELinux API." |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | LICENSE = "Public Domain" | 7 | LICENSE = "Public Domain" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" |
9 | DEFAULT_PREFERENCE = "-1" | 9 | DEFAULT_PREFERENCE = "-1" |
10 | 10 | ||
11 | include selinux_git.inc | 11 | include selinux_git.inc |
12 | inherit lib_package | 12 | inherit lib_package pythonnative |
13 | 13 | ||
14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" | 14 | SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" |
15 | PV = "2.1.9+git${SRCPV}" | 15 | PV = "2.1.9+git${SRCPV}" |
16 | 16 | ||
17 | DEPENDS += "libsepol python python-native swig-native" | 17 | DEPENDS += "libsepol python swig-native" |
18 | 18 | ||
19 | PACKAGES += "${PN}-python" | 19 | PACKAGES += "${PN}-python" |
20 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/selinux/*" | 20 | FILES_${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 \ | |||
5 | to switch roles, and run_init to run /etc/init.d scripts in the proper \ | 5 | to switch roles, and run_init to run /etc/init.d scripts in the proper \ |
6 | context." | 6 | context." |
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | PR = "r2" | 8 | PR = "r3" |
9 | LICENSE = "GPLv2+" | 9 | LICENSE = "GPLv2+" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" |
11 | 11 | ||
@@ -45,6 +45,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*" | |||
45 | FILES_${PN}-sandbox += "${bindir}/sandbox" | 45 | FILES_${PN}-sandbox += "${bindir}/sandbox" |
46 | FILES_${PN}-sandbox += "${sbindir}/seunshare" | 46 | FILES_${PN}-sandbox += "${sbindir}/seunshare" |
47 | 47 | ||
48 | inherit pythonnative | ||
49 | |||
48 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" | 50 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" |
49 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" | 51 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" |
50 | EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" | 52 | EXTRA_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 \ | |||
5 | to switch roles, and run_init to run /etc/init.d scripts in the proper \ | 5 | to switch roles, and run_init to run /etc/init.d scripts in the proper \ |
6 | context." | 6 | context." |
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | PR = "r2" | 8 | PR = "r3" |
9 | LICENSE = "GPLv2+" | 9 | LICENSE = "GPLv2+" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" |
11 | DEFAULT_PREFERENCE = "-1" | 11 | DEFAULT_PREFERENCE = "-1" |
@@ -46,6 +46,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*" | |||
46 | FILES_${PN}-sandbox += "${bindir}/sandbox" | 46 | FILES_${PN}-sandbox += "${bindir}/sandbox" |
47 | FILES_${PN}-sandbox += "${sbindir}/seunshare" | 47 | FILES_${PN}-sandbox += "${sbindir}/seunshare" |
48 | 48 | ||
49 | inherit pythonnative | ||
50 | |||
49 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" | 51 | AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" |
50 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" | 52 | PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" |
51 | EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" | 53 | EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" |