Переглянути джерело

Rename poky-init-build-env to oe-init-build-env

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie 13 роки тому
батько
коміт
fa6176219b

+ 1 - 1
meta/classes/sanity.bbclass

@@ -46,7 +46,7 @@ def check_pseudo_wrapper():
     # Check if bitbake wrapper is being used
     # Check if bitbake wrapper is being used
     pseudo_build = os.environ.get( 'PSEUDO_BUILD' )
     pseudo_build = os.environ.get( 'PSEUDO_BUILD' )
     if not pseudo_build:
     if not pseudo_build:
-        bb.warn("Bitbake has not been run using the bitbake wrapper (scripts/bitbake); this is likely because your PATH has been altered from that normally set up by the poky-init-build-env script. Not using the wrapper may result in failures during package installation, so it is highly recommended that you set your PATH back so that the wrapper script is being executed.")
+        bb.warn("Bitbake has not been run using the bitbake wrapper (scripts/bitbake); this is likely because your PATH has been altered from that normally set up by the oe-init-build-env script. Not using the wrapper may result in failures during package installation, so it is highly recommended that you set your PATH back so that the wrapper script is being executed.")
 
 
     if (not pseudo_build) or pseudo_build == '2':
     if (not pseudo_build) or pseudo_build == '2':
         # pseudo ought to be working, let's see if it is...
         # pseudo ought to be working, let's see if it is...

+ 3 - 3
poky-init-build-env → oe-init-build-env

@@ -25,8 +25,8 @@
 # being sourced.   To workaround the shell limitation use "set arg1" prior 
 # being sourced.   To workaround the shell limitation use "set arg1" prior 
 # to sourcing this script.
 # to sourcing this script.
 #
 #
-if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./poky-init-build-env" ]; then
-   echo "Error: This script needs to be sourced. Please run as '. ./poky-init-build-env'"
+if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./oe-init-build-env" ]; then
+   echo "Error: This script needs to be sourced. Please run as '. ./oe-init-build-env'"
 else
 else
    if [ -n "$BASH_SOURCE" ]; then
    if [ -n "$BASH_SOURCE" ]; then
       OEROOT="`dirname $BASH_SOURCE`"
       OEROOT="`dirname $BASH_SOURCE`"
@@ -35,7 +35,7 @@ else
    fi
    fi
    OEROOT=`readlink -f "$OEROOT"`
    OEROOT=`readlink -f "$OEROOT"`
    export OEROOT
    export OEROOT
-   . $OEROOT/scripts/poky-env-internal
+   . $OEROOT/scripts/oe-buildenv-internal
    $OEROOT/scripts/poky-setup-builddir
    $OEROOT/scripts/poky-setup-builddir
    unset OEROOT
    unset OEROOT
    unset BBPATH
    unset BBPATH

+ 0 - 0
scripts/poky-env-internal → scripts/oe-buildenv-internal


+ 1 - 1
scripts/poky-setup-builddir

@@ -31,7 +31,7 @@ if ! (test -d "$BUILDDIR"); then
 fi
 fi
 
 
 if ! (test -w "$BUILDDIR"); then
 if ! (test -w "$BUILDDIR"); then
-    echo >&2 "Error: Cannot write to $BUILDDIR, perhaps try sourcing with a writable path? i.e. . poky-init-build-env ~/my-build"
+    echo >&2 "Error: Cannot write to $BUILDDIR, perhaps try sourcing with a writable path? i.e. . oe-init-build-env ~/my-build"
     exit 1
     exit 1
 fi
 fi
 
 

+ 1 - 1
scripts/poky-setup-rpmrepo

@@ -34,7 +34,7 @@ setup_tmpdir() {
             type -P bitbake &>/dev/null || {
             type -P bitbake &>/dev/null || {
                 echo "In order for this script to dynamically infer paths";
                 echo "In order for this script to dynamically infer paths";
                 echo "to kernels or filesystem images, you either need";
                 echo "to kernels or filesystem images, you either need";
-                echo "bitbake in your PATH or to source poky-init-build-env";
+                echo "bitbake in your PATH or to source oe-init-build-env";
                 echo "before running this script" >&2;
                 echo "before running this script" >&2;
                 exit 1; }
                 exit 1; }