diff options
author | Paul Barker <paul@betafive.co.uk> | 2019-05-03 11:54:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-07 10:12:53 +0100 |
commit | 896b0c576923198fff865f1f3fb111c46fb60a2c (patch) | |
tree | abd47c16bafe265ed54014b7b28befc6cfff6d47 /meta/classes | |
parent | 10a14af4ca1f93538ed03eaf0bf17078312280f4 (diff) | |
download | poky-896b0c576923198fff865f1f3fb111c46fb60a2c.tar.gz |
license_image: Use new oe.path.copyhardlink() helper
This change allows us to support the placement of WORKDIR and DEPLOY_DIR
on different devices.
(From OE-Core rev: f064a581ba31764839459bd667130bccbbedefab)
Signed-off-by: Paul Barker <paul@betafive.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/license_image.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 67500386bf..6fb76be48e 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass | |||
@@ -102,7 +102,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
102 | rootfs_license_manifest = os.path.join(rootfs_license_dir, | 102 | rootfs_license_manifest = os.path.join(rootfs_license_dir, |
103 | os.path.split(license_manifest)[1]) | 103 | os.path.split(license_manifest)[1]) |
104 | if not os.path.exists(rootfs_license_manifest): | 104 | if not os.path.exists(rootfs_license_manifest): |
105 | os.link(license_manifest, rootfs_license_manifest) | 105 | oe.path.copyhardlink(license_manifest, rootfs_license_manifest) |
106 | 106 | ||
107 | if copy_lic_dirs == "1": | 107 | if copy_lic_dirs == "1": |
108 | for pkg in sorted(pkg_dic): | 108 | for pkg in sorted(pkg_dic): |
@@ -136,7 +136,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
136 | continue | 136 | continue |
137 | 137 | ||
138 | if not os.path.exists(rootfs_license): | 138 | if not os.path.exists(rootfs_license): |
139 | os.link(pkg_license, rootfs_license) | 139 | oe.path.copyhardlink(pkg_license, rootfs_license) |
140 | 140 | ||
141 | if not os.path.exists(pkg_rootfs_license): | 141 | if not os.path.exists(pkg_rootfs_license): |
142 | os.symlink(os.path.join('..', lic), pkg_rootfs_license) | 142 | os.symlink(os.path.join('..', lic), pkg_rootfs_license) |
@@ -146,7 +146,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
146 | os.path.exists(pkg_rootfs_license)): | 146 | os.path.exists(pkg_rootfs_license)): |
147 | continue | 147 | continue |
148 | 148 | ||
149 | os.link(pkg_license, pkg_rootfs_license) | 149 | oe.path.copyhardlink(pkg_license, pkg_rootfs_license) |
150 | # Fixup file ownership and permissions | 150 | # Fixup file ownership and permissions |
151 | for walkroot, dirs, files in os.walk(rootfs_license_dir): | 151 | for walkroot, dirs, files in os.walk(rootfs_license_dir): |
152 | for f in files: | 152 | for f in files: |