summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-10-06 15:01:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:24 +0100
commitf33afade31d2ac2f5457f4131c2c35207606b846 (patch)
treee04f5b372e5794c02293462f3ccfa889b10f769a
parent049627735f3fa9aa85701d5257324260eec951aa (diff)
downloadpoky-f33afade31d2ac2f5457f4131c2c35207606b846.tar.gz
bitbake.conf: Remove double slash from PATH_prepend and PKG_CONFIG_DIR
* we correctly have ${STAGING_DIR_NATIVE}${base_sbindir_native} and then double slash in ${STAGING_DIR_NATIVE}/${base_bindir_native} * similar in PKG_CONFIG_DIR where libdir also starts with slash ${STAGING_DIR_HOST}/${libdir}/pkgconfig * also fix double slash in insane.bbclass and staging.bbclass * I was a bit nervous about staging change (in case the / was important in some weird use-case, but the extra slash is there since following commit where other extra slashes were removed only the one before libdir was kept: commit 6ea78d648951e5bbe9669412c0863daaf7f49ca5 Author: Richard Purdie <rpurdie@linux.intel.com> Date: Mon Nov 2 17:10:51 2009 +0000 autotools.bbclass: Separate out useful staging functions into base.bbclass and call from autotools classes * this isn't fixing any real-world issue AFAIK, I was just trying to debug one weird case where debugedit fails with canonicalization unexpectedly shrank by one character and it's easier to grep for '//' without many harmless instances already in run* scripts etc (From OE-Core rev: 0ddaf52e9e344986ae2b016cc068d9eee71b4347) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/staging.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a784aff3a9..7ef3d8e0a0 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -861,7 +861,7 @@ python do_package_qa () {
861python do_qa_staging() { 861python do_qa_staging() {
862 bb.note("QA checking staging") 862 bb.note("QA checking staging")
863 863
864 if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}/${STAGING_LIBDIR}'), d): 864 if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${STAGING_LIBDIR}'), d):
865 bb.fatal("QA staging was broken by the package built above") 865 bb.fatal("QA staging was broken by the package built above")
866} 866}
867 867
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index ae1c546ad6..814f7bc490 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -40,7 +40,7 @@ sysroot_stage_dirs() {
40 fi 40 fi
41 if [ -d $from${libdir} ] 41 if [ -d $from${libdir} ]
42 then 42 then
43 sysroot_stage_libdir $from/${libdir} $to${libdir} 43 sysroot_stage_libdir $from${libdir} $to${libdir}
44 fi 44 fi
45 if [ -d $from${base_libdir} ] 45 if [ -d $from${base_libdir} ]
46 then 46 then
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 47d2171775..5146808cde 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -426,7 +426,7 @@ EXTRA_IMAGEDEPENDS = ""
426# Toolchain info. 426# Toolchain info.
427################################################################## 427##################################################################
428 428
429PATH_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}:" 429PATH_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}:"
430export PATH 430export PATH
431 431
432################################################################## 432##################################################################
@@ -643,7 +643,7 @@ BUILDCFG_NEEDEDVARS[type] = "list"
643 643
644# Other 644# Other
645 645
646export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig" 646export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
647export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" 647export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
648export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" 648export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}"
649export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 649export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"