diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-12-09 18:05:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-12 14:25:14 +0000 |
| commit | 6df2d6ed74eb6e8997fc4b861ad7fbaf4aa3c12b (patch) | |
| tree | d3180f79d0f6b2c42b2c6efbb36724481a1648f9 /meta/conf | |
| parent | 4f7fddd8483c9ff012ac192478f52ed45e8fdb33 (diff) | |
| download | poky-6df2d6ed74eb6e8997fc4b861ad7fbaf4aa3c12b.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: c54646582ba8ef0a0247a0fa863db26671d4fd77)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1f2a497daa09cf3459e27ad6e0e8513938b52c79)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
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 |
| 694 | FAKEROOTBASEENV = "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" | 694 | FAKEROOTBASEENV = "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" |
| 695 | FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" | 695 | FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" |
| 696 | FAKEROOTENV = "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" | 696 | FAKEROOTENV = "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" |
| 697 | FAKEROOTNOENV = "PSEUDO_UNLOAD=1" | 697 | FAKEROOTNOENV = "PSEUDO_UNLOAD=1" |
| 698 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" | 698 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" |
| 699 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" | 699 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" |