From fa6176219b741eed346b21a3d923e9abc9b5442a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 15:59:04 +0100 Subject: Rename poky-init-build-env to oe-init-build-env Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- oe-init-build-env | 44 +++++++++++++++++++++++++++++++++ poky-init-build-env | 44 --------------------------------- scripts/oe-buildenv-internal | 58 ++++++++++++++++++++++++++++++++++++++++++++ scripts/poky-env-internal | 58 -------------------------------------------- scripts/poky-setup-builddir | 2 +- scripts/poky-setup-rpmrepo | 2 +- 7 files changed, 105 insertions(+), 105 deletions(-) create mode 100755 oe-init-build-env delete mode 100755 poky-init-build-env create mode 100755 scripts/oe-buildenv-internal delete mode 100755 scripts/poky-env-internal diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 500a1b2f69..b5170a55c7 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -46,7 +46,7 @@ def check_pseudo_wrapper(): # Check if bitbake wrapper is being used pseudo_build = os.environ.get( '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': # pseudo ought to be working, let's see if it is... diff --git a/oe-init-build-env b/oe-init-build-env new file mode 100755 index 0000000000..87929d119d --- /dev/null +++ b/oe-init-build-env @@ -0,0 +1,44 @@ +#!/bin/sh + +# Poky Build Enviroment Setup Script +# +# Copyright (C) 2006-2007 OpenedHand Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# +# Normally this is called as '. ./poky-init-buildenv builddir' +# +# This works in most shells (not dash), but not all of them pass arg1 when +# being sourced. To workaround the shell limitation use "set arg1" prior +# to sourcing this script. +# +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 + if [ -n "$BASH_SOURCE" ]; then + OEROOT="`dirname $BASH_SOURCE`" + else + OEROOT="`pwd`" + fi + OEROOT=`readlink -f "$OEROOT"` + export OEROOT + . $OEROOT/scripts/oe-buildenv-internal + $OEROOT/scripts/poky-setup-builddir + unset OEROOT + unset BBPATH + [ -n "$BUILDDIR" ] && cd $BUILDDIR +fi + diff --git a/poky-init-build-env b/poky-init-build-env deleted file mode 100755 index 3c8aa5341b..0000000000 --- a/poky-init-build-env +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# Poky Build Enviroment Setup Script -# -# Copyright (C) 2006-2007 OpenedHand Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# -# Normally this is called as '. ./poky-init-buildenv builddir' -# -# This works in most shells (not dash), but not all of them pass arg1 when -# being sourced. To workaround the shell limitation use "set arg1" prior -# 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'" -else - if [ -n "$BASH_SOURCE" ]; then - OEROOT="`dirname $BASH_SOURCE`" - else - OEROOT="`pwd`" - fi - OEROOT=`readlink -f "$OEROOT"` - export OEROOT - . $OEROOT/scripts/poky-env-internal - $OEROOT/scripts/poky-setup-builddir - unset OEROOT - unset BBPATH - [ -n "$BUILDDIR" ] && cd $BUILDDIR -fi - diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal new file mode 100755 index 0000000000..03b078f299 --- /dev/null +++ b/scripts/oe-buildenv-internal @@ -0,0 +1,58 @@ +#!/bin/sh + +# Poky Build Enviroment Setup Script +# +# Copyright (C) 2006-2007 OpenedHand Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# It is assumed OEROOT is already defined when this is called +if [ -z "$OEROOT" ]; then + echo >&2 "Error: OEROOT is not defined!" + return +fi + +if [ "x$BDIR" = "x" ]; then + if [ "x$1" = "x" ]; then + BDIR="build" + else + BDIR=`readlink -f "$1"` + fi +fi +if expr "$BDIR" : '/.*' > /dev/null ; then + BUILDDIR="$BDIR" +else + BUILDDIR="`pwd`/$BDIR" +fi +unset BDIR + +BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/" + +BITBAKEDIR=`readlink -f "$BITBAKEDIR"` +BUILDDIR=`readlink -f "$BUILDDIR"` + +if ! (test -d "$BITBAKEDIR"); then + echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the poky directory?" + return +fi + +PATH="${OEROOT}/scripts:$BITBAKEDIR/bin/:$PATH" +unset BITBAKEDIR + +# Used by the poky-qemu script +export BUILDDIR +export PATH + +export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal deleted file mode 100755 index 03b078f299..0000000000 --- a/scripts/poky-env-internal +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# Poky Build Enviroment Setup Script -# -# Copyright (C) 2006-2007 OpenedHand Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# It is assumed OEROOT is already defined when this is called -if [ -z "$OEROOT" ]; then - echo >&2 "Error: OEROOT is not defined!" - return -fi - -if [ "x$BDIR" = "x" ]; then - if [ "x$1" = "x" ]; then - BDIR="build" - else - BDIR=`readlink -f "$1"` - fi -fi -if expr "$BDIR" : '/.*' > /dev/null ; then - BUILDDIR="$BDIR" -else - BUILDDIR="`pwd`/$BDIR" -fi -unset BDIR - -BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/" - -BITBAKEDIR=`readlink -f "$BITBAKEDIR"` -BUILDDIR=`readlink -f "$BUILDDIR"` - -if ! (test -d "$BITBAKEDIR"); then - echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Did you source the script in the poky directory?" - return -fi - -PATH="${OEROOT}/scripts:$BITBAKEDIR/bin/:$PATH" -unset BITBAKEDIR - -# Used by the poky-qemu script -export BUILDDIR -export PATH - -export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir index 7a49a8fb9c..b8a6dd95ae 100755 --- a/scripts/poky-setup-builddir +++ b/scripts/poky-setup-builddir @@ -31,7 +31,7 @@ if ! (test -d "$BUILDDIR"); then fi 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 fi diff --git a/scripts/poky-setup-rpmrepo b/scripts/poky-setup-rpmrepo index 42a9b6aedf..0e84ca9ee5 100755 --- a/scripts/poky-setup-rpmrepo +++ b/scripts/poky-setup-rpmrepo @@ -34,7 +34,7 @@ setup_tmpdir() { type -P bitbake &>/dev/null || { echo "In order for this script to dynamically infer paths"; 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; exit 1; } -- cgit 1.2.3-korg