From: Saul Wold <sgw@linux.intel.com>
To: jackie.huang@windriver.com, david.borman@windriver.com
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/1] glib: fix the python script munging for cross compile
Date: Mon, 08 Jul 2013 08:05:48 -0700 [thread overview]
Message-ID: <51DAD54C.3000500@linux.intel.com> (raw)
In-Reply-To: <e2fa93a52c32522d4831e3d29f87bae4c6625f27.1373253998.git.jackie.huang@windriver.com>
On 07/07/2013 08:30 PM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> 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 <david.borman@windriver.com>
> Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> .../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
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
> new file mode 100644
> index 0000000..d2f8d44
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
> @@ -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 <david.borman@windriver.com>
> +Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
> +
> +--- 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!
> + || 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 ; \
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
> index d9d8932..ffe34ac 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
> @@ -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 \
> "
>
>
prev parent reply other threads:[~2013-07-08 15:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-08 3:30 [PATCH 0/1] glib: fix the python script munging for cross compile jackie.huang
2013-07-08 3:30 ` [PATCH 1/1] " jackie.huang
2013-07-08 15:05 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51DAD54C.3000500@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=david.borman@windriver.com \
--cc=jackie.huang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox