diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2014-01-20 05:15:42 -0500 |
---|---|---|
committer | Xin Ouyang <xin.ouyang@windriver.com> | 2014-01-20 18:20:26 +0800 |
commit | fccacdca9489ba605e3a84f313f820615df9bdaf (patch) | |
tree | b8efd9de054572c58405fe36d890bdd6e6d92343 | |
parent | e81b2a4e0d2f7362f4a5e81457e91e179fb8c5ab (diff) | |
download | meta-selinux-fccacdca9489ba605e3a84f313f820615df9bdaf.tar.gz |
Revert "libsemanage: add audit dependency"
This reverts commit 146bd8c6bc3bc0e9e96a8517263f28f7915b871d.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Xin Ouyang <xin.ouyang@windriver.com>
-rw-r--r-- | recipes-security/audit/audit_2.3.2.bb | 8 | ||||
-rw-r--r-- | recipes-security/selinux/libsemanage.inc | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/recipes-security/audit/audit_2.3.2.bb b/recipes-security/audit/audit_2.3.2.bb index 8ab0c7b..edcb881 100644 --- a/recipes-security/audit/audit_2.3.2.bb +++ b/recipes-security/audit/audit_2.3.2.bb | |||
@@ -26,7 +26,6 @@ SRC_URI[md5sum] = "4e8d065b5cc16b77b9b61e93a9ed160e" | |||
26 | SRC_URI[sha256sum] = "8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29" | 26 | SRC_URI[sha256sum] = "8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29" |
27 | 27 | ||
28 | DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30)" | 28 | DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30)" |
29 | DEPENDS_class-native = "" | ||
30 | 29 | ||
31 | EXTRA_OECONF += "--without-prelude \ | 30 | EXTRA_OECONF += "--without-prelude \ |
32 | --with-libwrap \ | 31 | --with-libwrap \ |
@@ -38,9 +37,6 @@ EXTRA_OECONF += "--without-prelude \ | |||
38 | --sbindir=${base_sbindir} \ | 37 | --sbindir=${base_sbindir} \ |
39 | " | 38 | " |
40 | 39 | ||
41 | # Remove extra configs for native build | ||
42 | EXTRA_OECONF_class-native = "--with-python=no" | ||
43 | |||
44 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ | 40 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ |
45 | PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ | 41 | PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ |
46 | pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ | 42 | pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ |
@@ -66,7 +62,7 @@ FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" | |||
66 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" | 62 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" |
67 | FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" | 63 | FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" |
68 | 64 | ||
69 | do_install_append_class-target() { | 65 | do_install_append() { |
70 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a | 66 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a |
71 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la | 67 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la |
72 | 68 | ||
@@ -79,5 +75,3 @@ do_install_append_class-target() { | |||
79 | install -D -m 0755 ${S}/../auditd ${D}/etc/init.d/auditd | 75 | install -D -m 0755 ${S}/../auditd ${D}/etc/init.d/auditd |
80 | rm -rf ${D}/etc/rc.d | 76 | rm -rf ${D}/etc/rc.d |
81 | } | 77 | } |
82 | |||
83 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-security/selinux/libsemanage.inc b/recipes-security/selinux/libsemanage.inc index a978c75..dfc3006 100644 --- a/recipes-security/selinux/libsemanage.inc +++ b/recipes-security/selinux/libsemanage.inc | |||
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1+" | |||
10 | 10 | ||
11 | inherit lib_package | 11 | inherit lib_package |
12 | 12 | ||
13 | DEPENDS += "libsepol libselinux ustr bzip2 python audit bison-native flex-native" | 13 | DEPENDS += "libsepol libselinux ustr bzip2 python bison-native flex-native" |
14 | 14 | ||
15 | PACKAGES += "${PN}-python" | 15 | PACKAGES += "${PN}-python" |
16 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" | 16 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" |