diff mbox series

[meta-security,01/17] bastille: UNPACKDIR fixes

Message ID 20240725090131.75860-1-mikko.rapeli@linaro.org
State New
Headers show
Series [meta-security,01/17] bastille: UNPACKDIR fixes | expand

Commit Message

Mikko Rapeli July 25, 2024, 9:01 a.m. UTC
New poky version uses UNPACKDIR instead of WORKDIR

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 .../recipes-security/bastille/bastille_3.2.1.bb      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Martin Jansa July 25, 2024, 10:35 a.m. UTC | #1
new poky?

poky is just reference distribution and name of a repo. The change was
implemented in and is required by new oe-core.

On Thu, Jul 25, 2024 at 11:02 AM Mikko Rapeli via
lists.yoctoproject.org
<mikko.rapeli=linaro.org@lists.yoctoproject.org> wrote:
>
> New poky version uses UNPACKDIR instead of WORKDIR
>
> Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> ---
>  .../recipes-security/bastille/bastille_3.2.1.bb      | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> index f2ef335..7074f68 100644
> --- a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> +++ b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> @@ -83,11 +83,11 @@ do_install () {
>         install -m 0644 Bastille/AccountSecurity.pm    ${D}${libdir}/Bastille
>         install -m 0644 Bastille/Apache.pm    ${D}${libdir}/Bastille
>         install -m 0644 Bastille/API.pm    ${D}${libdir}/Bastille
> -       install -m 0644 ${WORKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
> -       install -m 0644 ${WORKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
> -       install -m 0644 ${WORKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
> -       install -m 0644 ${WORKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
> -       install -m 0644 ${WORKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
> +       install -m 0644 ${UNPACKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
> +       install -m 0644 ${UNPACKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
> +       install -m 0644 ${UNPACKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
> +       install -m 0644 ${UNPACKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
> +       install -m 0644 ${UNPACKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
>         install -m 0644 Bastille/BootSecurity.pm    ${D}${libdir}/Bastille
>         install -m 0644 Bastille/ConfigureMiscPAM.pm    ${D}${libdir}/Bastille
>         install -m 0644 Bastille/DisableUserTools.pm    ${D}${libdir}/Bastille
> @@ -138,7 +138,7 @@ do_install () {
>         install -m 0644 OSMap/OSX.bastille    ${D}${datadir}/Bastille/OSMap
>         install -m 0644 OSMap/OSX.system    ${D}${datadir}/Bastille/OSMap
>
> -       install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/Bastille/config
> +       install -m 0644 ${UNPACKDIR}/config ${D}${sysconfdir}/Bastille/config
>
>         for file in `cat Modules.txt` ; do
>                 install -m 0644 Questions/$file.txt ${D}${datadir}/Bastille/Questions
> --
> 2.34.1
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#458): https://lists.yoctoproject.org/g/yocto-patches/message/458
> Mute This Topic: https://lists.yoctoproject.org/mt/107539467/3617156
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13388836/3617156/66960823/xyzzy [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Mikko Rapeli July 25, 2024, 11:10 a.m. UTC | #2
Hi,

On Thu, Jul 25, 2024 at 12:35:58PM +0200, Martin Jansa wrote:
> new poky?
> 
> poky is just reference distribution and name of a repo. The change was
> implemented in and is required by new oe-core.

If I use poky together with other layers and update to poky
requires this change then I don't it's wrong to say that new poky
version needs this.

Should I change this commit message to something else in a v2?

Cheers,

-Mikko
akuster808 July 28, 2024, 5:01 p.m. UTC | #3
Mikko,

Is this series different then the one I posted a few days earlier?

- armin

On 7/25/24 5:01 AM, Mikko Rapeli via lists.yoctoproject.org wrote:
> New poky version uses UNPACKDIR instead of WORKDIR
>
> Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> ---
>   .../recipes-security/bastille/bastille_3.2.1.bb      | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> index f2ef335..7074f68 100644
> --- a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> +++ b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
> @@ -83,11 +83,11 @@ do_install () {
>   	install -m 0644 Bastille/AccountSecurity.pm    ${D}${libdir}/Bastille
>   	install -m 0644 Bastille/Apache.pm    ${D}${libdir}/Bastille
>   	install -m 0644 Bastille/API.pm    ${D}${libdir}/Bastille
> -	install -m 0644 ${WORKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
> -	install -m 0644 ${WORKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
> -	install -m 0644 ${WORKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
> -	install -m 0644 ${WORKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
> -	install -m 0644 ${WORKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
> +	install -m 0644 ${UNPACKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
> +	install -m 0644 ${UNPACKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
> +	install -m 0644 ${UNPACKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
> +	install -m 0644 ${UNPACKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
> +	install -m 0644 ${UNPACKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
>   	install -m 0644 Bastille/BootSecurity.pm    ${D}${libdir}/Bastille
>   	install -m 0644 Bastille/ConfigureMiscPAM.pm    ${D}${libdir}/Bastille
>   	install -m 0644 Bastille/DisableUserTools.pm    ${D}${libdir}/Bastille
> @@ -138,7 +138,7 @@ do_install () {
>   	install -m 0644 OSMap/OSX.bastille    ${D}${datadir}/Bastille/OSMap
>   	install -m 0644 OSMap/OSX.system    ${D}${datadir}/Bastille/OSMap
>   
> -	install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/Bastille/config
> +	install -m 0644 ${UNPACKDIR}/config ${D}${sysconfdir}/Bastille/config
>   
>   	for file in `cat Modules.txt` ; do
>   		install -m 0644 Questions/$file.txt ${D}${datadir}/Bastille/Questions
Mikko Rapeli July 29, 2024, 7:54 a.m. UTC | #4
Hi,

On Sun, Jul 28, 2024 at 01:01:10PM -0400, akuster808 wrote:
> Mikko,
> 
> Is this series different then the one I posted a few days earlier?

Yes, it's different. I missed your series, sorry about that. I guess you
mean https://lists.yoctoproject.org/g/yocto-patches/message/446

I submitted fixes for the issues I see in my environment and when
trying to compile some of the recipes in meta-security
after making changing. I don't mind which patch goes in.

Cheers,

-Mikko
Mikko Rapeli July 29, 2024, 10:26 a.m. UTC | #5
Hi,

On Mon, Jul 29, 2024 at 10:54:52AM +0300, Mikko Rapeli via lists.yoctoproject.org wrote:
> Hi,
> 
> On Sun, Jul 28, 2024 at 01:01:10PM -0400, akuster808 wrote:
> > Mikko,
> > 
> > Is this series different then the one I posted a few days earlier?
> 
> Yes, it's different. I missed your series, sorry about that. I guess you
> mean https://lists.yoctoproject.org/g/yocto-patches/message/446
> 
> I submitted fixes for the issues I see in my environment and when
> trying to compile some of the recipes in meta-security
> after making changing. I don't mind which patch goes in.

master-next branch is ok for me with the just submitted meta-parsec fix.

Thanks!

-Mikko
diff mbox series

Patch

diff --git a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
index f2ef335..7074f68 100644
--- a/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
+++ b/dynamic-layers/meta-perl/recipes-security/bastille/bastille_3.2.1.bb
@@ -83,11 +83,11 @@  do_install () {
 	install -m 0644 Bastille/AccountSecurity.pm    ${D}${libdir}/Bastille
 	install -m 0644 Bastille/Apache.pm    ${D}${libdir}/Bastille
 	install -m 0644 Bastille/API.pm    ${D}${libdir}/Bastille
-	install -m 0644 ${WORKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
-	install -m 0644 ${WORKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
-	install -m 0644 ${WORKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
-	install -m 0644 ${WORKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
-	install -m 0644 ${WORKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
+	install -m 0644 ${UNPACKDIR}/AccountPermission.pm    ${D}${libdir}/Bastille/API
+	install -m 0644 ${UNPACKDIR}/FileContent.pm    ${D}${libdir}/Bastille/API
+	install -m 0644 ${UNPACKDIR}/HPSpecific.pm    ${D}${libdir}/Bastille/API
+	install -m 0644 ${UNPACKDIR}/ServiceAdmin.pm    ${D}${libdir}/Bastille/API
+	install -m 0644 ${UNPACKDIR}/Miscellaneous.pm    ${D}${libdir}/Bastille/API
 	install -m 0644 Bastille/BootSecurity.pm    ${D}${libdir}/Bastille
 	install -m 0644 Bastille/ConfigureMiscPAM.pm    ${D}${libdir}/Bastille
 	install -m 0644 Bastille/DisableUserTools.pm    ${D}${libdir}/Bastille
@@ -138,7 +138,7 @@  do_install () {
 	install -m 0644 OSMap/OSX.bastille    ${D}${datadir}/Bastille/OSMap
 	install -m 0644 OSMap/OSX.system    ${D}${datadir}/Bastille/OSMap
 
-	install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/Bastille/config
+	install -m 0644 ${UNPACKDIR}/config ${D}${sysconfdir}/Bastille/config
 
 	for file in `cat Modules.txt` ; do
 		install -m 0644 Questions/$file.txt ${D}${datadir}/Bastille/Questions