diff options
| -rw-r--r-- | meta/classes/package.bbclass | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 7a8ebf4716..8e5d9b425f 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -548,15 +548,14 @@ python package_do_shlibs() { bb.error("PV not defined") return - target_sys = bb.data.getVar('TARGET_SYS', d, 1) - if not target_sys: - bb.error("TARGET_SYS not defined") + host_sys = bb.data.getVar('HOST_SYS', d, 1) + if not host_sys: + bb.error("HOST_SYS not defined") return pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = os.path.join(staging, target_sys, "shlibs") - old_shlibs_dir = os.path.join(staging, "shlibs") + shlibs_dir = os.path.join(staging, host_sys, "shlibs") bb.mkdirhier(shlibs_dir) needed = {} @@ -613,7 +612,7 @@ python package_do_shlibs() { shlib_provider = {} list_re = re.compile('^(.*)\.list$') - for dir in [old_shlibs_dir, shlibs_dir]: + for dir in [shlibs_dir]: if not os.path.exists(dir): continue for file in os.listdir(dir): @@ -678,15 +677,14 @@ python package_do_pkgconfig () { bb.error("STAGING_DIR not defined") return - target_sys = bb.data.getVar('TARGET_SYS', d, 1) - if not target_sys: - bb.error("TARGET_SYS not defined") + host_sys = bb.data.getVar('HOST_SYS', d, 1) + if not host_sys: + bb.error("HOST_SYS not defined") return pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = os.path.join(staging, target_sys, "shlibs") - old_shlibs_dir = os.path.join(staging, "shlibs") + shlibs_dir = os.path.join(staging, host_sys, "shlibs") bb.mkdirhier(shlibs_dir) pc_re = re.compile('(.*)\.pc$') @@ -736,7 +734,7 @@ python package_do_pkgconfig () { f.write('%s\n' % p) f.close() - for dir in [old_shlibs_dir, shlibs_dir]: + for dir in [shlibs_dir]: if not os.path.exists(dir): continue for file in os.listdir(dir): |