diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 599df246f0..fbb68391b9 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1304,17 +1304,8 @@ python package_do_filedeps() { | |||
1304 | d.setVar("FILERPROVIDESFLIST_" + pkg, " ".join(provides_files[pkg])) | 1304 | d.setVar("FILERPROVIDESFLIST_" + pkg, " ".join(provides_files[pkg])) |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | def getshlibsdirs(d): | 1307 | SHLIBSDIRS = "${PKGDATA_DIR}/${MLPREFIX}shlibs" |
1308 | dirs = [] | 1308 | SHLIBSWORKDIR = "${PKGDESTWORK}/${MLPREFIX}shlibs" |
1309 | triplets = (d.getVar("PKGTRIPLETS") or "").split() | ||
1310 | for t in triplets: | ||
1311 | dirs.append("${TMPDIR}/pkgdata/" + t + "/shlibs/") | ||
1312 | return " ".join(dirs) | ||
1313 | getshlibsdirs[vardepsexclude] = "PKGTRIPLETS" | ||
1314 | |||
1315 | SHLIBSDIRS = "${@getshlibsdirs(d)}" | ||
1316 | SHLIBSDIR = "${TMPDIR}/pkgdata/${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/shlibs" | ||
1317 | SHLIBSWORKDIR = "${PKGDESTWORK}/shlibs" | ||
1318 | 1309 | ||
1319 | python package_do_shlibs() { | 1310 | python package_do_shlibs() { |
1320 | import re, pipes | 1311 | import re, pipes |
@@ -1953,6 +1944,7 @@ do_packagedata[sstate-name] = "packagedata" | |||
1953 | do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" | 1944 | do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" |
1954 | do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" | 1945 | do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" |
1955 | do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" | 1946 | do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" |
1947 | do_packagedata[stamp-extra-info] = "${MACHINE}" | ||
1956 | 1948 | ||
1957 | python do_packagedata_setscene () { | 1949 | python do_packagedata_setscene () { |
1958 | sstate_setscene(d) | 1950 | sstate_setscene(d) |