Shift a few env bits into scripts/bitbake

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>

diff --git a/scripts/bitbake b/scripts/bitbake
index 437d84ee8e367303308425d62d4ec3f9b63de3cb..39d5957078c199d39b7273a14173d7a2e89fd915 100755 (executable)
--- 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 554945452a5a18cb21ad16ebdff19a0508b31d6f..03b078f299556ad8b41412490a41c519fcc59d18 100755 (executable)
--- 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"