diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-09-29 11:19:22 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-29 12:12:26 +0100 |
| commit | 97dec8410b071660937fa1f30827a2926c21cca2 (patch) | |
| tree | e5a6b134ce025bebed4dc32f32fbd11dcd3f8e25 /meta/classes/sstate.bbclass | |
| parent | dd28a9c516017cf34c88d491875a61dfaf502d4c (diff) | |
| download | openembedded-core-contrib-97dec8410b071660937fa1f30827a2926c21cca2.tar.gz | |
sstate.bbclass: Update to use SSTATE variables everywhere and remove the now unneeded complicated paths from the sstate files
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/sstate.bbclass')
| -rw-r--r-- | meta/classes/sstate.bbclass | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d4e9965369..d405aaa752 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -1,15 +1,11 @@ -SSTATE_MANIFESTS = "${TMPDIR}/pstagelogs" -SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-${PN}" +SSTATE_VERSION = "1" +SSTATE_MANIFESTS = "${TMPDIR}/sstate-control" +SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_PKGARCH}-${PN}" SSTATE_PKGARCH = "${BASE_PACKAGE_ARCH}" -SSTATE_PKGVERSION = "${PV}-${PR}" -SSTATE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}" - -SSTATE_PKGNAME = "${SSTATE_PKGPN}_${SSTATE_PKGVERSION}_${SSTATE_PKGARCH}" -SSTATE_EXTRAPATH ?= "" -SSTATE_PKGPATH = "${DISTRO}/${OELAYOUT_ABI}${SSTATE_EXTRAPATH}" -SSTATE_PKG = "${PSTAGE_DIR}2/${SSTATE_PKGPATH}/${SSTATE_PKGNAME}" +SSTATE_PKGNAME = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}" +SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f" @@ -249,11 +245,11 @@ def pstaging_fetch(sstatepkg, d): import bb.fetch # only try and fetch if the user has configured a mirror - if bb.data.getVar('PSTAGE_MIRROR', d) != "": + if bb.data.getVar('SSTATE_MIRROR', d) != "": # Copy the data object and override DL_DIR and SRC_URI pd = d.createCopy() - dldir = bb.data.expand("${PSTAGE_DIR}/${SSTATE_PKGPATH}", pd) - mirror = bb.data.expand("${PSTAGE_MIRROR}/${SSTATE_PKGPATH}/", pd) + dldir = bb.data.expand("${SSTATE_DIR}", pd) + mirror = bb.data.expand("${SSTATE_MIRROR}/", pd) srcuri = mirror + os.path.basename(sstatepkg) bb.data.setVar('DL_DIR', dldir, pd) bb.data.setVar('SRC_URI', srcuri, pd) |