relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist
PATCH 1/1 relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist
Rewrite relocatable_native_pcfiles() so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.
--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
meta/classes/relocatable.bbclass +11 -9
@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc - fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc - fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if any files were found + if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir ${base_prefix}) + sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files + fi + done }
Signature · 1 line
2.21.1
*ping*
//Peter
Quoted 47 lines
-----Original Message-----
From: [email protected] <openembedded-core- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir existRewrite
relocatable_native_pcfiles()so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)meta/classes/relocatable.bbclass +11
-10@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc - fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc - fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if any files were found + if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir ${base_prefix}) + sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files + fi + done } --
Quoted 1 line
2.21.1
//Peter
A message that is not in the archive (sent off-list or not yet received): [email protected]
*ping again*
//Peter
Quoted 71 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-core-
Quoted 10 lines
[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir existRewrite
relocatable_native_pcfiles()so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.Review
Quoted 6 lines
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)(quoted diff) +0
-0b/meta/classes/relocatable.bbclass
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 11
Quoted 10 lines
index
582812c1cf..af04be5cca100644meta/classes/relocatable.bbclass +0
-3@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('libdir')+ "/pkgconfig")}meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 12
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 3 lines
meta/classes/relocatable.bbclass +0
-3- fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('datadir')+ "/pkgconfig")}meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 7 lines
meta/classes/relocatable.bbclass +6
-1- fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if anyfiles were found
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 2 lines
meta/classes/relocatable.bbclass +2
-0+ if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir${base_prefix})
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 17
Quoted 1 line
meta/classes/relocatable.bbclass +1
-0+ sed -i -e"s:${base_prefix}:\${pcfiledir}/$rel:g" $files
Quoted 5 lines
meta/classes/relocatable.bbclass +2
-1+ fi + done } --2.21.1
//Peter
A message that is not in the archive (sent off-list or not yet received): [email protected]
*ping* *ping* *ping*
I am not sure why this is being ignored. It is two months since I first sent it and the third time I ping it. I have not received any objections, yet it has never made it even to master-next as far as I know.
This should not be taken as a complaint. I know there has been problems with the autobuilder and that patch integration has been slowed, and during this time all other patches I have sent have been applied on the first try. So it just seems to be this one that has been left out, and I would like to know if there is a reason or if it just has fallen between the cracks.
//Peter
PS. The patch of course applies to Dunfell now too in addition to master and Zeus since it has been released in the meantime.
Quoted 68 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 25 april 2020 11:17
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping again*
//Peter
Quoted 58 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping*
//Peter
Quoted 45 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir existRewrite
relocatable_native_pcfiles()so that it can handle that any of the checked pkgconfig directories are empty without causing an exception.Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)meta/classes/relocatable.bbclass +11
-10@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc - fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} - sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc - fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if any files were found + if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir ${base_prefix}) + sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files + fi + done } --Quoted 1 line
2.21.1
//Peter
A message that is not in the archive (sent off-list or not yet received): [email protected]
*ping* *ping* *ping* *ping*
Ok, it was only two weeks since I pinged this the last time, but since I'm going on vacation in a week I thought I'd give it a shot before then. I am still waiting for any kind of reaction to this patch...
//Peter
Quoted 111 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 28 maj 2020 03:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping*
I am not sure why this is being ignored. It is two months since I first sent it and the third time I ping it. I have not received any objections, yet it has never made it even to master-next as far as I know.
This should not be taken as a complaint. I know there has been problems with the autobuilder and that patch integration has been slowed, and during this time all other patches I have sent have been applied on the first try. So it just seems to be this one that has been left out, and I would like to know if there is a reason or if it just has fallen between the cracks.
//Peter
PS. The patch of course applies to Dunfell now too in addition to master and Zeus since it has been released in the meantime.
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Sent: den 25 april 2020 11:17
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoidan exception if an empty pkgconfig dir exist
Quoted 7 lines
*ping again*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid an exception if an empty pkgconfig dir exist
Quoted 7 lines
Quoted 7 lines
*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected]<[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoidan exception if an empty pkgconfig dir exist
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Rewrite
relocatable_native_pcfiles()so that it can handle that anyof
Quoted 9 lines
Quoted 9 lines
Review
Quoted 9 lines
the checked pkgconfig directories are empty without causing an exception.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)(quoted diff) +0
-0b/meta/classes/relocatable.bbclass
Quoted 10 lines
Quoted 10 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 11
Quoted 10 lines
index
582812c1cf..af04be5cca100644meta/classes/relocatable.bbclass +0
-3@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('libdir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 12
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
Quoted 3 lines
Quoted 3 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 3 lines
meta/classes/relocatable.bbclass +0
-3- fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('datadir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
Quoted 7 lines
Quoted 7 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 7 lines
meta/classes/relocatable.bbclass +6
-1- fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if anyfiles were found
Quoted 2 lines
Quoted 2 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 2 lines
meta/classes/relocatable.bbclass +2
-0+ if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir${base_prefix})
Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 17
Quoted 1 line
meta/classes/relocatable.bbclass +1
-0+ sed -i -e"s:${base_prefix}:\${pcfiledir}/$rel:g" $files
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
meta/classes/relocatable.bbclass +2
-1+ fi + done } --2.21.1
//Peter
A message that is not in the archive (sent off-list or not yet received): [email protected]
This has been integrated to master now (commit f9c5df6d). Please cherry-pick it to Dunfell and Zeus.
//Peter
Quoted 131 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 12 juni 2020 18:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping* *ping*
Ok, it was only two weeks since I pinged this the last time, but since I'm going on vacation in a week I thought I'd give it a shot before then. I am still waiting for any kind of reaction to this patch...
//Peter
Quoted 22 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 28 maj 2020 03:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping*
I am not sure why this is being ignored. It is two months since I first sent it and the third time I ping it. I have not received any objections, yet it has never made it even to master-next as far as I know.
This should not be taken as a complaint. I know there has been problems with the autobuilder and that patch integration has been slowed, and during this time all other patches I have sent have been applied on the first try. So it just seems to be this one that has been left out, and I would like to know if there is a reason or if it just has fallen between the cracks.
Quoted 11 lines
//Peter
PS. The patch of course applies to Dunfell now too in addition to master and Zeus since it has been released in the meantime.
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Sent: den 25 april 2020 11:17
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 14 lines
an exception if an empty pkgconfig dir exist
Quoted 7 lines
*ping again*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid an exception if an empty pkgconfig dir exist
Quoted 1 line
Quoted 1 line
Quoted 11 lines
Quoted 6 lines
Quoted 6 lines
*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected]<[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 3 lines
an exception if an empty pkgconfig dir exist
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Rewrite
relocatable_native_pcfiles()so that it can handle thatany
Quoted 50 lines
of
Quoted 9 lines
Quoted 9 lines
Review
Quoted 9 lines
the checked pkgconfig directories are empty without causing an exception.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)(quoted diff) +0
-0b/meta/classes/relocatable.bbclass
Quoted 10 lines
Quoted 10 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 11
Quoted 10 lines
index
582812c1cf..af04be5cca100644meta/classes/relocatable.bbclass +0
-3@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('libdir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 12
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
Quoted 3 lines
Quoted 3 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 3 lines
meta/classes/relocatable.bbclass +0
-3- fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('datadir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
Quoted 7 lines
Quoted 7 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 7 lines
meta/classes/relocatable.bbclass +6
-1- fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if anyfiles were found
Quoted 2 lines
Quoted 2 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 2 lines
meta/classes/relocatable.bbclass +2
-0+ if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir${base_prefix})
Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 17
Quoted 1 line
meta/classes/relocatable.bbclass +1
-0+ sed -i -e"s:${base_prefix}:\${pcfiledir}/$rel:g" $files
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
meta/classes/relocatable.bbclass +2
-1+ fi + done } --2.21.1
//Peter
Quoted 137 lines · Peter Kjellerstedt
This has been integrated to master now (commit
f9c5df6d). Please cherry-pick it to Dunfell and Zeus.//Peter
Quoted 131 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 12 juni 2020 18:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping* *ping*
Ok, it was only two weeks since I pinged this the last time, but since I'm going on vacation in a week I thought I'd give it a shot before then. I am still waiting for any kind of reaction to this patch...
//Peter
Quoted 22 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 28 maj 2020 03:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping*
I am not sure why this is being ignored. It is two months since I first sent it and the third time I ping it. I have not received any objections, yet it has never made it even to master-next as far as I know.
This should not be taken as a complaint. I know there has been problems with the autobuilder and that patch integration has been slowed, and during this time all other patches I have sent have been applied on the first try. So it just seems to be this one that has been left out, and I would like to know if there is a reason or if it just has fallen between the cracks.
Quoted 11 lines
//Peter
PS. The patch of course applies to Dunfell now too in addition to master and Zeus since it has been released in the meantime.
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Sent: den 25 april 2020 11:17
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 14 lines
an exception if an empty pkgconfig dir exist
Quoted 7 lines
*ping again*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid an exception if an empty pkgconfig dir exist
Quoted 1 line
Quoted 1 line
Quoted 11 lines
Quoted 6 lines
Quoted 6 lines
*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected]<[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 3 lines
an exception if an empty pkgconfig dir exist
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Rewrite
relocatable_native_pcfiles()so that it can handle thatany
Quoted 50 lines
of
Quoted 9 lines
Quoted 9 lines
Review
Quoted 9 lines
the checked pkgconfig directories are empty without causing an exception.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)(quoted diff) +0
-0b/meta/classes/relocatable.bbclass
Quoted 10 lines
Quoted 10 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 11
Quoted 10 lines
index
582812c1cf..af04be5cca100644meta/classes/relocatable.bbclass +0
-3@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('libdir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 12
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
Quoted 3 lines
Quoted 3 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 3 lines
meta/classes/relocatable.bbclass +0
-3- fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('datadir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
Quoted 7 lines
Quoted 7 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() {
Quoted 7 lines
meta/classes/relocatable.bbclass +6
-1- fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if anyfiles were found
Quoted 2 lines
Quoted 2 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 2 lines
meta/classes/relocatable.bbclass +2
-0+ if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir${base_prefix})
Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 17
Quoted 1 line
meta/classes/relocatable.bbclass +1
-0+ sed -i -e"s:${base_prefix}:\${pcfiledir}/$rel:g" $files
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
meta/classes/relocatable.bbclass +2
-1+ fi + done } --2.21.1
//Peter
Bisected it: Since this one is in dunfell I am unable to build on autobuilder. I see
| virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-extended/libnsl/libnsl2_git.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb:do_compile
Makefile says (don't have *.pc at the moment):
LIBUSB_CFLAGS = -I/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/include/libusb-1.0 LIBUSB_LIBS = -L/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/lib -lusb-1.0
so libusb.h is not found (yes the path is wrong). Why do we replace by ${pcfiledir} exactly?
Andreas
Quoted 149 lines · Andreas Müller
Quoted 137 lines · Peter Kjellerstedt
This has been integrated to master now (commit
f9c5df6d). Please cherry-pick it to Dunfell and Zeus.//Peter
Quoted 131 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 12 juni 2020 18:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping* *ping*
Ok, it was only two weeks since I pinged this the last time, but since I'm going on vacation in a week I thought I'd give it a shot before then. I am still waiting for any kind of reaction to this patch...
//Peter
Quoted 22 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 28 maj 2020 03:26
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist*ping* *ping* *ping*
I am not sure why this is being ignored. It is two months since I first sent it and the third time I ping it. I have not received any objections, yet it has never made it even to master-next as far as I know.
This should not be taken as a complaint. I know there has been problems with the autobuilder and that patch integration has been slowed, and during this time all other patches I have sent have been applied on the first try. So it just seems to be this one that has been left out, and I would like to know if there is a reason or if it just has fallen between the cracks.
Quoted 11 lines
//Peter
PS. The patch of course applies to Dunfell now too in addition to master and Zeus since it has been released in the meantime.
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Sent: den 25 april 2020 11:17
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 14 lines
an exception if an empty pkgconfig dir exist
Quoted 7 lines
*ping again*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Sent: den 3 april 2020 18:24
To: [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid an exception if an empty pkgconfig dir exist
Quoted 1 line
Quoted 1 line
Quoted 11 lines
Quoted 6 lines
Quoted 6 lines
*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected]<[email protected]> On Behalf Of Peter Kjellerstedt
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Sent: den 20 mars 2020 19:04
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] relocatable.bbclass:Avoid
Quoted 3 lines
an exception if an empty pkgconfig dir exist
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Rewrite
relocatable_native_pcfiles()so that it can handle thatany
Quoted 50 lines
of
Quoted 9 lines
Quoted 9 lines
Review
Quoted 9 lines
the checked pkgconfig directories are empty without causing an exception.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes/relocatable.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)(quoted diff) +0
-0b/meta/classes/relocatable.bbclass
Quoted 10 lines
Quoted 10 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 11
Quoted 10 lines
index
582812c1cf..af04be5cca100644meta/classes/relocatable.bbclass +0
-3@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() { rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) } -relocatable_native_pcfiles () { - if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('libdir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 12
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
Quoted 3 lines
Quoted 3 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 15
Quoted 3 lines
meta/classes/relocatable.bbclass +0
-3- fi - if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then - rel=${@os.path.relpath(d.getVar('base_prefix'),
d.getVar('datadir')+ "/pkgconfig")}Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 1 line
meta/classes/relocatable.bbclass +0
-1- sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g"${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
Quoted 7 lines
Quoted 7 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 14
Quoted 7 lines
meta/classes/relocatable.bbclass +6
-1- fi +relocatable_native_pcfiles() { + for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do + files_template=${SYSROOT_DESTDIR}$dir/*.pc + # Expand to any files matching $files_template + files=$(echo $files_template) + # $files_template and $files will differ if anyfiles were found
Quoted 2 lines
Quoted 2 lines
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 16
Quoted 2 lines
meta/classes/relocatable.bbclass +2
-0+ if [ "$files_template" != "$files" ]; then + rel=$(realpath -m --relative-to=$dir${base_prefix})
Quoted 1 line
Quoted 1 line
meta/classes/relocatable.bbclass python relocatable_binaries_preprocess() { · line 17
Quoted 1 line
meta/classes/relocatable.bbclass +1
-0+ sed -i -e"s:${base_prefix}:\${pcfiledir}/$rel:g" $files
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
meta/classes/relocatable.bbclass +2
-1+ fi + done } --2.21.1
//Peter
Bisected it: Since this one is in dunfell I am unable to build on autobuilder. I see
| virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-extended/libnsl/libnsl2_git.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/openembedded-core/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb:do_compile | virtual:native:/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/sources/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb:do_compile
Makefilesays (don't have *.pc at the moment):
Quoted 8 lines
LIBUSB_CFLAGS= -I/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/include/libusb-1.0LIBUSB_LIBS= -L/home/jenkins/workspace/Weekly-4-MT310s2-COM5003/build/tmp-glibc/work/x86_64-linux/libmtp-native/1.1.17-r0/recipe-sysroot-native/usr/lib/pkgconfig//usr/lib -lusb-1.0so
libusb.his not found (yes the path is wrong). Why do we replace by ${pcfiledir} exactly?
Cross checked this with my local - more modern OS machine: That path looks OK - seems I am in trouble with realpath...
Andreas