[PATCH 0/4] Pull request - a few misc fixes

[PATCH 0/4] Pull request - a few misc fixes

[Chris Larson]

From: Chris Larson <chris_larson@mentor.com>

Pull URL: https://github.com/kergoth/oe-core
  Branch: misc-fixes
  Browse: https://github.com/kergoth/oe-core/commits/misc-fixes

Thanks,
    Chris Larson <chris_larson@mentor.com>
---


Chris Larson (4):
  poky-init-build-env: unbork for zsh
  native: empty PACKAGES_DYNAMIC the way we do PACKAGES
  scripts/bitbake: add -g/--graphviz to NO_BUILD_OPTS
  Shift a few env bits into scripts/bitbake

 meta/classes/native.bbclass |    2 ++
 poky-init-build-env         |    2 +-
 scripts/bitbake             |    6 +++++-
 scripts/poky-env-internal   |    4 +---
 4 files changed, 9 insertions(+), 5 deletions(-)

-- 
1.7.2.3

[PATCH 1/4] poky-init-build-env: unbork for zsh

[Chris Larson]

From: Chris Larson <chris_larson@mentor.com>

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 poky-init-build-env |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/poky-init-build-env b/poky-init-build-env
index 82590f2..3c8aa53 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -25,7 +25,7 @@
 # being sourced.   To workaround the shell limitation use "set arg1" prior 
 # to sourcing this script.
 #
-if [ "x$0" = "x./poky-init-build-env" ]; then
+if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./poky-init-build-env" ]; then
    echo "Error: This script needs to be sourced. Please run as '. ./poky-init-build-env'"
 else
    if [ -n "$BASH_SOURCE" ]; then
-- 
1.7.2.3

[PATCH 2/4] native: empty PACKAGES_DYNAMIC the way we do PACKAGES

[Chris Larson]

From: Chris Larson <chris_larson@mentor.com>

Without this, as a specific example, one has both gtk+-native and gtk+ runtime
providing gdk-pixbuf-loader-*, and you can get bitbake preference conflicts as
a result if you have preferences specified for both gtk+ and gtk+-native for
other things.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 meta/classes/native.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 545a73e..cc32cf5 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -7,6 +7,8 @@ EXCLUDE_FROM_WORLD = "1"
 
 PACKAGES = ""
 PACKAGES_virtclass-native = ""
+PACKAGES_DYNAMIC = ""
+PACKAGES_DYNAMIC_virtclass-native = ""
 PACKAGE_ARCH = "${BUILD_ARCH}"
 
 BASE_PACKAGE_ARCH = "${BUILD_ARCH}"
-- 
1.7.2.3

[PATCH 3/4] scripts/bitbake: add -g/--graphviz to NO_BUILD_OPTS

[Chris Larson]

From: Chris Larson <chris_larson@mentor.com>

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 scripts/bitbake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/bitbake b/scripts/bitbake
index 29e7bcd..437d84e 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -1,5 +1,5 @@
 #!/bin/sh
-NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --environment"
+NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --environment -g --graphviz"
 needpseudo="1"
 for opt in $@; do
 for key in $NO_BUILD_OPTS; do
-- 
1.7.2.3

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

[Chris Larson]

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(-)

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"
-- 
1.7.2.3

Re: [PATCH 0/4] Pull request - a few misc fixes

[Richard Purdie]

On Thu, 2011-03-17 at 09:15 -0700, Chris Larson wrote:
> From: Chris Larson <chris_larson@mentor.com>
> 
> Pull URL: https://github.com/kergoth/oe-core
>   Branch: misc-fixes
>   Browse: https://github.com/kergoth/oe-core/commits/misc-fixes
> 
> Thanks,
>     Chris Larson <chris_larson@mentor.com>
> ---
> 
> 
> Chris Larson (4):
>   poky-init-build-env: unbork for zsh
>   native: empty PACKAGES_DYNAMIC the way we do PACKAGES
>   scripts/bitbake: add -g/--graphviz to NO_BUILD_OPTS
>   Shift a few env bits into scripts/bitbake
> 
>  meta/classes/native.bbclass |    2 ++
>  poky-init-build-env         |    2 +-
>  scripts/bitbake             |    6 +++++-
>  scripts/poky-env-internal   |    4 +---
>  4 files changed, 9 insertions(+), 5 deletions(-)


Merged to master, thanks.

Richard