diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-10 16:54:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-12 22:01:56 +0100 |
commit | 6a2ad60ecc7739d7dbfdf74d67200df374bca4ef (patch) | |
tree | 0012a7044a5a9cd98ea0c2fdbbe19e13384a6926 /scripts | |
parent | c40f78b267bab09925f4879dbfbb6ec2f837187c (diff) | |
download | poky-master.tar.gz |
Currently, pseudo tracks all files referenced within its presence unless
they're listed in an exclusion list. The exclusion list has grown to be
fairly unwieldy.
This patch swaps PSEUDO_IGNORE_PATHS for PSEUDO_INCLUDE_PATHS which in
theory should be easier and more explicit to maintain.
This change does drop many directories from pseudo coverage including
/home and /tmp. There may be adapatations needed for recipes/classes
using pseudo in specific ways.
(From OE-Core rev: 2502da81709f25de499277b28d33c915638c45f6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/partition.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index b18431d8fb..5b51ab214f 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py | |||
@@ -222,19 +222,19 @@ class Partition(): | |||
222 | if (pseudo_dir): | 222 | if (pseudo_dir): |
223 | # Canonicalize the ignore paths. This corresponds to | 223 | # Canonicalize the ignore paths. This corresponds to |
224 | # calling oe.path.canonicalize(), which is used in bitbake.conf. | 224 | # calling oe.path.canonicalize(), which is used in bitbake.conf. |
225 | ignore_paths = [rootfs] + (get_bitbake_var("PSEUDO_IGNORE_PATHS") or "").split(",") | 225 | include_paths = [rootfs_dir] + (get_bitbake_var("PSEUDO_INCLUDE_PATHS") or "").split(",") |
226 | canonical_paths = [] | 226 | canonical_paths = [] |
227 | for path in ignore_paths: | 227 | for path in include_paths: |
228 | if "$" not in path: | 228 | if "$" not in path: |
229 | trailing_slash = path.endswith("/") and "/" or "" | 229 | trailing_slash = path.endswith("/") and "/" or "" |
230 | canonical_paths.append(os.path.realpath(path) + trailing_slash) | 230 | canonical_paths.append(os.path.realpath(path) + trailing_slash) |
231 | ignore_paths = ",".join(canonical_paths) | 231 | include_paths = ",".join(canonical_paths) |
232 | 232 | ||
233 | pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix | 233 | pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix |
234 | pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir | 234 | pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir |
235 | pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir | 235 | pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir |
236 | pseudo += "export PSEUDO_NOSYMLINKEXP=1;" | 236 | pseudo += "export PSEUDO_NOSYMLINKEXP=1;" |
237 | pseudo += "export PSEUDO_IGNORE_PATHS=%s;" % ignore_paths | 237 | pseudo += "export PSEUDO_INCLUDE_PATHS=%s;" % include_paths |
238 | pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") | 238 | pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") |
239 | else: | 239 | else: |
240 | pseudo = None | 240 | pseudo = None |