diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/allarch.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/buildhistory.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/license.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/multilib.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 14 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/packageinfo.bbclass | 35 |
9 files changed, 25 insertions, 43 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 8669470e60..5e13a5b8a8 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -2,6 +2,10 @@ # This class is used for architecture independent recipes/data files (usally scripts) # +# Expand STAGING_DIR_HOST since for cross-canadian/native/nativesdk, this will +# point elsewhere after these changes. +STAGING_DIR_HOST := "${STAGING_DIR_HOST}" + PACKAGE_ARCH = "all" python () { diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 080f2c79b3..3da03c8485 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -340,7 +340,7 @@ buildhistory_get_installed() { cat $pkgcache | while read pkg pkgfile pkgarch do for vendor in ${TARGET_VENDOR} ${MULTILIB_VENDORS} ; do - size=`oe-pkgdata-util read-value ${TMPDIR}/pkgdata $vendor-${TARGET_OS} "PKGSIZE" ${pkg}_${pkgarch}` + size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}` if [ "$size" != "" ] ; then echo "$size $pkg" >> $1/installed-package-sizes.tmp fi diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 87dd9948e7..c22be1a030 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -31,7 +31,6 @@ STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}" PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}" -PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}" PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/" HOST_ARCH = "${SDK_ARCH}" @@ -89,10 +88,6 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -# Cross-canadian packages need to pull in nativesdk dynamic libs -SHLIBSDIRS = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/ ${TMPDIR}/pkgdata/all-${HOST_VENDOR}-${HOST_OS}/shlibs/" -SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/" - do_populate_sysroot[stamp-extra-info] = "" USE_NLS = "${SDKUSE_NLS}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index f1e62f1454..889547a441 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -484,7 +484,7 @@ rootfs_install_complementary() { # Use the magic script to do all the work for us :) : > ${WORKDIR}/complementary_pkgs.txt for vendor in '${TARGET_VENDOR}' ${MULTILIB_VENDORS} ; do - oe-pkgdata-util glob ${TMPDIR}/pkgdata $vendor-${TARGET_OS} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt + oe-pkgdata-util glob ${PKGDATA_DIR} ${WORKDIR}/installed_pkgs.txt "$GLOBS" >> ${WORKDIR}/complementary_pkgs.txt done # Install the packages, if any diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 621c1b2f55..0160313e2e 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -28,8 +28,7 @@ license_create_manifest() { fi touch ${LICENSE_MANIFEST} for pkg in ${INSTALLED_PKGS}; do - # not the best way to do this but licenses are not arch dependant iirc - filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1` + filename=`ls ${PKGDATA_DIR}/runtime-reverse/${pkg}| head -1` pkged_pn="$(sed -n 's/^PN: //p' ${filename})" # check to see if the package name exists in the manifest. if so, bail. diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index dac160e17e..9503096245 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -47,7 +47,6 @@ python multilib_virtclass_handler () { e.data.setVar("MLPREFIX", variant + "-") e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) - e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) # Expand the WHITELISTs with multilib prefix 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() { d.setVar("FILERPROVIDESFLIST_" + pkg, " ".join(provides_files[pkg])) } -def getshlibsdirs(d): - dirs = [] - triplets = (d.getVar("PKGTRIPLETS") or "").split() - for t in triplets: - dirs.append("${TMPDIR}/pkgdata/" + t + "/shlibs/") - return " ".join(dirs) -getshlibsdirs[vardepsexclude] = "PKGTRIPLETS" - -SHLIBSDIRS = "${@getshlibsdirs(d)}" -SHLIBSDIR = "${TMPDIR}/pkgdata/${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/shlibs" -SHLIBSWORKDIR = "${PKGDESTWORK}/shlibs" +SHLIBSDIRS = "${PKGDATA_DIR}/${MLPREFIX}shlibs" +SHLIBSWORKDIR = "${PKGDESTWORK}/${MLPREFIX}shlibs" python package_do_shlibs() { import re, pipes @@ -1953,6 +1944,7 @@ do_packagedata[sstate-name] = "packagedata" do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" +do_packagedata[stamp-extra-info] = "${MACHINE}" python do_packagedata_setscene () { sstate_setscene(d) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 2a7e1642f8..fd861e980d 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -109,7 +109,7 @@ translate_smart_to_oe() { fi # Workaround for bug 3565 # Simply look to see if we know of a package with that name, if not try again! - filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/$new_pkg 2>/dev/null | head -n 1` + filename=`ls ${PKGDATA_DIR}/runtime-reverse/$new_pkg 2>/dev/null | head -n 1` if [ -n "$filename" ] ; then found=1 break diff --git a/meta/classes/packageinfo.bbclass b/meta/classes/packageinfo.bbclass index 42fcd04150..7d60ace1dc 100644 --- a/meta/classes/packageinfo.bbclass +++ b/meta/classes/packageinfo.bbclass @@ -1,27 +1,20 @@ python packageinfo_handler () { import oe.packagedata pkginfolist = [] - tmpdir = e.data.getVar('TMPDIR', True) - target_vendor = e.data.getVar('TARGET_VENDOR', True) - target_os = e.data.getVar('TARGET_OS', True) - package_archs = e.data.getVar('PACKAGE_ARCHS', True) - packaging = e.data.getVar('PACKAGE_CLASSES', True).split()[0].split('_')[1] - deploy_dir = e.data.getVar('DEPLOY_DIR', True) + '/' + packaging - - for arch in package_archs.split(): - pkgdata_dir = tmpdir + '/pkgdata/' + arch + target_vendor + '-' + target_os + '/runtime/' - if os.path.exists(pkgdata_dir): - for root, dirs, files in os.walk(pkgdata_dir): - for pkgname in files: - if pkgname.endswith('.packaged'): - pkgname = pkgname[:-9] - pkgdatafile = root + pkgname - try: - sdata = oe.packagedata.read_pkgdatafile(pkgdatafile) - sdata['PKG'] = pkgname - pkginfolist.append(sdata) - except Exception as e: - bb.warn("Failed to read pkgdata file %s: %s: %s" % (pkgdatafile, e.__class__, str(e))) + + pkgdata_dir = e.data.getVar("PKGDATA_DIR", True) + '/runtime/' + if os.path.exists(pkgdata_dir): + for root, dirs, files in os.walk(pkgdata_dir): + for pkgname in files: + if pkgname.endswith('.packaged'): + pkgname = pkgname[:-9] + pkgdatafile = root + pkgname + try: + sdata = oe.packagedata.read_pkgdatafile(pkgdatafile) + sdata['PKG'] = pkgname + pkginfolist.append(sdata) + except Exception as e: + bb.warn("Failed to read pkgdata file %s: %s: %s" % (pkgdatafile, e.__class__, str(e))) bb.event.fire(bb.event.PackageInfo(pkginfolist), e.data) } |