summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-03-17 08:31:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-23 15:43:52 +0000
commitdd3a1d3b4179dd64dd12f20e4568fd7f1c3fc977 (patch)
tree8752a21927be58b1ba72e75b1986c219d979864d /scripts
parent99aaf155ef8043b87f724a71216b211a30739af8 (diff)
downloadast2050-yocto-poky-dd3a1d3b4179dd64dd12f20e4568fd7f1c3fc977.zip
ast2050-yocto-poky-dd3a1d3b4179dd64dd12f20e4568fd7f1c3fc977.tar.gz
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. (From OE-Core rev: 7f9d6efcaf019eb046c8aa00735f823e3dbc8712) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bitbake4
-rwxr-xr-xscripts/poky-env-internal4
2 files changed, 5 insertions, 3 deletions
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"
OpenPOWER on IntegriCloud