Pull request - a few misc fixes

PATCH Applied Chris Larson 2 participants 6 messages Mar 17, 2011 – Mar 21, 2011

lore

Share & tools

lore

Chris Larson

author

2011-03-17 16:17 UTC #0 lore raw

cover Pull request - a few misc fixes

From: Chris Larson <[email protected]>

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

Thanks,
Chris Larson <[email protected]>
---

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

Signature · 1 line

1.7.2.3

Chris Larson

author

2011-03-17 16:17 UTC #1 lore raw

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

From: Chris Larson <[email protected]>

Signed-off-by Chris Larson <[email protected]>

---
 poky-init-build-env |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

poky-init-build-env +1 -1

index 82590f2..3c8aa53 100755
@@ -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

Signature · 1 line

1.7.2.3

Chris Larson

author

2011-03-17 16:17 UTC #2 lore raw

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

In reply to Chris Larson

From: Chris Larson <[email protected]>

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 <[email protected]>

---
 meta/classes/native.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/classes/native.bbclass +2 -0

index 545a73e..cc32cf5 100644
@@ -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}"

Signature · 1 line

1.7.2.3

Chris Larson

author

2011-03-17 16:26 UTC #3 lore raw

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

In reply to Chris Larson

From: Chris Larson <[email protected]>

Signed-off-by Chris Larson <[email protected]>

---
 scripts/bitbake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

scripts/bitbake +1 -1

index 29e7bcd..437d84e 100755
@@ -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

Signature · 1 line

1.7.2.3

Chris Larson

author

2011-03-17 16:17 UTC #4 lore raw

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

In reply to Chris Larson

From: Chris Larson <[email protected]>

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 <[email protected]>

---
 scripts/bitbake           |    4 ++++
 scripts/poky-env-internal |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

scripts/bitbake +4 -0

index 437d84e..39d5957 100755
@@ -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

scripts/poky-env-internal +1 -3

index 5549454..03b078f 100755
@@ -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"

Signature · 1 line

1.7.2.3

Richard Purdie

Applied

2011-03-21 17:55 UTC #5 lore raw

In reply to Chris Larson

Quoted 17 lines · Chris Larson

From: Chris Larson <[email protected]>
Pull URL: https://github.com/kergoth/oe-core
Branch: misc-fixes
Browse: https://github.com/kergoth/oe-core/commits/misc-fixes
Thanks,
Chris Larson <[email protected]>
---
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

Quoted 5 lines

 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