From 4d2acedb685851a6c9998284f03ddec6043c2383 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Wed, 26 Sep 2012 10:17:04 +0800 Subject: selinux recipes: inherit pythonnative With new changes in oe-core, recipes which need python-native should "inherit pythonnative". Signed-off-by: Xin Ouyang --- recipes-security/refpolicy/refpolicy_common.inc | 4 ++-- recipes-security/selinux/libselinux_2.1.9.bb | 6 +++--- recipes-security/selinux/libselinux_git.bb | 6 +++--- recipes-security/selinux/policycoreutils_2.1.10.bb | 4 +++- 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" FILES_${PN} = "${sysconfdir}/selinux/${POLICY_NAME}/ \ ${datadir}/selinux/${POLICY_NAME}/" -DEPENDS += "checkpolicy-native policycoreutils-native python-native m4-native" +DEPENDS += "checkpolicy-native policycoreutils-native m4-native" RDEPENDS_${PN} += "policycoreutils" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools +inherit autotools pythonnative PARALLEL_MAKE = "" 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 process and file security contexts and to obtain security policy \ decisions. Required for any applications that use the SELinux API." SECTION = "base" -PR = "r1" +PR = "r2" LICENSE = "Public Domain" LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" include selinux_20120216.inc -inherit lib_package +inherit lib_package pythonnative SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221" SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f" SRC_URI += "file://libselinux-fix-init-load-policy.patch" -DEPENDS += "libsepol python python-native swig-native" +DEPENDS += "libsepol python swig-native" PACKAGES += "${PN}-python" 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 process and file security contexts and to obtain security policy \ decisions. Required for any applications that use the SELinux API." SECTION = "base" -PR = "r1" +PR = "r2" LICENSE = "Public Domain" LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" DEFAULT_PREFERENCE = "-1" include selinux_git.inc -inherit lib_package +inherit lib_package pythonnative SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" PV = "2.1.9+git${SRCPV}" -DEPENDS += "libsepol python python-native swig-native" +DEPENDS += "libsepol python swig-native" PACKAGES += "${PN}-python" 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 \ to switch roles, and run_init to run /etc/init.d scripts in the proper \ context." SECTION = "base" -PR = "r2" +PR = "r3" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" @@ -45,6 +45,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*" FILES_${PN}-sandbox += "${bindir}/sandbox" FILES_${PN}-sandbox += "${sbindir}/seunshare" +inherit pythonnative + AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" 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 \ to switch roles, and run_init to run /etc/init.d scripts in the proper \ context." SECTION = "base" -PR = "r2" +PR = "r3" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEFAULT_PREFERENCE = "-1" @@ -46,6 +46,8 @@ FILES_${PN}-sandbox = "${datadir}/sandbox/*" FILES_${PN}-sandbox += "${bindir}/sandbox" FILES_${PN}-sandbox += "${sbindir}/seunshare" +inherit pythonnative + AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `" PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `" EXTRA_OEMAKE += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ', d)} INOTIFYH=n" -- cgit v1.2.3-54-g00ecf