From dd3a1d3b4179dd64dd12f20e4568fd7f1c3fc977 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 17 Mar 2011 08:31:54 -0700 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- scripts/bitbake | 4 ++++ 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"