[PATCH 1/2] libtool: Only package libltdl for the target

[PATCH 1/2] libtool: Only package libltdl for the target

[Saul Wold]

The libltdl package is not needed for -native or -cross, so make it's
only packaged for the target class.

Signed-off-by: Saul Wold <saul.wold@windriver.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index 6748d7468e..38982bf67f 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -43,7 +43,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
 
 DEPENDS = "libtool-native"
 
-PACKAGES =+ "libltdl"
+PACKAGES:prepend:class-target =+ "libltdl"
 FILES:${PN} += "${datadir}/aclocal"
 
 FILES:${PN}-dev:remove = "${datadir}/aclocal"
-- 
2.25.1

[PATCH 2/2] quilt: Only package guard for the target

[Saul Wold]

The guard binary and documentaiton should only be be packaged for the
target class.

Signed-off-by: Saul Wold <saul.wold@windriver.com>
---
 meta/recipes-devtools/quilt/quilt.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index f85de384d2..41d30e89aa 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -73,7 +73,7 @@ do_install_ptest() {
 	cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
 }
 
-PACKAGES += "guards guards-doc"
+PACKAGES:append:class-target += "guards guards-doc"
 
 FILES:${PN} = "${sysconfdir} ${datadir}/quilt \
                ${bindir}/quilt ${libdir}/quilt"
-- 
2.25.1

Re: [OE-core] [PATCH 1/2] libtool: Only package libltdl for the target

[Khem Raj]

On Fri, Aug 27, 2021 at 2:58 PM Saul Wold <Saul.Wold@windriver.com> wrote:
>
> The libltdl package is not needed for -native or -cross, so make it's
> only packaged for the target class.
>
> Signed-off-by: Saul Wold <saul.wold@windriver.com>
> ---
>  meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> index 6748d7468e..38982bf67f 100644
> --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> @@ -43,7 +43,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
>
>  DEPENDS = "libtool-native"
>
> -PACKAGES =+ "libltdl"
> +PACKAGES:prepend:class-target =+ "libltdl"

We dont need =+ with prepend and add appropriate space as well.

>  FILES:${PN} += "${datadir}/aclocal"
>
>  FILES:${PN}-dev:remove = "${datadir}/aclocal"
> --
> 2.25.1
>
>
> 
>

Re: [OE-core] [PATCH 2/2] quilt: Only package guard for the target

[Khem Raj]

On Fri, Aug 27, 2021 at 2:58 PM Saul Wold <Saul.Wold@windriver.com> wrote:
>
> The guard binary and documentaiton should only be be packaged for the
> target class.
>
> Signed-off-by: Saul Wold <saul.wold@windriver.com>
> ---
>  meta/recipes-devtools/quilt/quilt.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
> index f85de384d2..41d30e89aa 100644
> --- a/meta/recipes-devtools/quilt/quilt.inc
> +++ b/meta/recipes-devtools/quilt/quilt.inc
> @@ -73,7 +73,7 @@ do_install_ptest() {
>         cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
>  }
>
> -PACKAGES += "guards guards-doc"
> +PACKAGES:append:class-target += "guards guards-doc"
>

append and += together is not necessary

>  FILES:${PN} = "${sysconfdir} ${datadir}/quilt \
>                 ${bindir}/quilt ${libdir}/quilt"
> --
> 2.25.1
>
>
> 
>

Re: [OE-core] [PATCH 1/2] libtool: Only package libltdl for the target

[Richard Purdie]

On Fri, 2021-08-27 at 14:57 -0700, Saul Wold wrote:
> The libltdl package is not needed for -native or -cross, so make it's
> only packaged for the target class.
> 
> Signed-off-by: Saul Wold <saul.wold@windriver.com>
> ---
>  meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> index 6748d7468e..38982bf67f 100644
> --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
> @@ -43,7 +43,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
>  
>  DEPENDS = "libtool-native"
>  
> -PACKAGES =+ "libltdl"
> +PACKAGES:prepend:class-target =+ "libltdl"
>  FILES:${PN} += "${datadir}/aclocal"
>  
>  FILES:${PN}-dev:remove = "${datadir}/aclocal"

Since native and cross don't generate packages, why do we need to do this?

Rather that what the commit message says, this would seem to cause nativesdk to
be unpackaged?

Cheers,

Richard

Re: [OE-core] [PATCH 2/2] quilt: Only package guard for the target

[Richard Purdie]

On Fri, 2021-08-27 at 14:57 -0700, Saul Wold wrote:
> The guard binary and documentaiton should only be be packaged for the
> target class.
> 
> Signed-off-by: Saul Wold <saul.wold@windriver.com>
> ---
>  meta/recipes-devtools/quilt/quilt.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
> index f85de384d2..41d30e89aa 100644
> --- a/meta/recipes-devtools/quilt/quilt.inc
> +++ b/meta/recipes-devtools/quilt/quilt.inc
> @@ -73,7 +73,7 @@ do_install_ptest() {
>  	cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
>  }
>  
> -PACKAGES += "guards guards-doc"
> +PACKAGES:append:class-target += "guards guards-doc"
>  
>  FILES:${PN} = "${sysconfdir} ${datadir}/quilt \
>                 ${bindir}/quilt ${libdir}/quilt"

Again, why?

This should be fine/ignored for native/cross and applicable to nativesdk?

Cheers,

Richard

Re: [OE-core] [PATCH 2/2] quilt: Only package guard for the target

[Saul Wold]

On 8/30/21 1:19 PM, Richard Purdie wrote:
> On Fri, 2021-08-27 at 14:57 -0700, Saul Wold wrote:
>> The guard binary and documentaiton should only be be packaged for the
>> target class.
>>
>> Signed-off-by: Saul Wold <saul.wold@windriver.com>
>> ---
>>   meta/recipes-devtools/quilt/quilt.inc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
>> index f85de384d2..41d30e89aa 100644
>> --- a/meta/recipes-devtools/quilt/quilt.inc
>> +++ b/meta/recipes-devtools/quilt/quilt.inc
>> @@ -73,7 +73,7 @@ do_install_ptest() {
>>   	cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
>>   }
>>   
>> -PACKAGES += "guards guards-doc"
>> +PACKAGES:append:class-target += "guards guards-doc"
>>   
>>   FILES:${PN} = "${sysconfdir} ${datadir}/quilt \
>>                  ${bindir}/quilt ${libdir}/quilt"
> 
> Again, why?
> 
I was doing some testing with the create_spdx code and found a condition 
when I had built quilt (in this case) and then cleaned the quilt-native, 
when I rebuilt quilt-native I got the following error:

ERROR: quilt-native-0.66-r0 do_create_spdx: Recipe quilt-native is 
trying to create package guards which was already written by recipe 
quilt. This will cause corruption, please resolve this and only provide 
the package from one recipe or the other or only build one of the recipes.

> This should be fine/ignored for native/cross and applicable to nativesdk?
> 
Maybe the issue is actually in the create_spdx()  code,

Sau!

> Cheers,
> 
> Richard
> 

-- 
Sau!