Patchwork [4/4] Shift a few env bits into scripts/bitbake

login
register
mail settings
Submitter Christopher Larson
Date March 17, 2011, 4:15 p.m.
Message ID <d6a11643309421007089e9db94049691acb49ef1.1300378309.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/1531/
State New, archived
Headers show

Comments

Christopher Larson - March 17, 2011, 4:15 p.m.
From: Chris Larson <chris_larson@mentor.com>

This attempts to separate the bits we *require* to run bitbake with oe-core
via the wrapper script, and which are independent of the build environment
(PSEUDO_DISABLED, PSEUDO_BUILD, BBFETCH2) from those which are more particular
to poky-init-build-env's way of setting things up (e.g. adding MACHINE to
BB_ENV_EXTRAWHITE, relying on OEROOT, etc).  This should make it easier to use
scripts/bitbake with non-standard workflows.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 scripts/bitbake           |    4 ++++
 scripts/poky-env-internal |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/scripts/bitbake b/scripts/bitbake
index 437d84e..39d5957 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -1,4 +1,8 @@ 
 #!/bin/sh
+
+export BBFETCH2=True
+export BB_ENV_EXTRAWHITE="PSEUDO_BUILD PSEUDO_DISABLED $BB_ENV_EXTRAWHITE"
+
 NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --environment -g --graphviz"
 needpseudo="1"
 for opt in $@; do
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 5549454..03b078f 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -55,6 +55,4 @@  unset BITBAKEDIR
 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 PSEUDO_DISABLED PSEUDO_BUILD"
-
-export BBFETCH2=True
+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"