diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2014-01-02 04:53:46 -0500 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2014-01-10 14:55:10 -0600 |
commit | 146bd8c6bc3bc0e9e96a8517263f28f7915b871d (patch) | |
tree | 21ed16615ca67770885187404c83723236771922 | |
parent | 9cdd0a97278554f951e3891b2f0e043e29f9cc73 (diff) | |
download | meta-selinux-146bd8c6bc3bc0e9e96a8517263f28f7915b871d.tar.gz |
libsemanage: add audit dependency
Building libsemanage 2.2 need the header libaudit.h.
(From meta-selinux master rev: d297ea1fb141ab8715914035ddae4d7162e4bc92)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@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, 8 insertions, 2 deletions
diff --git a/recipes-security/audit/audit_2.3.2.bb b/recipes-security/audit/audit_2.3.2.bb index bd7b4eb..b546297 100644 --- a/recipes-security/audit/audit_2.3.2.bb +++ b/recipes-security/audit/audit_2.3.2.bb | |||
@@ -26,6 +26,7 @@ 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 = "" | ||
29 | 30 | ||
30 | EXTRA_OECONF += "--without-prelude \ | 31 | EXTRA_OECONF += "--without-prelude \ |
31 | --with-libwrap \ | 32 | --with-libwrap \ |
@@ -37,6 +38,9 @@ EXTRA_OECONF += "--without-prelude \ | |||
37 | --sbindir=${base_sbindir} \ | 38 | --sbindir=${base_sbindir} \ |
38 | " | 39 | " |
39 | 40 | ||
41 | # Remove extra configs for native build | ||
42 | EXTRA_OECONF_class-native = "--with-python=no" | ||
43 | |||
40 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ | 44 | EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ |
41 | PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ | 45 | PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ |
42 | pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ | 46 | pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ |
@@ -62,7 +66,7 @@ FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" | |||
62 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" | 66 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" |
63 | FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" | 67 | FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" |
64 | 68 | ||
65 | do_install_append() { | 69 | do_install_append_class-target() { |
66 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a | 70 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a |
67 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la | 71 | rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la |
68 | 72 | ||
@@ -75,3 +79,5 @@ do_install_append() { | |||
75 | install -D -m 0755 ${S}/../auditd ${D}/etc/init.d/auditd | 79 | install -D -m 0755 ${S}/../auditd ${D}/etc/init.d/auditd |
76 | rm -rf ${D}/etc/rc.d | 80 | rm -rf ${D}/etc/rc.d |
77 | } | 81 | } |
82 | |||
83 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-security/selinux/libsemanage.inc b/recipes-security/selinux/libsemanage.inc index dfc3006..a978c75 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 bison-native flex-native" | 13 | DEPENDS += "libsepol libselinux ustr bzip2 python audit 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/*" |