Skip to contentSkip to conversation

binconfig.bbclass: search configs in D instead of S

PATCH In review Stanislav Brabec 4 participants 5 messages Apr 16, 2011 – Apr 20, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 binconfig.bbclass: search configs in D instead of S

Searching for binconfig in S makes more problems than it brings benefits. Searching in the installed root seems to be more logical.

Fixes following subtle breakages:
- binconfig are populated with a different name that upstream intended
- populated binconfig files that were not intended to be populated

It fixes at least ncurses, which populates ncurses-config instead of ncurses5-config and ncursesw5-config, causing secondary breakages.

classes/binconfig.bbclass +1 -1
index b3b2236..3d2bf0f 100644
@@ -49,7 +49,7 @@ binconfig_package_preprocess () {
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
 
 binconfig_sysroot_preprocess () {
-	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+	for config in `find ${D} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`
 		install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
 		cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname
Signature · 3 lines
________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus
Acked-by on v1 1/5
#1 lore raw
Quoted 11 lines · Stanislav Brabec

Searching for binconfig in S makes more problems than it brings benefits. Searching in the installed root seems to be more logical.

Fixes following subtle breakages:
- binconfig are populated with a different name that upstream intended
- populated binconfig files that were not intended to be populated

It fixes at least ncurses, which populates ncurses-config instead of ncurses5-config and ncursesw5-config, causing secondary breakages.

Quoted 14 lines
classes/binconfig.bbclass +1 -1
index b3b2236..3d2bf0f 100644
@@ -49,7 +49,7 @@ binconfig_package_preprocess () {
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
 
 binconfig_sysroot_preprocess () {
-	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+	for config in `find ${D} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`
 		install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
 		cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname
Acked-by
#2 lore raw

Am Dienstag, den 19.04.2011, 13:10 +0200 schrieb Andreas Oberritter:

Quoted 10 lines · Stanislav Brabec
Quoted 9 lines

Searching for binconfig in S makes more problems than it brings benefits. Searching in the installed root seems to be more logical.

Fixes following subtle breakages:
- binconfig are populated with a different name that upstream intended
- populated binconfig files that were not intended to be populated

It fixes at least ncurses, which populates ncurses-config instead of ncurses5-config and ncursesw5-config, causing secondary breakages.

Is alsa-utils – as written in your introduction 0/5 – the only secondary breakage you found? Is that a run time problem? I can build alsa-utils-1.0.24.2-r1 just fine using minimal.

Quoted 3 lines
Quoted 1 line

I am adding Enrico to the CC since he did a lot of Ncurses work and maybe can also share his opinion.

Quoted 7 lines
Quoted 7 lines
classes/binconfig.bbclass +0 -0
index b3b2236..3d2bf0f 100644
@@ -49,7 +49,7 @@ binconfig_package_preprocess () {
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
 
Quoted 7 lines

classes/binconfig.bbclass binconfig_package_preprocess () { · line 55

Quoted 7 lines
classes/binconfig.bbclass +1 -1
 binconfig_sysroot_preprocess () {
-	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+	for config in `find ${D} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`
 		install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
 		cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname

Thanks,

Paul

Acked-by
#3 lore raw
Quoted 5 lines · Paul Menzel
Quoted 2 lines
Quoted 2 lines

Searching for binconfig in S makes more problems than it brings benefits. Searching in the installed root seems to be more logical.

...
I am adding Enrico to the CC since he did a lot of Ncurses work and maybe can also share his opinion.

yes; I submitted a similar patch [1] because it is required by ncurses.

Enrico

Footnotes:
[1] http://patchwork.openembedded.org/patch/2248

#4 lore raw
In reply to Paul Menzel
Quoted 8 lines · Paul Menzel
Quoted 4 lines · Stanislav Brabec
Quoted 3 lines

It fixes at least ncurses, which populates ncurses-config instead of ncurses5-config and ncursesw5-config, causing secondary breakages.

Is alsa-utils – as written in your introduction 0/5 – the only secondary breakage you found? Is that a run time problem? I can build alsa-utils-1.0.24.2-r1 just fine using minimal.

Probably more breakages existed - basically anything that uses ncurses may be broken. Due to ncurses breakage, alsa-utils probably used ncurses?*-config from your host system, and as a consequence also host system includes. It may work, it may break in runtime, it may cause miscompilation. On hosts without ncurses development files build failed.

Signature · 3 lines
________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus