[meta-security][PATCH] meta-integrity/../systemd: fix pollution issue

[meta-security][PATCH] meta-integrity/../systemd: fix pollution issue

[Armpit]

only include changes of systemd is enabled.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-integrity/recipes-core/systemd/systemd_%.bbappend | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-integrity/recipes-core/systemd/systemd_%.bbappend b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
index 3b45541..f33e563 100644
--- a/meta-integrity/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_ima := "${THISDIR}/files:"
 
-SRC_URI += " \
+SRC_URI_iam += " \
     file://machine-id-commit-sync.conf \
     file://random-seed-sync.conf \
 "
 
-do_install_append () {
+do_install_append_iam () {
     for i in machine-id-commit random-seed; do
         install -d ${D}/${systemd_system_unitdir}/systemd-$i.service.d
         install -m 0644 ${WORKDIR}/$i-sync.conf ${D}/${systemd_system_unitdir}/systemd-$i.service.d
-- 
2.17.1

Re: [yocto] [meta-security][PATCH] meta-integrity/../systemd: fix pollution issue

[Anders Montonen]

Hi,

These look like typos:

On 23 Dec 2019, at 19:18, Armpit <akuster808@gmail.com> wrote:
> 
> only include changes of systemd is enabled.

of -> if

> 
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
> meta-integrity/recipes-core/systemd/systemd_%.bbappend | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-integrity/recipes-core/systemd/systemd_%.bbappend b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
> index 3b45541..f33e563 100644
> --- a/meta-integrity/recipes-core/systemd/systemd_%.bbappend
> +++ b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
> @@ -1,11 +1,11 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> +FILESEXTRAPATHS_prepend_ima := "${THISDIR}/files:"
> 
> -SRC_URI += " \
> +SRC_URI_iam += “ \

iam -> ima

>     file://machine-id-commit-sync.conf \
>     file://random-seed-sync.conf \
> "
> 
> -do_install_append () {
> +do_install_append_iam () {

iam -> ima

>     for i in machine-id-commit random-seed; do
>         install -d ${D}/${systemd_system_unitdir}/systemd-$i.service.d
>         install -m 0644 ${WORKDIR}/$i-sync.conf ${D}/${systemd_system_unitdir}/systemd-$i.service.d
> -- 
> 2.17.1

Regards,
Anders

Re: [yocto] [meta-security][PATCH] meta-integrity/../systemd: fix pollution issue

[Armin Kuster]

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



On 12/23/19 10:18 AM, Anders Montonen wrote:
> Hi,
>
> These look like typos:

thanks.

will fix and send v2

- armin
>
> On 23 Dec 2019, at 19:18, Armpit <akuster808@gmail.com> wrote:
>> only include changes of systemd is enabled.
> of -> if
>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>> meta-integrity/recipes-core/systemd/systemd_%.bbappend | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta-integrity/recipes-core/systemd/systemd_%.bbappend b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
>> index 3b45541..f33e563 100644
>> --- a/meta-integrity/recipes-core/systemd/systemd_%.bbappend
>> +++ b/meta-integrity/recipes-core/systemd/systemd_%.bbappend
>> @@ -1,11 +1,11 @@
>> -FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>> +FILESEXTRAPATHS_prepend_ima := "${THISDIR}/files:"
>>
>> -SRC_URI += " \
>> +SRC_URI_iam += “ \
> iam -> ima
>
>>     file://machine-id-commit-sync.conf \
>>     file://random-seed-sync.conf \
>> "
>>
>> -do_install_append () {
>> +do_install_append_iam () {
> iam -> ima
>
>>     for i in machine-id-commit random-seed; do
>>         install -d ${D}/${systemd_system_unitdir}/systemd-$i.service.d
>>         install -m 0644 ${WORKDIR}/$i-sync.conf ${D}/${systemd_system_unitdir}/systemd-$i.service.d
>> -- 
>> 2.17.1
> Regards,
> Anders
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#47810): https://lists.yoctoproject.org/g/yocto/message/47810
> Mute This Topic: https://lists.yoctoproject.org/mt/69235591/1024635
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [akuster@mvista.com]
> -=-=-=-=-=-=-=-=-=-=-=-


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