glib: fix the python script munging for cross compile
cover glib: fix the python script munging for cross compile
From: Jackie Huang <[email protected]>
The following changes since commit 226f2074b7530a82f4cf0e614eecd58f1fd2c22b:
glib-2.0: inherit pythonnative (2013-07-08 11:22:38 +0800)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_glib_0708_4
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_glib_0708_4
Jackie Huang (1):
glib: fix the python script munging for cross compile
.../glib-2.0/glib-2.0/glib2-python-ref.patch | 33 ++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
Signature · 1 line
1.7.4.1
PATCH 1/1 glib: fix the python script munging for cross compile
From: Jackie Huang <[email protected]>
Fix the munging of python scripts so that they'll work on the target, we don't want ${PYTHON}, because that is the path on the host, not the target.
Signed-off-by David Borman <[email protected]>
Signed-off-by Jesse Zhang <[email protected]>
Signed-off-by Jackie Huang <[email protected]>
--- .../glib-2.0/glib-2.0/glib2-python-ref.patch | 33 ++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch new file +33 -0
@@ -0,0 +1,33 @@ +glib: fix the python script munging for cross compile + +Fix the munging of python scripts so that they'll work +on the target, we don't want ${PYTHON}, because that is +the path on the host, not the target. + +Upstream-status: Inappropriate [ embedded specific ] + +Signed-off-by: David Borman <[email protected]> +Signed-off-by: Jesse Zhang <[email protected]> + +--- glib-2.26.0/glib/Makefile.am ++++ glib-2.26.0/glib/Makefile.am +@@ -413,7 +413,7 @@ + mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \ + && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \ + -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \ +- -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \ ++ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \ + || exit $$? ; \ + chmod a+x $(DESTDIR)$(bindir)/$$sf ; \ + rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \ +--- glib-2.26.0/glib/Makefile.in ++++ glib-2.26.0/glib/Makefile.in +@@ -1759,7 +1759,7 @@ + @OS_UNIX_TRUE@ mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \ + @OS_UNIX_TRUE@ && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \ + @OS_UNIX_TRUE@ -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \ +-@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \ ++@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \ + @OS_UNIX_TRUE@ || exit $$? ; \ + @OS_UNIX_TRUE@ chmod a+x $(DESTDIR)$(bindir)/$$sf ; \ + @OS_UNIX_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb +1 -0
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://fix-conflicting-rand.patch \ file://Makefile-ptest.patch \ file://add-march-i486-into-CFLAGS-automatically.patch \ + file://glib2-python-ref.patch \ file://run-ptest \ "
Signature · 1 line
1.7.4.1
Quoted 30 lines · On 07/07/2013 08:30 PM, [email protected] wrote:
From: Jackie Huang <[email protected]>
Fix the munging of python scripts so that they'll work on the target, we don't want ${PYTHON}, because that is the path on the host, not the target.
Signed-off-by David Borman <[email protected]>Signed-off-by Jesse Zhang <[email protected]>Signed-off-by Jackie Huang <[email protected]>--- .../glib-2.0/glib-2.0/glib2-python-ref.patch | 33 ++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb | 1 + 2 files changed, 34 insertions(+), 0 deletions(-)create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patchmeta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch new file +9
-0@@ -0,0 +1,33 @@ +glib: fix the python script munging for cross compile + +Fix the munging of python scripts so that they'll work +on the target, we don't want ${PYTHON}, because that is +the path on the host, not the target. + +Upstream-status: Inappropriate [ embedded specific ] + +Signed-off-by: David Borman <[email protected]>
meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch line 19
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch new file +10
-0+Signed-off-by: Jesse Zhang <[email protected]> + +--- glib-2.26.0/glib/Makefile.am ++++ glib-2.26.0/glib/Makefile.am +@@ -413,7 +413,7 @@ + mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \ + && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \ + -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \ +- -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \ ++ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \
I am not sure hardcoding in /usr/bin/pyhton is correct here either, we typically use the "/usr/bin/env python", so why not clean up the #! to that?
Sau!
Quoted 27 lines
meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch new file +14
-0+ || exit $$? ; \ + chmod a+x $(DESTDIR)$(bindir)/$$sf ; \ + rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \ +--- glib-2.26.0/glib/Makefile.in ++++ glib-2.26.0/glib/Makefile.in +@@ -1759,7 +1759,7 @@ + @OS_UNIX_TRUE@ mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \ + @OS_UNIX_TRUE@ && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \ + @OS_UNIX_TRUE@ -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \ +-@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \ ++@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \ + @OS_UNIX_TRUE@ || exit $$? ; \ + @OS_UNIX_TRUE@ chmod a+x $(DESTDIR)$(bindir)/$$sf ; \ + @OS_UNIX_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb +1
-0@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://fix-conflicting-rand.patch \ file://Makefile-ptest.patch \ file://add-march-i486-into-CFLAGS-automatically.patch \ + file://glib2-python-ref.patch \ file://run-ptest \ "