audit: fix package issues.

Rename two packages and change files in them.
 * audit-libs -> audit : main package, for libraries
 * audit -> auditd     : for daemon binaries

Libraries are changed to install into ${base_libdir}.

The two fixes are used to fix QA issues and fit the Debian policy.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>

1 files changed, 20 insertions, 9 deletions

diff --git a/recipes-security/audit/audit_2.2.1.bb b/recipes-security/audit/audit_2.2.1.bb
index bc0f248..5dabf0d 100644
--- a/recipes-security/audit/audit_2.2.1.bb
+++ b/recipes-security/audit/audit_2.2.1.bb
@@ -4,7 +4,7 @@ storing and searching the audit records generated by the audit subsystem \
 in the Linux kernel."
 HOMEPAGE = "http://people.redhat.com/sgrubb/audit/"
 SECTION = "base"
-PR = "r2"
+PR = "r3"
 LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
@@ -24,9 +24,19 @@ SRC_URI[sha256sum] = "9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148
 
 DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30)"
 
-EXTRA_OECONF += "--without-prelude --with-libwrap --enable-gssapi-krb5=no --disable-ldap --with-libcap-ng=yes --with-python=yes"
+EXTRA_OECONF += "--without-prelude \
+        --with-libwrap \
+        --enable-gssapi-krb5=no \
+        --disable-ldap \
+        --with-libcap-ng=yes \
+        --with-python=yes \
+        --libdir=${base_libdir} \
+        "
 
-EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/$(PYLIBVER)'"
+EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \
+        PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \
+        pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
+        "
 
 SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"
 DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \
@@ -34,17 +44,18 @@ interface to the audit system, audispd. These plugins can do things \
 like relay events to remote machines or analyze events for suspicious \
 behavior."
 
-PACKAGES =+ "audispd-plugins ${PN}-libs"
-PACKAGES += "${PN}-python"
+PACKAGES =+ "audispd-plugins"
+PACKAGES += "auditd ${PN}-python"
 
-FILES_${PN}-libs += "${sysconfdir}/libaudit.conf ${libdir}/libaudit.so.1* ${libdir}/libauparse.so.*"
-FILES_${PN} += "${bindir} ${sbindir}"
+FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*"
+FILES_auditd += "${bindir}/* ${sbindir}/* ${sysconfdir}/*"
 FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \
         ${sysconfdir}/audisp/plugins.d/au-remote.conf \
-        ${base_sbindir}/audisp-remote ${localstatedir}/spool/audit \
-        ${mandir}/man8/audisp-remote.8 ${mandir}/man5/audisp-remote.conf.5"
+        ${sbindir}/audisp-remote ${localstatedir}/spool/audit \
+        "
 FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
 FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
+FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
 
 # The executables in lib/, which are named as gen_*_h, will run on the hosts to create
 # *_tables.h/*tabs.h header files for the targets.