From d49dc4eea865c4174337a99cae4fe9a2343b7455 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Tue, 25 Sep 2012 13:26:01 +0800 Subject: change python-native back for denzil branch. Signed-off-by: Xin Ouyang --- recipes-security/audit/audit_2.1.3.bb | 4 ++-- recipes-security/audit/audit_2.2.1.bb | 4 ++-- recipes-security/libcap-ng/libcap-ng_0.6.5.bb | 4 ++-- recipes-security/libcap-ng/libcap-ng_0.6.6.bb | 4 ++-- recipes-security/refpolicy/refpolicy_common.inc | 4 ++-- recipes-security/selinux/libselinux_2.1.9.bb | 4 ++-- recipes-security/selinux/libselinux_git.bb | 4 ++-- recipes-security/selinux/policycoreutils_2.1.10.bb | 4 +--- recipes-security/selinux/policycoreutils_git.bb | 4 +--- recipes-security/setools/setools_3.3.7.bb | 4 ++-- 10 files changed, 18 insertions(+), 22 deletions(-) diff --git a/recipes-security/audit/audit_2.1.3.bb b/recipes-security/audit/audit_2.1.3.bb index 8c82918..1e595f2 100644 --- a/recipes-security/audit/audit_2.1.3.bb +++ b/recipes-security/audit/audit_2.1.3.bb @@ -14,12 +14,12 @@ SRC_URI = "http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz \ SRC_URI += "file://audit-for-cross-compiling.patch" -inherit autotools pythonnative +inherit autotools SRC_URI[md5sum] = "abf26e3ac09f666905c5636dd24611fa" SRC_URI[sha256sum] = "1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e" -DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30)" +DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30) python-native" EXTRA_OECONF += "--without-prelude --with-libwrap --enable-gssapi-krb5=no --disable-ldap --with-libcap-ng=yes" diff --git a/recipes-security/audit/audit_2.2.1.bb b/recipes-security/audit/audit_2.2.1.bb index 5dabf0d..cc1e419 100644 --- a/recipes-security/audit/audit_2.2.1.bb +++ b/recipes-security/audit/audit_2.2.1.bb @@ -17,12 +17,12 @@ SRC_URI += "file://2.2.1-audit-for-cross-compiling.patch \ file://sbin-in-usr.patch \ file://auditd" -inherit autotools pythonnative +inherit autotools SRC_URI[md5sum] = "dc099fcb2f9242d47ecc35b46d71dfd1" SRC_URI[sha256sum] = "9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148713a63" -DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30)" +DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30) python-native" EXTRA_OECONF += "--without-prelude \ --with-libwrap \ diff --git a/recipes-security/libcap-ng/libcap-ng_0.6.5.bb b/recipes-security/libcap-ng/libcap-ng_0.6.5.bb index a38bef3..cd755a6 100644 --- a/recipes-security/libcap-ng/libcap-ng_0.6.5.bb +++ b/recipes-security/libcap-ng/libcap-ng_0.6.5.bb @@ -13,12 +13,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch" -inherit lib_package autotools pythonnative +inherit lib_package autotools SRC_URI[md5sum] = "759ae1accd9954f3e08c2f94b4ecfcf9" SRC_URI[sha256sum] = "293e2e308f08d171f64e8387cdf48b505b0e78d786e2660efd285295e64d6620" -DEPENDS += "swig-native python" +DEPENDS += "swig-native python-native python" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" diff --git a/recipes-security/libcap-ng/libcap-ng_0.6.6.bb b/recipes-security/libcap-ng/libcap-ng_0.6.6.bb index 4b0aaa1..807ae41 100644 --- a/recipes-security/libcap-ng/libcap-ng_0.6.6.bb +++ b/recipes-security/libcap-ng/libcap-ng_0.6.6.bb @@ -13,12 +13,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ file://python.patch" -inherit lib_package autotools pythonnative +inherit lib_package autotools SRC_URI[md5sum] = "eb71f967cecb44b4342baac98ef8cb0f" SRC_URI[sha256sum] = "89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d" -DEPENDS += "swig-native python" +DEPENDS += "swig-native python-native python" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc index e47b754..ba56a8e 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 m4-native" +DEPENDS += "checkpolicy-native policycoreutils-native m4-native python-native" RDEPENDS_${PN} += "policycoreutils" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools pythonnative +inherit autotools PARALLEL_MAKE = "" diff --git a/recipes-security/selinux/libselinux_2.1.9.bb b/recipes-security/selinux/libselinux_2.1.9.bb index 40fbf10..90a009a 100644 --- a/recipes-security/selinux/libselinux_2.1.9.bb +++ b/recipes-security/selinux/libselinux_2.1.9.bb @@ -8,14 +8,14 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" include selinux_20120216.inc -inherit lib_package pythonnative +inherit lib_package SRC_URI[md5sum] = "8ea0548dd65e9479b357ba1447f89221" SRC_URI[sha256sum] = "749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f" SRC_URI += "file://libselinux-fix-init-load-policy.patch" -DEPENDS += "libsepol python swig-native" +DEPENDS += "libsepol python swig-native python-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 893fac5..39f12ea 100644 --- a/recipes-security/selinux/libselinux_git.bb +++ b/recipes-security/selinux/libselinux_git.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" DEFAULT_PREFERENCE = "-1" include selinux_git.inc -inherit lib_package pythonnative +inherit lib_package SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e" PV = "2.1.9+git${SRCPV}" -DEPENDS += "libsepol python swig-native" +DEPENDS += "libsepol python swig-native python-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 f6e998d..5901011 100644 --- a/recipes-security/selinux/policycoreutils_2.1.10.bb +++ b/recipes-security/selinux/policycoreutils_2.1.10.bb @@ -22,7 +22,7 @@ PAM_SRC_URI = "file://pam.d/newrole \ file://pam.d/run_init \ " -DEPENDS += "libsepol libselinux libsemanage" +DEPENDS += "libsepol libselinux libsemanage python-native" DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" EXTRA_DEPENDS = "libcap-ng libcgroup" EXTRA_DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" @@ -54,8 +54,6 @@ 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 2736476..c16c7e4 100644 --- a/recipes-security/selinux/policycoreutils_git.bb +++ b/recipes-security/selinux/policycoreutils_git.bb @@ -23,7 +23,7 @@ PAM_SRC_URI = "file://pam.d/newrole \ file://pam.d/run_init \ " -DEPENDS += "libsepol libselinux libsemanage" +DEPENDS += "libsepol libselinux libsemanage python-native" DEPENDS += "${@['', '${EXTRA_DEPENDS}']['${PN}' != '${BPN}-native']}" EXTRA_DEPENDS = "libcap-ng libcgroup" EXTRA_DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam audit', '', d)}" @@ -54,8 +54,6 @@ 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/setools/setools_3.3.7.bb b/recipes-security/setools/setools_3.3.7.bb index 2c0f19f..6b05aa0 100644 --- a/recipes-security/setools/setools_3.3.7.bb +++ b/recipes-security/setools/setools_3.3.7.bb @@ -33,7 +33,7 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \ file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24" -DEPENDS += "python libsepol libselinux libxml2" +DEPENDS += "python libsepol libselinux libxml2 python-native" PACKAGES += "${PN}-libs ${PN}-console" @@ -73,7 +73,7 @@ FILES_${PN}-console = "\ ${mandir}/man1/sesearch.1.gz \ " -inherit autotools pythonnative +inherit autotools # need to export these variables for python-config to work export BUILD_SYS -- cgit v1.2.3-54-g00ecf