summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-04-01 23:11:06 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2018-05-08 10:30:56 -0400
commit968caef93705e2b24da07b8664c10e2bfa2e3fd0 (patch)
treeb74916ba0ef21484be7fb23df794f33e38717f54
parentbf355336b33386608bf91a5aa5e5b3ce2310d14f (diff)
downloadmeta-selinux-968caef93705e2b24da07b8664c10e2bfa2e3fd0.tar.gz
audit: fix pkgconfigdir
Because 'libdir' is set with ${base_libdir} in recipe file of audit, package config files(.pc) are installed to ${base_libdir}/pkgconfig that variable pkgconfigdir is set with ${libdir}/pkgconfig in makefile. Set pkgconfigdir directly to install .pc files to right directory. And remove setting of FILES_${PN}-dev which has been done in bitbake.conf in oe-core. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/audit/audit_2.7.6.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-security/audit/audit_2.7.6.bb b/recipes-security/audit/audit_2.7.6.bb
index 5bfda7b..d655e64 100644
--- a/recipes-security/audit/audit_2.7.6.bb
+++ b/recipes-security/audit/audit_2.7.6.bb
@@ -45,6 +45,7 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \
45 PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ 45 PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \
46 pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ 46 pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
47 STDINC='${STAGING_INCDIR}' \ 47 STDINC='${STAGING_INCDIR}' \
48 pkgconfigdir=${libdir}/pkgconfig \
48 " 49 "
49 50
50SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" 51SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"
@@ -64,7 +65,6 @@ FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \
64 " 65 "
65FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" 66FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
66FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" 67FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
67FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la ${base_libdir}/pkgconfig/*"
68 68
69CONFFILES_auditd += "${sysconfdir}/audit/audit.rules" 69CONFFILES_auditd += "${sysconfdir}/audit/audit.rules"
70RDEPENDS_auditd += "bash" 70RDEPENDS_auditd += "bash"