sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

packaged-staging.bbclass: Use a variable for the location of the staging lock file 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-11-02 17:38:44 +00:00
parent 3c83baeb26
commit a1d93ee326
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/base.bbclass
View File

@ -998,6 +998,7 @@ addtask populate_staging after do_install
SYSROOT_PREPROCESS_FUNCS ?= ""
SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
python do_populate_staging () {
#

9
meta/classes/packaged-staging.bbclass
View File

@ -135,7 +135,7 @@ def pstage_cleanpackage(pkgname, d):
list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True)
bb.note("Checking if staging package installed")
lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d))
ret = os.system("PATH=\"%s\" %s | grep %s" % (path, list_cmd, pkgname))
if ret == 0:
bb.note("Yes. Uninstalling package from staging...")
@ -254,7 +254,7 @@ python packagestage_scenefunc () {
if stageok:
bb.note("Staging package found, using it for %s." % file)
installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1)
lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d))
ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
bb.utils.unlockfile(lf)
if ret != 0:
@ -326,12 +326,11 @@ autotools_staging_pstage () {
cp -fpPR ${WORKDIR}/temp-staging-pstage/${STAGING_DIR}/* ${STAGING_DIR}/ || /bin/true
}
#do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
python do_populate_staging_prepend() {
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)
lock = bb.data.expand("${SYSROOT_LOCK}", d)
if needstamp == "1":
stamplock = bb.utils.lockfile(lock)
bb.build.exec_func("populate_staging_preamble", d)
@ -481,7 +480,7 @@ python do_package_stage () {
pstage_set_pkgmanager(d)
bb.build.exec_func("staging_helper", d)
bb.build.exec_func("staging_packager", d)
lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d))
bb.build.exec_func("staging_package_installer", d)
bb.utils.unlockfile(lf)
}