diff options
Diffstat (limited to 'meta/classes/package.bbclass')
| -rw-r--r-- | meta/classes/package.bbclass | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 60d3df7789..e8d7aefd86 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -217,7 +217,7 @@ python () { d.appendVarFlag('do_package', 'depends', deps) # shlibs requires any DEPENDS to have already packaged for the *.list files - d.appendVarFlag('do_package', 'deptask', " do_package") + d.appendVarFlag('do_package', 'deptask', " do_packagedata") elif not bb.data.inherits_class('image', d): d.setVar("PACKAGERDEPTASK", "") @@ -1900,9 +1900,7 @@ PACKAGELOCK = "${STAGING_DIR}/package-output.lock" SSTATETASKS += "do_package" do_package[sstate-name] = "package" do_package[cleandirs] = "${PKGDESTWORK}" -do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST}" -do_package[sstate-inputdirs] = "${PKGDESTWORK}" -do_package[sstate-outputdirs] = "${PKGDATA_DIR}" +do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST} ${PKGDESTWORK}" do_package[sstate-lockfile-shared] = "${PACKAGELOCK}" do_package_setscene[dirs] = "${STAGING_DIR}" @@ -1911,6 +1909,23 @@ python do_package_setscene () { } addtask do_package_setscene +do_packagedata () { + : +} + +addtask packagedata before do_build after do_package + +SSTATETASKS += "do_packagedata" +do_packagedata[sstate-name] = "packagedata" +do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" +do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" +do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" + +python do_packagedata_setscene () { + sstate_setscene(d) +} +addtask do_packagedata_setscene + # Dummy task to mark when all packaging is complete do_package_write () { : @@ -1918,7 +1933,7 @@ do_package_write () { do_package_write[noexec] = "1" PACKAGERDEPTASK = "do_package_write" do_build[recrdeptask] += "${PACKAGERDEPTASK}" -addtask package_write before do_build after do_package +addtask package_write before do_build after do_packagedata # # Helper functions for the package writing classes |