[PATCH 0/2] Fix systemd configure error when enable audit

[PATCH 0/2] Fix systemd configure error when enable audit

[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(-)

-- 
2.11.0

[PATCH 1/2] enable-audit.bbclass: remove implement of packageconfig audit

[Kai Kang]

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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 classes/enable-audit.bbclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/enable-audit.bbclass b/classes/enable-audit.bbclass
index 5820a38..4538b0b 100644
--- a/classes/enable-audit.bbclass
+++ b/classes/enable-audit.bbclass
@@ -2,4 +2,3 @@
 inherit selinux
 
 PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}"
-PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
-- 
2.11.0

[PATCH 2/2] audit: fix pkgconfigdir

[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 <kai.kang@windriver.com>
---
 recipes-security/audit/audit_2.7.6.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-security/audit/audit_2.7.6.bb b/recipes-security/audit/audit_2.7.6.bb
index 5bfda7b..33b49c9 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}' \
 	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"
-- 
2.11.0

Re: [meta-selinux][PATCH 0/2] Fix systemd configure error when enable audit

[Kang Kai]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

On 2018年03月28日 14:55, Kai Kang wrote:
> 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.

-- 
Regards,
Neil | Kai Kang


[-- Attachment #2: Type: text/html, Size: 906 bytes --]

Re: [PATCH 2/2] audit: fix pkgconfigdir

[Anuj Mittal]

Hi,

On 03/28/2018 02:55 PM, Kai Kang wrote:
> 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 <kai.kang@windriver.com>
> ---
>  recipes-security/audit/audit_2.7.6.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-security/audit/audit_2.7.6.bb b/recipes-security/audit/audit_2.7.6.bb
> index 5bfda7b..33b49c9 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}' \
>  	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"

Aren't these already part of FILES_${PN}-dev in bitbake.conf in oe-core?

Thanks,
Anuj

Re: [PATCH 2/2] audit: fix pkgconfigdir

[Kang Kai]

On 2018年03月28日 15:10, Anuj Mittal wrote:
> Hi,
>
> On 03/28/2018 02:55 PM, Kai Kang wrote:
>> 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 <kai.kang@windriver.com>
>> ---
>>   recipes-security/audit/audit_2.7.6.bb | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/recipes-security/audit/audit_2.7.6.bb b/recipes-security/audit/audit_2.7.6.bb
>> index 5bfda7b..33b49c9 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}' \
>>   	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"
> 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
>
> Thanks,
> Anuj
>

-- 
Regards,
Neil | Kai Kang

[PATCH 1/2] enable-audit.bbclass: remove implement of packageconfig audit

[Kai Kang]

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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 classes/enable-audit.bbclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/enable-audit.bbclass b/classes/enable-audit.bbclass
index 5820a38..4538b0b 100644
--- a/classes/enable-audit.bbclass
+++ b/classes/enable-audit.bbclass
@@ -2,4 +2,3 @@
 inherit selinux
 
 PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}"
-PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
-- 
2.11.0