glib-2.0: fix broken python script header on machines using buildtools
PATCH 1/1 glib-2.0: fix broken python script header on machines using buildtools
With buildtools (which contains Python) installed on a build machine, glib-2.0's gtester-report script was ending up with the full path to the installed python binary in the shebang, which when rpm packaging was used led to this being added as a per-file dependency by rpmdeps for the libglib-2.0-utils package in which it ends up. This of course broke do_rootfs when the package was included in the rootfs and had been restored from sstate from another machine, as happened on the Yocto Project autobuilder.
We were already trying to sed this script apparently only for the shebang (since it appears that there are no other paths in the script) so let's just sed the shebang properly; it also seems sensible to do this for native as well instead of explicitly trying to exclude that case.
Fixes [YOCTO #5205].
--- meta/recipes-core/glib-2.0/glib.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/glib-2.0/glib.inc +1 -3
@@ -46,7 +46,5 @@ ARM_INSTRUCTION_SET = "arm" USE_NLS = "yes" do_install_append () { - if [ "${PN}" != "glib-2.0-native" ]; then - sed ${D}${bindir}/gtester-report -i -e 's,${STAGING_BINDIR_NATIVE},${bindir},g' - fi + sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|' }
Signature · 1 line
1.8.1.2
Quoted 3 lines · Paul Eggleton
it also seems sensible to do
this for native as well instead of explicitly trying to exclude that case.
But someone presumably introduced the explicit special case for native for a reason, I'd expect some blame analysis to be done here to determine whether those reasons were bogus or not.
Hi Colin,
Quoted 8 lines · On Friday 20 September 2013 12:04:15 Colin Walters wrote:
Quoted 3 lines · Paul Eggleton
it also seems sensible to do
this for native as well instead of explicitly trying to exclude that case.But someone presumably introduced the explicit special case for native for a reason, I'd expect some blame analysis to be done here to determine whether those reasons were bogus or not.
I already did that as a matter of course; there is no clue in the message for the commit that added it:
http://cgit.openembedded.org/openembedded-core/commit/?id=08fd9740b9359425ec6ee9810fab1152e9737b0c
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 8 lines · Paul Eggleton
Hi Colin,
Quoted 5 lines · On Friday 20 September 2013 12:04:15 Colin Walters wrote:
Quoted 3 lines · Paul Eggleton
it also seems sensible to do
this for native as well instead of explicitly trying to exclude that case.
Quoted 8 lines
Quoted 3 lines
But someone presumably introduced the explicit special case for native for a reason, I'd expect some blame analysis to be done here to determine whether those reasons were bogus or not.
I already did that as a matter of course; there is no clue in the message for the commit that added it:
http://cgit.openembedded.org/openembedded-core/commit/?id=08fd9740b9359425ec6ee9810fab1152e9737b0c
Ok, well then I'd expect something in your commit message similar to "There was no original rationale for why native was special cased, and I think it should be safe to remove."
It might be still cached in Richard's brain of course...let's see =)
Quoted 16 lines · Colin Walters
Quoted 15 lines · Paul Eggleton
Hi Colin,
Quoted 8 lines · On Friday 20 September 2013 12:04:15 Colin Walters wrote:
Quoted 3 lines · Paul Eggleton
it also seems sensible to do
this for native as well instead of explicitly trying to exclude that case.But someone presumably introduced the explicit special case for native for a reason, I'd expect some blame analysis to be done here to determine whether those reasons were bogus or not.
I already did that as a matter of course; there is no clue in the message for the commit that added it:
Quoted 7 lines
Quoted 1 line
http://cgit.openembedded.org/openembedded-core/commit/?id=08fd9740b9359425ec6ee9810fab1152e9737b0c
Ok, well then I'd expect something in your commit message similar to "There was no original rationale for why native was special cased, and I think it should be safe to remove."
It might be still cached in Richard's brain of course...let's see =)
That particular expression would have at best been a null operation for the -native case. Its around release time so I probably fixed the thing that was broken, no more, no less.
I'm fine with replacing it with something better.
Cheers,
Richard