mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
wic/rootfs.py: allow --exclude-path option to exclude symlinks
Currently, if we specify a symbolic link in --exclude-path option, we will get the following error in do_image_wic: ERROR: --exclude-path: Must point inside the rootfs: usr/bin/hello.link This is because it uses os.path.realpath to eliminate symbolic links. To exclude symbolic links, use os.path.abspath instead of os.path.realpath. (From OE-Core rev: 42e829ac1e9d74646b6dfb327b18b15f6b0df60b) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -41,7 +41,7 @@ class RootfsPlugin(SourcePlugin):
|
||||
# Disallow climbing outside of parent directory using '..',
|
||||
# because doing so could be quite disastrous (we will delete the
|
||||
# directory, or modify a directory outside OpenEmbedded).
|
||||
full_path = os.path.realpath(os.path.join(rootfs_dir, path))
|
||||
full_path = os.path.abspath(os.path.join(rootfs_dir, path))
|
||||
if not full_path.startswith(os.path.realpath(rootfs_dir)):
|
||||
logger.error("%s: Must point inside the rootfs: %s" % (cmd, path))
|
||||
sys.exit(1)
|
||||
|
||||
Reference in New Issue
Block a user