[OE-core] [PATCH] lib/oe: copyhardlinktree - detect mount points Add function getmount to detect the mount point of the path, as os.stat(path).st_dev in copyhardlinktree fails in lxc containers to detect different paths as separate mounted filesystems (cp -l failure)
Saul Wold
sgw at linux.intel.com
Fri Jan 17 21:34:00 UTC 2014
On 01/16/2014 02:08 PM, Jason Plum wrote:
> Signed-off-by: Jason Plum <jplum at devonit.com>
> ---
> meta/lib/oe/path.py | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
This patch did not apply cleanly, it's possible you patched against an
older version of master.
> diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
> index 1310e38..f1905c3 100644
> --- a/meta/lib/oe/path.py
> +++ b/meta/lib/oe/path.py
> @@ -90,7 +90,7 @@ def copyhardlinktree(src, dst):
> if os.path.isdir(src) and not len(os.listdir(src)):
> return
>
> - if (os.stat(src).st_dev == os.stat(dst).st_dev):
> + if (getmount(src) == getmount(dst)):
Can you measure the affect on build time with this change?
> # Need to copy directories only with tar first since cp will error if two
> # writers try and create a directory at the same time
> cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - | tar -xf - -C %s' % (src, src, dst)
> @@ -259,3 +259,12 @@ def realpath(file, root, use_physdir = True, loop_cnt = 100, assume_dir = False)
> raise
>
> return file
> +
> +def getmount(path):
> + """ Returns the mount point of the path, using realpath """
> + path = realpath(path)
In current master, realpath() seems to need 2 args:
Exception: TypeError: realpath() takes at least 2 arguments (1 given)
Sau!
> + while path != os.path.sep:
> + if os.path.ismount(path):
> + return path
> + path = os.path.abspath(os.path.join(path, os.pardir))
> + return path
>
More information about the Openembedded-core
mailing list