#
PSTAGE_PKGVERSION = "${PV}-${PR}"
PSTAGE_PKGARCH = "${BUILD_SYS}"
-PSTAGE_EXTRAPATH ?= ""
+PSTAGE_EXTRAPATH ?= "/${OELAYOUT_ABI}/${DISTRO_PR}/"
PSTAGE_PKGPATH = "${DISTRO}${PSTAGE_EXTRAPATH}"
PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}"
-PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk"
-PSTAGE_PKG = "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
-
-# multimachine.bbclass will override this but add a default in case we're not using it
-MULTIMACH_ARCH ?= "${PACKAGE_ARCH}"
+PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk"
+PSTAGE_PKG ?= "${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
PSTAGE_NATIVEDEPENDS = "\
- pkgconfig-native \
- autoconf-native \
- automake-native \
- curl-native \
- zlib-native \
- libtool-native \
- gnu-config-native \
shasum-native \
- libtool-native \
- automake-native \
- update-alternatives-cworth-native \
- ipkg-utils-native \
- opkg-native \
- m4-native \
- quilt-native \
stagemanager-native \
"
BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"
python () {
- import bb
pstage_allowed = True
# These classes encode staging paths into the binary data so can only be
if bb.data.inherits_class('image', d):
pstage_allowed = False
+ if bb.data.getVar('PSTAGING_DISABLED', d, True) == "1":
+ pstage_allowed = False
+
# Add task dependencies if we're active, otherwise mark packaged staging
# as inactive.
if pstage_allowed:
- deps = bb.data.getVarFlag('do_populate_staging', 'depends', d) or ""
- deps += " stagemanager-native:do_populate_staging"
- bb.data.setVarFlag('do_populate_staging', 'depends', deps, d)
-
deps = bb.data.getVarFlag('do_setscene', 'depends', d) or ""
- deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+ deps += " stagemanager-native:do_populate_staging"
bb.data.setVarFlag('do_setscene', 'depends', deps, d)
+
+ policy = bb.data.getVar("BB_STAMP_POLICY", d, True)
+ if policy == "whitelist" or policy == "full":
+ deps = bb.data.getVarFlag('do_setscene', 'recrdeptask', d) or ""
+ deps += " do_setscene"
+ bb.data.setVarFlag('do_setscene', 'recrdeptask', deps, d)
+
bb.data.setVar("PSTAGING_ACTIVE", "1", d)
else:
bb.data.setVar("PSTAGING_ACTIVE", "0", d)
}
-DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage"
-PSTAGE_MACHCONFIG = "${DEPLOY_DIR_PSTAGE}/opkg.conf"
+DEPLOY_DIR_PSTAGE ?= "${DEPLOY_DIR}/pstage"
+PSTAGE_MACHCONFIG = "${DEPLOY_DIR_PSTAGE}/opkg.conf"
-PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}"
-PSTAGE_INSTALL_CMD = "opkg-cl install -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_UPDATE_CMD = "opkg-cl update -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_REMOVE_CMD = "opkg-cl remove -force-depends -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
-PSTAGE_LIST_CMD = "opkg-cl list_installed -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR}"
+PSTAGE_PKGMANAGER = "stage-manager-ipkg"
+
+PSTAGE_BUILD_CMD = "stage-manager-ipkg-build -o 0 -g 0"
+PSTAGE_INSTALL_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${TMPDIR} install"
+PSTAGE_UPDATE_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR} update"
+PSTAGE_REMOVE_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${TMPDIR} remove"
+PSTAGE_LIST_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -o ${TMPDIR} list_installed"
PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg"
def pstage_manualclean(srcname, destvarname, d):
- import os, bb
-
src = os.path.join(bb.data.getVar('PSTAGE_TMPDIR_STAGE', d, True), srcname)
dest = bb.data.getVar(destvarname, d, True)
bb.note("rm %s" % filepath)
os.system("rm %s" % filepath)
-def pstage_cleanpackage(pkgname, d):
- import os, bb
+def pstage_set_pkgmanager(d):
+ path = bb.data.getVar("PATH", d, 1)
+ pkgmanager = bb.which(path, 'opkg-cl')
+ if pkgmanager == "":
+ pkgmanager = bb.which(path, 'ipkg-cl')
+ if pkgmanager != "":
+ bb.data.setVar("PSTAGE_PKGMANAGER", pkgmanager, d)
- path = bb.data.getVar("PATH", d, 1)
+
+def pstage_cleanpackage(pkgname, d):
+ path = bb.data.getVar("PATH", d, 1)
+ pstage_set_pkgmanager(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))
+ bb.debug(2, "Checking if staging package installed")
+ 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...")
+ bb.debug(1, "Uninstalling package from staging...")
removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, pkgname))
if ret != 0:
bb.note("Failure removing staging package")
else:
- bb.note("No. Manually removing any installed files")
+ bb.debug(1, "Manually removing any installed files from staging...")
pstage_manualclean("staging", "STAGING_DIR", d)
pstage_manualclean("cross", "CROSS_DIR", d)
pstage_manualclean("deploy", "DEPLOY_DIR", d)
bb.utils.unlockfile(lf)
do_clean_prepend() {
- """
- Clear the build and temp directories
- """
+ """
+ Clear the build and temp directories
+ """
removepkg = bb.data.expand("${PSTAGE_PKGPN}", d)
pstage_cleanpackage(removepkg, d)
- stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
- bb.note("Removing staging package %s" % stagepkg)
- os.system('rm -rf ' + stagepkg)
+ stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
+ bb.note("Removing staging package %s" % base_path_out(stagepkg, d))
+ os.system('rm -rf ' + stagepkg)
}
staging_helper () {
echo "arch $arch $priority" >> $conffile
priority=$(expr $priority + 5)
done
+ echo "dest root /" >> $conffile
+ fi
+ if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
+ mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
+ fi
+ if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
+ ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
fi
}
SCENEFUNCS += "packagestage_scenefunc"
python packagestage_scenefunc () {
- import os
-
if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0":
return
+ bb.build.exec_func("staging_helper", d)
+
removepkg = bb.data.expand("${PSTAGE_PKGPN}", d)
+
pstage_cleanpackage(removepkg, d)
stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
if os.path.exists(stagepkg):
- bb.note("Following speedup\n")
path = bb.data.getVar("PATH", d, 1)
- installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1)
-
- bb.build.exec_func("staging_helper", d)
-
- bb.debug(1, "Staging stuff already packaged, using that instead")
- lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
- ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
- bb.utils.unlockfile(lf)
+ pstage_set_pkgmanager(d)
+ file = bb.data.getVar("FILE", d, True)
+ bb.debug(2, "Packaged staging active for %s\n" % file)
+
+ #
+ # Install the staging package somewhere temporarily so we can extract the stamp files
+ #
+ bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir_native}/opkg/info/ ", d))
+ cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -force-depends -o ${WORKDIR}/tstage install", d)
+ ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg))
if ret != 0:
- bb.note("Failure installing prestage package")
+ bb.fatal("Couldn't install the staging package to a temp directory")
- bb.build.make_stamp("do_stage_package_populated", d)
+ #
+ # Copy the stamp files into the main stamps directoy
+ #
+ cmd = bb.data.expand("cp -dpR ${WORKDIR}/tstage/stamps/* ${TMPDIR}/stamps/", d)
+ ret = os.system(cmd)
+ if ret != 0:
+ bb.fatal("Couldn't copy the staging package stamp files")
+
+ #
+ # Iterate over the stamps seeing if they're valid. If we find any that
+ # are invalid or the task wasn't in the taskgraph, assume caution and
+ # do a rebuild.
+ #
+ # FIXME - some tasks are safe to ignore in the task graph. e.g. package_write_*
+ stageok = True
+ taskscovered = bb.data.getVar("PSTAGE_TASKS_COVERED", d, True).split()
+ stamp = bb.data.getVar("STAMP", d, True)
+ for task in taskscovered:
+ task = 'do_' + task
+ stampfn = "%s.%s" % (stamp, task)
+ bb.debug(1, "Checking %s" % (stampfn))
+ if os.path.exists(stampfn):
+ stageok = bb.runqueue.check_stamp_fn(file, task, d)
+ bb.debug(1, "Result %s" % (stageok))
+ if not stageok:
+ break
+
+ # Remove the stamps and files we added above
+ # FIXME - we should really only remove the stamps we added
+ os.system('rm -f ' + stamp + '.*')
+ os.system(bb.data.expand("rm -rf ${WORKDIR}/tstage", d))
+
+ 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("${SYSROOT_LOCK}", d))
+ ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
+ bb.utils.unlockfile(lf)
+ if ret != 0:
+ bb.note("Failure installing prestage package")
+
+ bb.build.make_stamp("do_stage_package_populated", d)
+ else:
+ bb.note("Staging package found but invalid for %s" % file)
}
packagestage_scenefunc[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
addhandler packagedstage_stampfixing_eventhandler
python packagedstage_stampfixing_eventhandler() {
- from bb.event import getName
- import os
-
- if getName(e) == "StampUpdate":
+ if bb.event.getName(e) == "StampUpdate":
taskscovered = bb.data.getVar("PSTAGE_TASKS_COVERED", e.data, 1).split()
for (fn, task) in e.targets:
# strip off 'do_'
# list the packages currently installed in staging
# ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list
+ # exitcode == 5 is ok, it means the files change
set +e
stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging
- stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+ exitcode=$?
+ if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
+ exit $exitcode
+ fi
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
+ if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
+ exit $exitcode
+ fi
set -e
fi
}
-do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
+packagedstaging_fastpath () {
+ if [ "$PSTAGING_ACTIVE" = "1" ]; then
+ mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
+ mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
+ cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
+ cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
+ fi
+}
+
do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
-python do_populate_staging_prepend() {
+python populate_staging_prehook() {
bb.build.exec_func("populate_staging_preamble", d)
}
-python do_populate_staging_append() {
+python populate_staging_posthook() {
bb.build.exec_func("populate_staging_postamble", d)
}
fi
${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGPATH}
- ${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
}
staging_package_installer () {
#${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}
- STATUSFILE=${TMPDIR}${layout_libdir}/opkg/status
+ STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE
echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE
echo "Status: install user installed" >> $STATUSFILE
echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
echo "" >> $STATUSFILE
+
+ CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control
+ echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE
+ echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE
+ echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE
+
+ cd ${PSTAGE_TMPDIR_STAGE}
+ find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list
}
python do_package_stage () {
ipkpath = bb.data.getVar('DEPLOY_DIR_IPK', d, True).replace(tmpdir, stagepath)
if bb.data.inherits_class('package_deb', d):
debpath = bb.data.getVar('DEPLOY_DIR_DEB', d, True).replace(tmpdir, stagepath)
+ if bb.data.inherits_class('package_rpm', d):
+ rpmpath = bb.data.getVar('DEPLOY_DIR_RPM', d, True).replace(tmpdir, stagepath)
for pkg in packages:
pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
if not packaged(pkg, d):
continue
if bb.data.inherits_class('package_ipk', d):
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d)
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_" + arch + ".ipk", d)
srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d)
if os.path.exists(srcfile):
destpath = ipkpath + "/" + arch + "/"
if bb.data.inherits_class('package_deb', d):
if arch == 'all':
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_all.deb", d)
- else:
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d)
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_all.deb", d)
+ else:
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_${DPKG_ARCH}.deb", d)
srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d)
if os.path.exists(srcfile):
destpath = debpath + "/" + arch + "/"
bb.mkdirhier(destpath)
bb.copyfile(srcfile, destpath + srcname)
+ if bb.data.inherits_class('package_rpm', d):
+ version = bb.data.getVar('PV', d, 1)
+ version = version.replace('-', '+')
+ bb.data.setVar('RPMPV', version, d)
+ srcname = bb.data.expand(pkgname + "-${RPMPV}-" + pr + "${DISTRO_PR}" + ".${TARGET_ARCH}.rpm", d)
+ srcfile = bb.data.expand("${DEPLOY_DIR_RPM}/" + arch + "/" + srcname, d)
+ if os.path.exists(srcfile):
+ destpath = rpmpath + "/" + arch + "/"
+ bb.mkdirhier(destpath)
+ bb.copyfile(srcfile, destpath + srcname)
+
+
#
# Handle stamps/ files
#
bb.build.make_stamp("do_package_stage", d)
os.system("cp -dpR %s.do_* %s/" % (stampfn, destdir))
+ 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)
}
}
do_package_stage_all[recrdeptask] = "do_package_stage"
addtask package_stage_all after do_package_stage before do_build
-
-
-
-
projects / vuplus_openembedded / blobdiff