diff options
| author | Chris Larson <chris_larson@mentor.com> | 2011-03-17 08:31:54 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-21 17:50:18 +0000 |
| commit | 7f9d6efcaf019eb046c8aa00735f823e3dbc8712 (patch) | |
| tree | 292526d9323c174ca84439ad516f0497ebb61c3a /scripts | |
| parent | 568888e38ea5a66371b9fc679df89714807f3cc8 (diff) | |
| download | openembedded-core-7f9d6efcaf019eb046c8aa00735f823e3dbc8712.tar.gz openembedded-core-7f9d6efcaf019eb046c8aa00735f823e3dbc8712.tar.bz2 openembedded-core-7f9d6efcaf019eb046c8aa00735f823e3dbc8712.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bitbake | 4 | ||||
| -rwxr-xr-x | scripts/poky-env-internal | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/bitbake b/scripts/bitbake index 437d84ee8e..39d5957078 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 554945452a..03b078f299 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" |