From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by mail.openembedded.org (Postfix) with ESMTP id AF58C77D60 for ; Fri, 7 Apr 2017 02:48:06 +0000 (UTC) Received: by mail-pg0-f43.google.com with SMTP id 21so52742898pgg.1 for ; Thu, 06 Apr 2017 19:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=7zTRWdAuExYiMp7FDRdO5OXEBdUEsr056N62fK9IQQU=; b=h79ZQ9N979nC7LJSvbId8lv4LszncJte2CzZblVto0EE98FtlGQ5fDO2TkYDPhRGYB PAk7Q0aLT14B6T8uNleYu7/+sMFnDR8fjxr6arEo2Bw162OkqLW0JbaBEqhWQAu58hA3 BuT9GzXNxDErfC81h6nU1QGJY7vdy8kkmS/jFxRYlfjYOux2hNzQMuIOLmaH9aycF7ZY w5luxkFvEy3Iquu1EOGwEkemSMDGrQZSBysGuXiKfZUsGqGAmQgXXO+RkNcXQ4A2J9Sk 5QwA5EJtH3ei5L42OYA0EgEltB8Uh3yJlRzachN/z6OcT7mGqXmDFUnzuwINXj+5SLR/ xKrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=7zTRWdAuExYiMp7FDRdO5OXEBdUEsr056N62fK9IQQU=; b=Xw2egBAygbbIqaRSRaRU3H+AVmAuMKRkr34y6z+MK5oFIXy5S8pe2KCTzGrFE31SK7 LCkIiV6JylupfH8wDykouor95csp3ei6uO1N5KHOZILFg1D5lq+R/EfFuJ4odj9L7wxo G85L/OuK2UjZg9pUBV2zjYhEcRnfv35srkqFmNVDcyTgH3lXsz+6ZeikDjmMseXwKKWT 5EVYeewhMiWFEhCoxeKcZf3thpYME3m69A+e2KEIXIhprd78v6ddktdSq6czsqEW+Qgd STNmzbrqx0Gyz7oZhfjcgZ3dktJ8y/YPhNYC7lJi0jaTjY1Ej7BQfXdNMxDYhfWuESfc OLGQ== X-Gm-Message-State: AFeK/H27sdwTPDT8AZYwKBrJKeyzE7VM+u77n8As4rmyj/gSobdeVK7gDEn7i6Vv0DQnr3nM7rG1pe/KIJfLtQ== X-Received: by 10.98.156.23 with SMTP id f23mr37677771pfe.3.1491533287740; Thu, 06 Apr 2017 19:48:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.164.164 with HTTP; Thu, 6 Apr 2017 19:48:07 -0700 (PDT) In-Reply-To: References: From: Brian Avery Date: Thu, 6 Apr 2017 19:48:07 -0700 Message-ID: To: Robert Yang Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 1/2] scripts: change way we find native tools (pseudo) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2017 02:48:07 -0000 Content-Type: multipart/alternative; boundary=94eb2c0df846c95ebd054c8aa7c9 --94eb2c0df846c95ebd054c8aa7c9 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Robert, I was definitely looking at only the extract-rootfs issue and didn't remember seeing your above patch. I agree that we need a broader solution than the one I did. I tried applying yours but had some issues. Your patch did fix the runqemu-extract-rootfs, but not when I had INHERIT+=3D " rm_wor= k ". Also, I had trouble running the oe-run-native script. It seems like the help is reversed from what order it is expecting? I may be missing something, it's getting late; but I'll look at it tomoro and see if I can't expand on your patch for a more generic solution. Issues from the run below= . ty, b an intel employee $ bitbake bmap-tools-native -caddto_recipe_sysroot $ oe-run-native bmap-tools-native bmaptool Running bitbake -e bmaptool ERROR: Nothing PROVIDES 'bmaptool'. Close matches: bmap-tools mtools There was an error running bitbake to determine STAGING_DIR_NATIVE Here is the output from bitbake -e bmaptool WARNING: Host distribution "ubuntu-14.04" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. Loading cache...done. Loaded 1299 entries from dependency cache. Summary: There was 1 WARNING message shown. Summary: There was 1 ERROR message shown, returning a non-zero exit code. $ oe-run-native bmaptool bmap-tools-native Running bitbake -e bmap-tools-native PSEUDO =E2=80=A6/tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-nat= ive/usr/bin/pseudo is not found. Error: Unable to find '' in .../tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-native/us= r/bin:.../tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-nat= ive/bin:.../tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-n= ative/usr/sbin:.../tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sy= sroot-native/sbin bavery@bavery-WS-DESK:...$ oe-run-native oe-run-native: error: the following arguments are required: Usage: oe-run-native native-recipe tool [parameters] OpenEmbedded run-native - runs native tools arguments: native-recipe The recipe which provoides tool tool Native tool to run On Thu, Apr 6, 2017 at 3:26 AM, Robert Yang wrote: > Hi Brian and RP, > > This patch can't fix the problem of scripts/oe-run-native, it only can > run the native tools which is depended by meta-ide-support, for example: > > $ bitbake bmap-tools-native meta-ide-support > $ oe-run-native bmaptool --help # exmaple from dev-manual-start.xml > > Error: Unable to find 'bmaptool' in native sysroot > > I think that we need consider the patch that I had sent before: > > git://git.openembedded.org/openembedded-core-contrib rbt/rssfix > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=3Drbt/rss= fix > > Robert Yang (1): > oe-find-native-sysroot: work with RSS > > > Subject: [PATCH 1/1] oe-find-native-sysroot: work with RSS > > The generic STAGING_DIR_NATIVE is gone since RSS, so when find > OECORE_NATIVE_SYSROOT, the user has to specify which recipe's > STAGING_DIR_NATIVE will be used as OECORE_NATIVE_SYSROOT. > > * The usage is changed from ". oe-find-native-sysroot" to > ". oe-find-native-sysroot ". > * The oe-run-native's usage has changed from > "oe-run-native tool" to "oe-run-native native-recipe tool". > > Signed-off-by: Robert Yang > --- > scripts/oe-find-native-sysroot | 56 ++++++++++++++++++++++++++++-- > ------------ > scripts/oe-run-native | 15 +++++++---- > scripts/runqemu-export-rootfs | 2 +- > scripts/runqemu-extract-sdk | 2 +- > 4 files changed, 49 insertions(+), 26 deletions(-) > > diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysr= o > ot > index 3f4c29da8a..59fe3f3118 100755 > --- a/scripts/oe-find-native-sysroot > +++ b/scripts/oe-find-native-sysroot > @@ -9,7 +9,7 @@ > # it, e.g: > # > # SYSROOT_SETUP_SCRIPT=3D`which oe-find-native-sysroot` > -# . $SYSROOT_SETUP_SCRIPT > +# . $SYSROOT_SETUP_SCRIPT > # > # This script will terminate execution of your calling program unless > # you set a variable $SKIP_STRICT_SYSROOT_CHECK to a non-empty string > @@ -30,8 +30,8 @@ > # with this program; if not, write to the Free Software Foundation, Inc.= , > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > -if [ "$1" =3D '--help' -o "$1" =3D '-h' ] ; then > - echo 'Usage: oe-find-native-sysroot [-h|--help]' > +if [ "$1" =3D '--help' -o "$1" =3D '-h' -o $# -ne 1 ] ; then > + echo 'Usage: oe-find-native-sysroot [-h|--help]' > echo '' > echo 'OpenEmbedded find-native-sysroot - helper script to set' > echo 'environment variables OECORE_NATIVE_SYSROOT and PSEUDO' > @@ -39,11 +39,31 @@ if [ "$1" =3D '--help' -o "$1" =3D '-h' ] ; then > echo 'executable binary' > echo '' > echo 'options:' > + echo ' recipe its STAGING_DIR_NATIVE is used as native > sysroot' > echo ' -h, --help show this help message and exit' > echo '' > exit 2 > fi > > +# Global vars > +BITBAKE_E=3D"" > +OECORE_NATIVE_SYSROOT=3D"" > + > +set_oe_native_sysroot(){ > + echo "Running bitbake -e $1" > + BITBAKE_E=3D"`bitbake -e $1`" > + OECORE_NATIVE_SYSROOT=3D`echo "$BITBAKE_E" | grep ^STAGING_DIR_NATIV= E | > cut -d '"' -f2` > + > + if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then > + # This indicates that there was an error running bitbake -e that > + # the user needs to be informed of > + echo "There was an error running bitbake to determine > STAGING_DIR_NATIVE" > + echo "Here is the output from bitbake -e $1" > + echo "$BITBAKE_E" > + exit 1 > + fi > +} > + > if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then > BITBAKE=3D`which bitbake 2> /dev/null` > if [ "x$BITBAKE" !=3D "x" ]; then > @@ -54,10 +74,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then > exit 1 > fi > touch conf/sanity.conf > - OECORE_NATIVE_SYSROOT=3D`bitbake -e meta-ide-support | grep > ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` > + set_oe_native_sysroot $1 > rm -f conf/sanity.conf > else > - OECORE_NATIVE_SYSROOT=3D`bitbake -e meta-ide-support | grep > ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` > + set_oe_native_sysroot $1 > fi > else > echo "Error: Unable to locate bitbake command." > @@ -69,21 +89,11 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then > fi > fi > > -if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then > - # This indicates that there was an error running bitbake -e that > - # the user needs to be informed of > - echo "There was an error running bitbake to determine > RECIPE_SYSROOT_NATIVE" > - echo "Here is the output from bitbake -e" > - bitbake -e > - exit 1 > -fi > - > -# Set up pseudo command > -if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then > - echo "Error: Unable to find pseudo binary in > $OECORE_NATIVE_SYSROOT/usr/bin/" > +if [ ! -e "$OECORE_NATIVE_SYSROOT/" ]; then > + echo "Error: $OECORE_NATIVE_SYSROOT doesn't exist." > > if [ "x$OECORE_DISTRO_VERSION" =3D "x" ]; then > - echo "Have you run 'bitbake meta-ide-support'?" > + echo "Have you run 'bitbake $1 -caddto_recipe_sysroot'?" > else > echo "This shouldn't happen - something is wrong with your > toolchain installation" > fi > @@ -92,4 +102,12 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; > then > exit 1 > fi > fi > -PSEUDO=3D"$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" > + > +# Set up pseudo command > +pseudo=3D"$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" > +if [ -e "$pseudo" ]; then > + echo "PSEUDO=3D$pseudo" > + PSEUDO=3D"$pseudo" > +else > + echo "PSEUDO $pseudo is not found." > +fi > diff --git a/scripts/oe-run-native b/scripts/oe-run-native > index f2453e705a..de3c02ed34 100755 > --- a/scripts/oe-run-native > +++ b/scripts/oe-run-native > @@ -22,34 +22,39 @@ > # > > if [ $# -lt 1 -o "$1" =3D '--help' -o "$1" =3D '-h' ] ; then > - echo 'oe-run-native: error: the following arguments are required: > ' > - echo 'Usage: oe-run-native tool [parameters]' > + echo 'oe-run-native: error: the following arguments are required: > ' > + echo 'Usage: oe-run-native native-recipe tool [parameters]' > echo '' > echo 'OpenEmbedded run-native - runs native tools' > echo '' > echo 'arguments:' > + echo ' native-recipe The recipe which provoides tool' > echo ' tool Native tool to run' > echo '' > exit 2 > fi > > +native_recipe=3D"$1" > +tool=3D"$2" > +shift > + > SYSROOT_SETUP_SCRIPT=3D`which oe-find-native-sysroot 2> /dev/null` > if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then > echo "Error: Unable to find oe-find-native-sysroot script" > exit 1 > fi > -. $SYSROOT_SETUP_SCRIPT > +. $SYSROOT_SETUP_SCRIPT $native_recipe > > OLD_PATH=3D$PATH > > # look for a tool only in native sysroot > > PATH=3D$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/ > bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin > -tool=3D`/usr/bin/which $1 2>/dev/null` > +tool=3D`/usr/bin/which $tool 2>/dev/null` > > if [ -n "$tool" ] ; then > # add old path to allow usage of host tools > PATH=3D$PATH:$OLD_PATH $@ > else > - echo "Error: Unable to find '$1' in native sysroot" > + echo "Error: Unable to find '$tool' in $PATH" > exit 1 > fi > diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootf= s > index 7ebc07194d..c7992d8223 100755 > --- a/scripts/runqemu-export-rootfs > +++ b/scripts/runqemu-export-rootfs > @@ -44,7 +44,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then > echo "Did you forget to source your build environment setup > script?" > exit 1 > fi > -. $SYSROOT_SETUP_SCRIPT > +. $SYSROOT_SETUP_SCRIPT meta-ide-support > > if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then > echo "Error: Unable to find unfsd binary in > $OECORE_NATIVE_SYSROOT/usr/bin/" > diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk > index 32ddd485b6..2a0dd50e0e 100755 > --- a/scripts/runqemu-extract-sdk > +++ b/scripts/runqemu-extract-sdk > @@ -35,7 +35,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then > echo "Did you forget to source your build system environment setup > script?" > exit 1 > fi > -. $SYSROOT_SETUP_SCRIPT > +. $SYSROOT_SETUP_SCRIPT meta-ide-support > PSEUDO_OPTS=3D"-P $OECORE_NATIVE_SYSROOT/usr" > > ROOTFS_TARBALL=3D$1 > > > // Robert > > > On 04/05/2017 06:22 AM, brian avery wrote: > >> oe-find-native-sysroot: Recipe Specific Sysroots have eliminated the >> large STAGING_DIR_NATIVE. Now, we will rely on the meta-ide-support >> sysroot that is what was populating the large STAGING_DIR_NATIVE in >> previous versions anyway. We now look for RECIPE_SYSROOT_NATIVE. >> >> [YOCTO #11119] >> >> Signed-off-by: brian avery >> --- >> scripts/oe-find-native-sysroot | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/scripts/oe-find-native-sysroot >> b/scripts/oe-find-native-sysroot >> index 13a5c46..3f4c29d 100755 >> --- a/scripts/oe-find-native-sysroot >> +++ b/scripts/oe-find-native-sysroot >> @@ -2,7 +2,7 @@ >> # >> # Find a native sysroot to use - either from an in-tree OE build or >> # from a toolchain installation. It then ensures the variable >> -# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and se= ts >> +# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and se= ts >> # $PSEUDO to the path of the pseudo binary. >> # >> # This script is intended to be run within other scripts by source'ing >> @@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then >> exit 1 >> fi >> touch conf/sanity.conf >> - OECORE_NATIVE_SYSROOT=3D`bitbake -e | grep ^STAGING_DIR_NAT= IVE >> | cut -d '"' -f2` >> + OECORE_NATIVE_SYSROOT=3D`bitbake -e meta-ide-support | grep >> ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` >> rm -f conf/sanity.conf >> else >> - OECORE_NATIVE_SYSROOT=3D`bitbake -e | grep ^STAGING_DIR_NAT= IVE >> | cut -d '"' -f2` >> + OECORE_NATIVE_SYSROOT=3D`bitbake -e meta-ide-support | grep >> ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` >> fi >> else >> echo "Error: Unable to locate bitbake command." >> @@ -72,7 +72,7 @@ fi >> if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then >> # This indicates that there was an error running bitbake -e that >> # the user needs to be informed of >> - echo "There was an error running bitbake to determine >> STAGING_DIR_NATIVE" >> + echo "There was an error running bitbake to determine >> RECIPE_SYSROOT_NATIVE" >> echo "Here is the output from bitbake -e" >> bitbake -e >> exit 1 >> >> -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > --94eb2c0df846c95ebd054c8aa7c9 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Robert,=C2=A0

I was definitely looki= ng at only the extract-rootfs issue and didn't remember seeing your abo= ve patch.=C2=A0 I agree that we need a broader solution than the one I did.= I tried applying yours but had some issues. Your patch did fix the runqemu= -extract-rootfs, but not when I had INHERIT+=3D " rm_work ".=C2= =A0 Also, I had trouble running the oe-run-native script. It seems like the= help is reversed from what order it is expecting?=C2=A0 I may be missing s= omething, it's getting late; but I'll look at it tomoro and see if = I can't expand on your patch for a more generic solution. Issues from t= he run below.
ty,
b
an intel employee =C2=A0<= /div>


$ bitbake bmap-tools-native = -caddto_recipe_sysroot=C2=A0

$ oe-run-native bmap-tools-native bmaptool =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0

Running bitbake -e bmaptool

ERROR: Nothing PROVIDES &#= 39;bmaptool'. Close matches:

=C2=A0 bmap-tools

=C2=A0 mtools

There was an error running bitbake to determine STAGING_DIR_NATI= VE

Here is the out= put from bitbake -e bmaptool

WARNING: Host distribution "ubuntu-14.04" has not been= validated with this version of the build system; you may possibly experien= ce unexpected failures. It is recommended that you use a tested distributio= n. Loading cache...done. Loaded 1299 entries from dependency cache. Summary= : There was 1 WARNING message shown. Summary: There was 1 ERROR message sho= wn, returning a non-zero exit code.

$ oe-run-native bmaptool bmap-tools-native=C2=A0

Running bitbake -e bmap-to= ols-native

PSEUDO = =E2=80=A6/tmp/work/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-nat= ive/usr/bin/pseudo is not found.

Error: Unable to find '' in .../tmp/work/x86_64-linu= x/bmap-tools-native/3.2-r0/recipe-sysroot-native/usr/bin:.../tmp/work/x86_6= 4-linux/bmap-tools-native/3.2-r0/recipe-sysroot-native/bin:.../tmp/work/x86= _64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-native/usr/sbin:.../tmp/w= ork/x86_64-linux/bmap-tools-native/3.2-r0/recipe-sysroot-native/sbin=

bavery@bavery-WS-DESK:..= .$ oe-run-native=C2=A0

oe-run-native: error: the following arguments are required: <native= recipe> <native tool>

Usage: oe-run-native native-recipe tool [parameters]


OpenEmbedded run-native - runs native t= ools


arguments:

=C2=A0 native-recipe =C2=A0 =C2= =A0 =C2=A0 The recipe which provoides tool

= =C2=A0 tool=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 Native tool to run




On Thu,= Apr 6, 2017 at 3:26 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
Hi Brian and RP,

This patch can't fix the problem of scripts/oe-run-native, it only can<= br> run the native tools which is depended by meta-ide-support, for example:
$ bitbake bmap-tools-native meta-ide-support
$ oe-run-native bmaptool --help # exmaple from dev-manual-start.xml

Error: Unable to find 'bmaptool' in native sysroot

I think that we need consider the patch that I had sent before:

=C2=A0 git://git.openembedded.org/openembe= dded-core-contrib rbt/rssfix
=C2=A0 http://cgit.openemb= edded.org/openembedded-core-contrib/log/?h=3Drbt/rssfix

Robert Yang (1):
=C2=A0 oe-find-native-sysroot: work with RSS


Subject: [PATCH 1/1] oe-find-native-sysroot: work with RSS

The generic STAGING_DIR_NATIVE is gone since RSS, so when find
OECORE_NATIVE_SYSROOT, the user has to specify which recipe's
STAGING_DIR_NATIVE will be used as OECORE_NATIVE_SYSROOT.

* The usage is changed from ". oe-find-native-sysroot" to
=C2=A0 ". oe-find-native-sysroot <recipe>".
* The oe-run-native's usage has changed from
=C2=A0 "oe-run-native tool" to "oe-run-native native-recipe = tool".

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
=C2=A0scripts/oe-find-native-sysroot | 56 ++++++++++++++++++++++++++++= --------------
=C2=A0scripts/oe-run-native=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 15 +++++++-= ---
=C2=A0scripts/runqemu-export-rootfs=C2=A0 |=C2=A0 2 +-
=C2=A0scripts/runqemu-extract-sdk=C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A04 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-s= ysroot
index 3f4c29da8a..59fe3f3118 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -9,7 +9,7 @@
=C2=A0# it, e.g:
=C2=A0#
=C2=A0# SYSROOT_SETUP_SCRIPT=3D`which oe-find-native-sysroot`
-# . $SYSROOT_SETUP_SCRIPT
+# . $SYSROOT_SETUP_SCRIPT <recipe>
=C2=A0#
=C2=A0# This script will terminate execution of your calling program unless=
=C2=A0# you set a variable $SKIP_STRICT_SYSROOT_CHECK to a non-empty string=
@@ -30,8 +30,8 @@
=C2=A0# with this program; if not, write to the Free Software Foundation, I= nc.,
=C2=A0# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-if [ "$1" =3D '--help' -o "$1" =3D '-h'= ; ] ; then
-=C2=A0 =C2=A0 echo 'Usage: oe-find-native-sysroot [-h|--help]'
+if [ "$1" =3D '--help' -o "$1" =3D '-h'= ; -o $# -ne 1 ] ; then
+=C2=A0 =C2=A0 echo 'Usage: oe-find-native-sysroot <recipe> [-h|-= -help]'
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0echo 'OpenEmbedded find-native-sysroot - helper scr= ipt to set'
=C2=A0 =C2=A0 =C2=A0echo 'environment variables OECORE_NATIVE_SYSROOT a= nd PSEUDO'
@@ -39,11 +39,31 @@ if [ "$1" =3D '--help' -o "$1&qu= ot; =3D '-h' ] ; then
=C2=A0 =C2=A0 =C2=A0echo 'executable binary'
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0echo 'options:'
+=C2=A0 =C2=A0 echo '=C2=A0 recipe=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 its STAGING_DIR_NATIVE is used as native sysroot'
=C2=A0 =C2=A0 =C2=A0echo '=C2=A0 -h, --help=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 show this help message and exit'
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0exit 2
=C2=A0fi

+# Global vars
+BITBAKE_E=3D""
+OECORE_NATIVE_SYSROOT=3D""
+
+set_oe_native_sysroot(){
+=C2=A0 =C2=A0 echo "Running bitbake -e $1"
+=C2=A0 =C2=A0 BITBAKE_E=3D"`bitbake -e $1`"
+=C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`echo "$BITBAKE_E" | grep = ^STAGING_DIR_NATIVE | cut -d '"' -f2`
+
+=C2=A0 =C2=A0 if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]= ; then
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 # This indicates that there was an error runni= ng bitbake -e that
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 # the user needs to be informed of
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "There was an error running bitbake = to determine STAGING_DIR_NATIVE"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "Here is the output from bitbake -e = $1"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "$BITBAKE_E"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 exit 1
+=C2=A0 =C2=A0 fi
+}
+
=C2=A0if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then =C2=A0 =C2=A0 =C2=A0BITBAKE=3D`which bitbake 2> /dev/null`
=C2=A0 =C2=A0 =C2=A0if [ "x$BITBAKE" !=3D "x" ]; then @@ -54,10 +74,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x&qu= ot; ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fi
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0touch conf/sanity.conf
<= /span> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"'= ; -f2`
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 set_oe_native_sysroot $1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rm -f conf/sanity.conf
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0else
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"'= ; -f2`
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 set_oe_native_sysroot $1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fi
=C2=A0 =C2=A0 =C2=A0else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Error: Unable to locate bitbak= e command."
 @@ -69,21 +89,11 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x&qu= ot; ]; then
=C2=A0 =C2=A0 =C2=A0fi
=C2=A0fi

-if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then
-=C2=A0 =C2=A0 # This indicates that there was an error running bitbake -e = that
-=C2=A0 =C2=A0 # the user needs to be informed of
-=C2=A0 =C2=A0 echo "There was an error running bitbake to determine R= ECIPE_SYSROOT_NATIVE"
-=C2=A0 =C2=A0 echo "Here is the output from bitbake -e"
-=C2=A0 =C2=A0 bitbake -e
-=C2=A0 =C2=A0 exit 1
-fi
-
-# Set up pseudo command
-if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then -=C2=A0 =C2=A0 echo "Error: Unable to find pseudo binary in $OECORE_NA= TIVE_SYSROOT/usr/bin/"
+if [ ! -e "$OECORE_NATIVE_SYSROOT/" ]; then
+=C2=A0 =C2=A0 echo "Error: $OECORE_NATIVE_SYSROOT doesn't exist.&= quot;

=C2=A0 =C2=A0 =C2=A0if [ "x$OECORE_DISTRO_VERSION" =3D "x&qu= ot; ]; then
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "Have you run 'bitbake meta-ide-= support'?"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "Have you run 'bitbake $1 -caddt= o_recipe_sysroot'?"
=C2=A0 =C2=A0 =C2=A0else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "This shouldn't happen - so= mething is wrong with your toolchain installation"
=C2=A0 =C2=A0 =C2=A0fi
@@ -92,4 +102,12 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pse= udo" ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0 =C2=A0 =C2=A0fi
=C2=A0fi
-PSEUDO=3D"$OECORE_NATIVE_SYSROOT/usr/bin/pseudo"
+
+# Set up pseudo command
+pseudo=3D"$OECORE_NATIVE_SYSROOT/usr/bin/pseudo"
+if [ -e "$pseudo" ]; then
+=C2=A0 =C2=A0 echo "PSEUDO=3D$pseudo"
+=C2=A0 =C2=A0 PSEUDO=3D"$pseudo"
+else
+=C2=A0 =C2=A0 echo "PSEUDO $pseudo is not found."
+fi
diff --git a/scripts/oe-run-native b/scripts/oe-run-native
index f2453e705a..de3c02ed34 100755
--- a/scripts/oe-run-native
+++ b/scripts/oe-run-native
@@ -22,34 +22,39 @@
=C2=A0#

=C2=A0if [ $# -lt 1 -o "$1" =3D '--help' -o "$1"= ; =3D '-h' ] ; then
-=C2=A0 =C2=A0 echo 'oe-run-native: error: the following arguments are = required: <native tool>'
-=C2=A0 =C2=A0 echo 'Usage: oe-run-native tool [parameters]'
+=C2=A0 =C2=A0 echo 'oe-run-native: error: the following arguments are = required: <native recipe> <native tool>'
+=C2=A0 =C2=A0 echo 'Usage: oe-run-native native-recipe tool [parameter= s]'
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0echo 'OpenEmbedded run-native - runs native tools&#= 39;
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0echo 'arguments:'
+=C2=A0 =C2=A0 echo '=C2=A0 native-recipe=C2=A0 =C2=A0 =C2=A0 =C2=A0The= recipe which provoides tool'
=C2=A0 =C2=A0 =C2=A0echo '=C2=A0 tool=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 Native tool to run'
=C2=A0 =C2=A0 =C2=A0echo ''
=C2=A0 =C2=A0 =C2=A0exit 2
=C2=A0fi

+native_recipe=3D"$1"
+tool=3D"$2"
+shift
+
=C2=A0SYSROOT_SETUP_SCRIPT=3D`which oe-find-native-sysroot 2> /dev/null`=
=C2=A0if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Error: Unable to find oe-find-= native-sysroot script"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0fi
-. $SYSROOT_SETUP_SCRIPT
+. $SYSROOT_SETUP_SCRIPT $native_recipe

=C2=A0OLD_PATH=3D$PATH

=C2=A0# look for a tool only in native sysroot

PATH=3D$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:= $OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin
-tool=3D`/usr/bin/which $1 2>/dev/null`
+tool=3D`/usr/bin/which $tool 2>/dev/null`

=C2=A0if [ -n "$tool" ] ; then
=C2=A0 =C2=A0 =C2=A0# add old path to allow usage of host tools
=C2=A0 =C2=A0 =C2=A0PATH=3D$PATH:$OLD_PATH $@
=C2=A0else
-=C2=A0 =C2=A0 echo "Error: Unable to find '$1' in native sysr= oot"
+=C2=A0 =C2=A0 echo "Error: Unable to find '$tool' in $PATH&qu= ot;
=C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0fi
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-ro= otfs
index 7ebc07194d..c7992d8223 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -44,7 +44,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "Did you forget to source your build = environment setup script?"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 exit 1
=C2=A0fi
-. $SYSROOT_SETUP_SCRIPT
+. $SYSROOT_SETUP_SCRIPT meta-ide-support

=C2=A0if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; th= en
=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "Error: Unable to find unfsd binary i= n $OECORE_NATIVE_SYSROOT/usr/bin/"
diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index 32ddd485b6..2a0dd50e0e 100755
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -35,7 +35,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
=C2=A0 =C2=A0 =C2=A0echo "Did you forget to source your build system e= nvironment setup script?"
=C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0fi
-. $SYSROOT_SETUP_SCRIPT
+. $SYSROOT_SETUP_SCRIPT meta-ide-support
=C2=A0PSEUDO_OPTS=3D"-P $OECORE_NATIVE_SYSROOT/usr"

=C2=A0ROOTFS_TARBALL=3D$1

// Robert


On 04/05/2017 06:22 AM, brian avery wrote:
oe-find-native-sysroot: Recipe Specific Sysroots have eliminated the
large STAGING_DIR_NATIVE. Now, we will rely on the meta-ide-support
sysroot that is what was populating the large STAGING_DIR_NATIVE in
previous versions anyway. We now look for RECIPE_SYSROOT_NATIVE.

[YOCTO #11119]

Signed-off-by: brian avery <brian.avery@intel.com>
---
=C2=A0scripts/oe-find-native-sysroot | 8 ++++----
=C2=A01 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-s= ysroot
index 13a5c46..3f4c29d 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -2,7 +2,7 @@
=C2=A0#
=C2=A0# Find a native sysroot to use - either from an in-tree OE build or =C2=A0# from a toolchain installation. It then ensures the variable
-# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and s= ets
+# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and s= ets
=C2=A0# $PSEUDO to the path of the pseudo binary.
=C2=A0#
=C2=A0# This script is intended to be run within other scripts by source= 9;ing
@@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" =3D "x&qu= ot; ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit 1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fi
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0touch conf/sanity.conf
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2`
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"'= ; -f2`
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rm -f conf/sanity.conf
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0else
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2`
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 OECORE_NATIVE_SYSROOT=3D`bitbake= -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"'= ; -f2`
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fi
=C2=A0 =C2=A0 =C2=A0else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Error: Unable to locate bitbak= e command."
@@ -72,7 +72,7 @@ fi
=C2=A0if [ "x$OECORE_NATIVE_SYSROOT" =3D "x" ]; then =C2=A0 =C2=A0 =C2=A0# This indicates that there was an error running bitbak= e -e that
=C2=A0 =C2=A0 =C2=A0# the user needs to be informed of
-=C2=A0 =C2=A0 echo "There was an error running bitbake to determine S= TAGING_DIR_NATIVE"
+=C2=A0 =C2=A0 echo "There was an error running bitbake to determine R= ECIPE_SYSROOT_NATIVE"
=C2=A0 =C2=A0 =C2=A0echo "Here is the output from bitbake -e"
=C2=A0 =C2=A0 =C2=A0bitbake -e
=C2=A0 =C2=A0 =C2=A0exit 1

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/m= ailman/listinfo/openembedded-core

--94eb2c0df846c95ebd054c8aa7c9--