diff options
-rw-r--r-- | meta/classes/debian.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/package.bbclass | 25 | ||||
-rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_tar.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/sstate.bbclass | 6 | ||||
-rw-r--r-- | meta/recipes-core/meta/package-index.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-package-cross.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-package-runtime.inc | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/libgcc_4.7.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer_1.0.bb | 1 |
14 files changed, 41 insertions, 21 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 2484003e37d..45f01e43cd5 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass @@ -8,7 +8,7 @@ # # Better expressed as ensure all RDEPENDS package before we package # This means we can't have circular RDEPENDS/RRECOMMENDS -DEBIANRDEP = "do_package" +DEBIANRDEP = "do_packagedata" do_package_write_ipk[rdeptask] = "${DEBIANRDEP}" do_package_write_deb[rdeptask] = "${DEBIANRDEP}" do_package_write_tar[rdeptask] = "${DEBIANRDEP}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0293d2e3583..9b4dec84965 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -83,7 +83,7 @@ LDCONFIGDEPEND_libc-uclibc = "" do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" -do_rootfs[recrdeptask] += "do_package" +do_rootfs[recrdeptask] += "do_packagedata" IMAGE_TYPE_live = '${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}' inherit image-${IMAGE_TYPE_live} @@ -480,6 +480,7 @@ do_compile[noexec] = "1" do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" do_package[noexec] = "1" +do_packagedata[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_deb[noexec] = "1" do_package_write_rpm[noexec] = "1" diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index c08ca19b78c..bfc9e4c7db4 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -151,6 +151,7 @@ python native_virtclass_handler () { addhandler native_virtclass_handler do_package[noexec] = "1" +do_packagedata[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_deb[noexec] = "1" do_package_write_rpm[noexec] = "1" diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 60d3df7789d..e8d7aefd86a 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 diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index eed9b8ac3bd..ac8c9f32751 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -453,7 +453,7 @@ python do_package_write_deb () { } do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[umask] = "022" -addtask package_write_deb before do_package_write after do_package +addtask package_write_deb before do_package_write after do_packagedata do_package PACKAGEINDEXES += "package_update_index_deb;" diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index b441e86c0a8..ad4ea53ca9b 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -477,7 +477,7 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[umask] = "022" -addtask package_write_ipk before do_package_write after do_package +addtask package_write_ipk before do_package_write after do_packagedata do_package PACKAGEINDEXES += "package_update_index_ipk;" PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index dc8a54e1f81..af51d80627f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -1126,7 +1126,7 @@ python do_package_write_rpm () { do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[umask] = "022" -addtask package_write_rpm before do_package_write after do_package +addtask package_write_rpm before do_package_write after do_packagedata do_package PACKAGEINDEXES += "package_update_index_rpm; [ ! -e ${DEPLOY_DIR_RPM} ] || createrepo ${DEPLOY_DIR_RPM};" PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index 332fa3f230e..e76ce292e48 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -107,4 +107,4 @@ python do_package_write_tar () { bb.build.exec_func("do_package_tar", d) } do_package_write_tar[dirs] = "${D}" -addtask package_write_tar before do_build after do_package +addtask package_write_tar before do_build after do_packagedata do_package diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e92fbae1f66..bc9f7ad7395 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -655,13 +655,13 @@ def setscene_depvalid(task, taskdependees, notneeded, d): if dep in notneeded: continue # do_package_write_* and do_package doesn't need do_package - if taskdependees[task][1] == "do_package" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: + if taskdependees[task][1] == "do_package" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: continue # do_package_write_* and do_package doesn't need do_populate_sysroot - if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: + if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: continue # Native/Cross packages don't exist and are noexec anyway - if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: + if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata']: continue # Consider sysroot depending on sysroot tasks diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index bf3922f6d19..99ac1a8645f 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -12,6 +12,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" do_package[noexec] = "1" +do_packagedata[noexec] = "1" do_package_write[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_rpm[noexec] = "1" diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc index 9718101a3d3..3d8167703fc 100644 --- a/meta/recipes-devtools/gcc/gcc-package-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc @@ -42,6 +42,7 @@ do_install () { } do_package[noexec] = "1" +do_packagedata[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_rpm[noexec] = "1" do_package_write_deb[noexec] = "1" diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc index 75847b6b922..2e2f75ab3a2 100644 --- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc @@ -75,6 +75,6 @@ FILES_libgomp-staticdev = "\ ${libdir}/libgomp*.a \ " -do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package" -do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package" -do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" +do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" diff --git a/meta/recipes-devtools/gcc/libgcc_4.7.bb b/meta/recipes-devtools/gcc/libgcc_4.7.bb index 5eaa5155706..c12aeefa25e 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.7.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.7.bb @@ -61,10 +61,10 @@ do_install () { rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include } -do_package[depends] += "virtual/${MLPREFIX}libc:do_package" -do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package" -do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package" -do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" +do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index 3624dbc5d47..227e8668613 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb @@ -81,6 +81,7 @@ do_populate_adt[nostamp] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_package[noexec] = "1" +do_packagedata[noexec] = "1" do_package_write[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_rpm[noexec] = "1" |