summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2020-12-09 18:05:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-20 00:03:04 +0000
commitfcfda37195ae4eecebcaf8fb74844f7071b4fc7e (patch)
treee26c3a19bfacd50d267c0f6dfabd8a78ed4ab067 /meta/conf
parentc37aed34afbb61df6e6156857d523b69bfc1c4fe (diff)
downloadpoky-fcfda37195ae4eecebcaf8fb74844f7071b4fc7e.tar.gz
bitbake.conf: Canonicalize paths in PSEUDO_IGNORE_PATHS
Use oe.path.canonicalize() to canonicalize the paths in PSEUDO_IGNORE_PATHS before passing them to pseudo. This is needed since pseudo will compare them to paths that are canonicalized. (From OE-Core rev: 1f2a497daa09cf3459e27ad6e0e8513938b52c79) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0d38eac094..812cd05102 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -691,9 +691,9 @@ export PSEUDO_DISABLED = "1"
691#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" 691#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
692#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" 692#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
693#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib 693#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib
694FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=1" 694FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=1"
695FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" 695FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo"
696FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=0" 696FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=0"
697FAKEROOTNOENV = "PSEUDO_UNLOAD=1" 697FAKEROOTNOENV = "PSEUDO_UNLOAD=1"
698FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 698FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
699PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" 699PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"