rendered paste body16,17c16,17
< PSTAGE_EXTRAPATH ?= "/${OELAYOUT_ABI}/${DISTRO_PR}/"
< PSTAGE_PKGPATH = "${DISTRO}${PSTAGE_EXTRAPATH}"
---
> PSTAGE_EXTRAPATH ?= ""
> PSTAGE_PKGPATH = "${DISTRO}/${OELAYOUT_ABI}${PSTAGE_EXTRAPATH}"
20c20
< PSTAGE_PKG ?= "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
---
> PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
65a66,85
>
> #
> # Here we notice if the staging function is one of our standard staging
> # routines. If it is, we can remvoe the need to lock staging and take
> # timestamps which gives a nice speedup
> #
> fastpath = False
> stagefunc = bb.data.getVar('do_stage', d, 1).strip()
> if stagefunc == "autotools_stage_all":
> fastpath = True
> elif stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
> fastpath = True
> if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1":
> fastpath = False
> if fastpath:
> #bb.note("Can optimise " + bb.data.getVar('FILE', d, 1))
> bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d)
> bb.data.setVar("STAGE_TEMP_PREFIX", "${WORKDIR}/temp-staging-pstage", d)
> else:
> bb.data.setVar("PSTAGING_NEEDSTAMP", "1", d)
90a111,113
> # Avoid breaking the held lock
> if (file == "staging.lock"):
> continue
92,93c115
< bb.note("rm %s" % filepath)
< os.system("rm %s" % filepath)
---
> os.system("rm %s 2> /dev/null" % filepath)
112c134
< bb.debug(2, "Checking if staging package installed")
---
> bb.note("Checking if staging package installed")
116c138
< bb.debug(1, "Uninstalling package from staging...")
---
> bb.note("Yes. Uninstalling package from staging...")
122c144
< bb.debug(1, "Manually removing any installed files from staging...")
---
> bb.note("No. Manually removing any installed files")
138c160
< bb.note("Removing staging package %s" % base_path_out(stagepkg, d))
---
> bb.note("Removing staging package %s" % stagepkg)
160c182
< ln -sf opkg/ ipkg
---
> ln -sf opkg/ ipkg || true
236a260,261
> bb.build.exec_func("staging_package_libtoolhack", d)
>
295c320,326
< do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
---
> autotools_staging_pstage () {
> mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
> cp -fpPR ${WORKDIR}/temp-staging-pstage/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
> cp -fpPR ${WORKDIR}/temp-staging-pstage/${STAGING_DIR}/* ${STAGING_DIR}/ || /bin/true
> }
>
> #do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
297a329,333
> needstamp = bb.data.getVar("PSTAGING_NEEDSTAMP", d, 1)
> pstageactive = bb.data.getVar("PSTAGING_ACTIVE", d, True)
> lock = bb.data.expand("${STAGING_DIR}/staging.lock", d)
> if needstamp == "1":
> stamplock = bb.utils.lockfile(lock)
301a338
> if needstamp == "1":
302a340,344
> bb.utils.unlockfile(stamplock)
> elif pstageactive == "1":
> stamplock = bb.utils.lockfile(lock)
> bb.build.exec_func("autotools_staging_pstage", d)
> bb.utils.unlockfile(stamplock)
320,323c362,364
< if [ "${SRC_URI}" != "" ] ; then
< echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
< else
< echo "Source: OpenEmbedded" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
---
> srcuri="${SRC_URI}"
> if [ "$srcuri" == "" ]; then
> srcuri="OpenEmbedded"
324a366,374
> echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
>
> # Deal with libtool not supporting sysroots
> # Need to remove hardcoded paths and fix these when we install the
> # staging packages.
> # Could someone please add sysroot support to libtool!
> for i in `find ${PSTAGE_TMPDIR_STAGE} -name "*.la" -type f` ; do \
> sed -i -e s:${STAGING_DIR}:FIXMESTAGINGDIR:g $i
> done
347a398,405
> staging_package_libtoolhack () {
> # Deal with libtool not supporting sysroots and add our new
> # staging location
> for i in `find ${STAGING_DIR} -name "*.la" -type f` ; do \
> sed -i -e s:FIXMESTAGINGDIR:${STAGING_DIR}:g $i
> done
> }
>