Skip to contentSkip to conversation

Fix systemd configure error when enable audit

PATCH Superseded Kai Kang 2 participants 6 messages Mar 28, 2018 – Apr 2, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

cover Fix systemd configure error when enable audit

Test with configure in local.conf
DISTRO_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
author
#1 lore raw

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
index 5820a38..4538b0b 100644
@@ -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
author
#2 lore raw

PATCH 2/2 audit: fix pkgconfigdir

In reply to 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.

---
 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
index 5bfda7b..33b49c9 100644
@@ -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
#3 lore raw

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.

---
 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
index 5bfda7b..33b49c9 100644
@@ -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

author
#4 lore raw

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.

---
  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
index 5bfda7b..33b49c9 100644
@@ -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 -1
  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"

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
author
#5 lore raw
In reply to 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 pkgconfigdir

  classes/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