Skip to contentSkip to conversation

libtool: Only package libltdl for the target

PATCH In review Saul Wold 3 participants 7 messages Aug 27, 2021 – Aug 31, 2021

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

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

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

---
 meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/libtool/libtool-2.4.6.inc +1 -1
index 6748d7468e..38982bf67f 100644
@@ -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"
Signature · 1 line
2.25.1
author
#1 lore raw

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

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

---
 meta/recipes-devtools/quilt/quilt.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/quilt/quilt.inc +1 -1
index f85de384d2..41d30e89aa 100644
@@ -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"
Signature · 1 line
2.25.1
#2 lore raw

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

Quoted 14 lines · Saul Wold

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

---
 meta/recipes-devtools/quilt/quilt.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/quilt/quilt.inc +0 -0
index f85de384d2..41d30e89aa 100644

meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 77

Quoted 6 lines
meta/recipes-devtools/quilt/quilt.inc +1 -1
@@ -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

Quoted 8 lines
meta/recipes-devtools/quilt/quilt.inc +0 -1
 FILES:${PN} = "${sysconfdir} ${datadir}/quilt \
                ${bindir}/quilt ${libdir}/quilt"
--

2.25.1

#3 lore raw

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

In reply to Saul Wold
Quoted 13 lines · Saul Wold

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

---
 meta/recipes-devtools/quilt/quilt.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/quilt/quilt.inc +0 -0
index f85de384d2..41d30e89aa 100644

meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 79

Quoted 8 lines
meta/recipes-devtools/quilt/quilt.inc +1 -1
@@ -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

author
#4 lore raw

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

Quoted 17 lines · Richard Purdie
Quoted 16 lines · Saul Wold

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

---
  meta/recipes-devtools/quilt/quilt.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/quilt/quilt.inc +0 -0
index f85de384d2..41d30e89aa 100644
@@ -73,7 +73,7 @@ do_install_ptest() {
  	cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
  }
 
Quoted 8 lines

meta/recipes-devtools/quilt/quilt.inc do_install_ptest() { · line 79

Quoted 5 lines
meta/recipes-devtools/quilt/quilt.inc +1 -1
-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.

Quoted 2 lines

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

Maybe the issue is actually in the create_spdx() code,

Sau!

Quoted 4 lines

Cheers,

Richard

Signature · 1 line
Sau!
#5 lore raw
In reply to Saul Wold
Quoted 14 lines · Saul Wold

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

---
 meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/libtool/libtool-2.4.6.inc +0 -0
index 6748d7468e..38982bf67f 100644

meta/recipes-devtools/libtool/libtool-2.4.6.inc CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" · line 46

Quoted 5 lines
meta/recipes-devtools/libtool/libtool-2.4.6.inc +1 -1
@@ -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.

Quoted 9 lines
meta/recipes-devtools/libtool/libtool-2.4.6.inc +0 -1
 FILES:${PN} += "${datadir}/aclocal"
 
 FILES:${PN}-dev:remove = "${datadir}/aclocal"
--

2.25.1

#6 lore raw
In reply to Saul Wold
Quoted 13 lines · Saul Wold

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

---
 meta/recipes-devtools/libtool/libtool-2.4.6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/libtool/libtool-2.4.6.inc +0 -0
index 6748d7468e..38982bf67f 100644

meta/recipes-devtools/libtool/libtool-2.4.6.inc CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" · line 49

Quoted 8 lines
meta/recipes-devtools/libtool/libtool-2.4.6.inc +1 -1
@@ -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