Fix systemd configure error when enable audit
cover Fix systemd configure error when enable audit
Test with configure in local.confDISTRO_FEATURES_append = " selinux systemd"
Kai Kang (2):
enable-audit.bbclass: remove implement of packageconfig audit
audit: fix pkgconfigdir
classes/enable-audit.bbclass | 1 - recipes-security/audit/audit_2.7.6.bb | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/2 enable-audit.bbclass: remove implement of packageconfig audit
enable-audit.bbclass is only used by systemd. And systemd has adapted to use build tool meson and implement PACKAGECONFIG audit in recipe file of systemd in oe-core.
So remove implement of PACKAGECONFIG audit from enable-audit.bbclass.
--- classes/enable-audit.bbclass | 1 - 1 file changed, 1 deletion(-)
classes/enable-audit.bbclass +0 -1
@@ -2,4 +2,3 @@ inherit selinux PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}" -PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
Signature · 1 line
2.11.0
PATCH 2/2 audit: fix pkgconfigdir
In reply to Kai KangBecause '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.
--- recipes-security/audit/audit_2.7.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-security/audit/audit_2.7.6.bb +2 -1
@@ -45,6 +45,7 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ STDINC='${STAGING_INCDIR}' \ + pkgconfigdir=${libdir}/pkgconfig \ " SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"
@@ -64,7 +65,7 @@ FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ " FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la ${base_libdir}/pkgconfig/*" +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" CONFFILES_auditd += "${sysconfdir}/audit/audit.rules" RDEPENDS_auditd += "bash"
Signature · 1 line
2.11.0
Re: [PATCH 2/2] audit: fix pkgconfigdir
Hi,
Quoted 24 lines · Kai Kang
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.
Signed-off-by Kai Kang <[email protected]>--- recipes-security/audit/audit_2.7.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)recipes-security/audit/audit_2.7.6.bb +1
-0@@ -45,6 +45,7 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ STDINC='${STAGING_INCDIR}' \ + pkgconfigdir=${libdir}/pkgconfig \ " SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"
recipes-security/audit/audit_2.7.6.bb FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ · line 68
Quoted 5 lines
recipes-security/audit/audit_2.7.6.bb +1
-1@@ -64,7 +65,7 @@ FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ " FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la ${base_libdir}/pkgconfig/*" +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
Aren't these already part of FILES_${PN}-dev in bitbake.conf in oe-core?
Thanks,
Anuj
Re: [PATCH 2/2] audit: fix pkgconfigdir
Quoted 25 lines · Anuj Mittal
Hi,
Quoted 22 lines · Kai Kang
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.
Signed-off-by Kai Kang <[email protected]>--- recipes-security/audit/audit_2.7.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)recipes-security/audit/audit_2.7.6.bb +1
-0@@ -45,6 +45,7 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ STDINC='${STAGING_INCDIR}' \ + pkgconfigdir=${libdir}/pkgconfig \ "
Quoted 8 lines
recipes-security/audit/audit_2.7.6.bb FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ · line 68
Quoted 7 lines
recipes-security/audit/audit_2.7.6.bb +1
-1SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher"@@ -64,7 +65,7 @@ FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ " FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la ${base_libdir}/pkgconfig/*" +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"Aren't these already part of FILES_${PN}-dev in bitbake.conf in oe-core?
Thanks for point out. It is a legacy patch added in 2012 and I will remove it with V2.
--Kai
Quoted 4 lines
Thanks,
Anuj
Signature · 2 lines
Regards, Neil | Kai Kang
Quoted 11 lines · Kai Kang
Test with configure in local.conf
DISTRO_FEATURES_append= " selinux systemd"Kai Kang (2):
enable-audit.bbclass: remove implement of packageconfig audit
audit: fix pkgconfigdirclasses/enable-audit.bbclass | 1 - recipes-security/audit/audit_2.7.6.bb | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)
Forgot layer info meta-selinux in the title.
Signature · 2 lines
Regards, Neil | Kai Kang