layer.conf/bitbake.conf: Tweak PATH

PATCH New Richard Purdie 1 participant 1 message May 30, 2012

Share & tools

Richard Purdie

author

2012-05-30 16:14 UTC #0 lore raw

PATCH 1/1 layer.conf/bitbake.conf: Tweak PATH

We want the help2man script in scripts/ to be found in preference to any from the host system and from the native sysroot. It turns out to be tricky to get the order right from layer.conf so we move the addition of the scripts directory to bitbake.conf.

Without this, "bitbake libtasn1 -c cleansstate; bitbake help2man-native; bitbake libtasn1" will fail due to finding the host system help2man before ours.

Signed-off-by Richard Purdie <[email protected]>

---

meta/conf/bitbake.conf +1 -1

index 48287a7..70a49c6 100644
@@ -402,7 +402,7 @@ EXTRA_IMAGEDEPENDS = ""
 # Toolchain info.
 ##################################################################
 
-PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
+PATH_prepend = "${COREBASE}/scripts:${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
 export PATH
 
 ##################################################################

meta/conf/layer.conf +0 -4

index 76ae58c..43e4295 100644
@@ -11,11 +11,7 @@ BBFILE_PRIORITY_normal = "5"
 # Set a variable to get to the top of the metadata location
 COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}'
 
-# Add scripts to PATH
-PATH := "${PATH}:${COREBASE}/scripts"
-
 # Set path to qemu image tests included in this layer
-
 QEMUIMAGETESTS := "${COREBASE}/scripts/qemuimage-tests"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \