[oe-commits] org.oe.dev package*.bbclass: Switch to separate tasks for each packing type (from poky)
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Sep 4 09:04:14 UTC 2007
package*.bbclass: Switch to separate tasks for each packing type (from poky)
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 190270f4a71846a8098815d7407fafc9193bfdcf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=190270f4a71846a8098815d7407fafc9193bfdcf
Files:
1
classes/debian.bbclass
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
Diffs:
#
# mt diff -rb77696cb109de5ce247a119d5540d7f19a844ea9 -r190270f4a71846a8098815d7407fafc9193bfdcf
#
#
#
# patch "classes/debian.bbclass"
# from [0314e5e02b030c0b609710095a3d82e11a7a713a]
# to [3faf23c6fd98ff2bd435268edd5e503953d4eef5]
#
# patch "classes/package.bbclass"
# from [8214219f4cf766c4e5f3298b107e9215fe944e47]
# to [6d38d123e9ab2e3f1235b253086a38e70abf8518]
#
# patch "classes/package_deb.bbclass"
# from [73842f1df6176a56ec4f8018d2d98ca667df785f]
# to [a9e3536edbfc3c7688cdfdf6eb31098a6756cb91]
#
# patch "classes/package_ipk.bbclass"
# from [1872f53596730bd9e157720baf9341c875d2bc44]
# to [89bc8829d8e01336d5c7388a5fa756a042940a40]
#
# patch "classes/package_rpm.bbclass"
# from [bb81b0ca13339c5590f4287cb163cfd408618bab]
# to [544d06eecdf8053fd26fb5ad0149bf70d704de12]
#
# patch "classes/package_tar.bbclass"
# from [3b2206e771dcb118314fab5af6570042df83f633]
# to [cb0aff337888acb90332c226a3b5ba7c508f5190]
#
# patch "classes/rootfs_deb.bbclass"
# from [721dd852a06abb344a5af38514cf89deeaa73f78]
# to [58bcec513e02215254895fcca453dfb26ab4d111]
#
# patch "classes/rootfs_ipk.bbclass"
# from [c9bd969ffbc28a671b048b88d67a776b1b7fc57e]
# to [0a6a677036faf7c5f940acbb04357cb21c26a3fc]
#
============================================================
--- classes/debian.bbclass 0314e5e02b030c0b609710095a3d82e11a7a713a
+++ classes/debian.bbclass 3faf23c6fd98ff2bd435268edd5e503953d4eef5
@@ -7,7 +7,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pk
#
# Better expressed as ensure all RDEPENDS package before we package
# This means we can't have circular RDEPENDS/RRECOMMENDS
-do_package_write[rdeptask] = "do_package"
+do_package_write_ipk[rdeptask] = "do_package"
+do_package_write_deb[rdeptask] = "do_package"
+do_package_write_tar[rdeptask] = "do_package"
+do_package_write_rpm[rdeptask] = "do_package"
python debian_package_name_hook () {
import glob, copy, stat, errno, re
============================================================
--- classes/package.bbclass 8214219f4cf766c4e5f3298b107e9215fe944e47
+++ classes/package.bbclass 6d38d123e9ab2e3f1235b253086a38e70abf8518
@@ -120,18 +120,12 @@ python () {
python () {
import bb
-
if bb.data.getVar('PACKAGES', d, True) != '':
deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
deps += " %s:do_populate_staging" % dep
bb.data.setVarFlag('do_package', 'depends', deps, d)
- deps = bb.data.getVarFlag('do_package_write', 'depends', d) or ""
- for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split():
- deps += " %s:do_populate_staging" % dep
- bb.data.setVarFlag('do_package_write', 'depends', deps, d)
-
# shlibs requires any DEPENDS to have already packaged for the *.list files
bb.data.setVarFlag('do_package', 'deptask', 'do_package', d)
}
@@ -906,21 +900,14 @@ addtask package before do_build after do
do_package[dirs] = "${D}"
addtask package before do_build after do_install
-
-
-PACKAGE_WRITE_FUNCS ?= "read_subpackage_metadata"
-
-python package_do_package_write () {
- for f in (bb.data.getVar('PACKAGE_WRITE_FUNCS', d, 1) or '').split():
- bb.build.exec_func(f, d)
+# Dummy task to mark when all packaging is complete
+do_package_write () {
+ :
}
-do_package_write[dirs] = "${D}"
addtask package_write before do_build after do_package
-
EXPORT_FUNCTIONS do_package do_package_write
-
#
# Helper functions for the package writing classes
#
============================================================
--- classes/package_deb.bbclass 73842f1df6176a56ec4f8018d2d98ca667df785f
+++ classes/package_deb.bbclass a9e3536edbfc3c7688cdfdf6eb31098a6756cb91
@@ -1,14 +1,11 @@ inherit package
#
# Copyright 2006-2007 OpenedHand Ltd.
#
inherit package
-PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
-
BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
DISTRO_EXTRA_RDEPENDS += "dpkg"
-PACKAGE_WRITE_FUNCS += "do_package_deb"
IMAGE_PKGTYPE ?= "deb"
python package_deb_fn () {
@@ -271,5 +268,5 @@ do_package_write_deb[dirs] = "${D}"
bb.build.exec_func("do_package_deb", d)
}
do_package_write_deb[dirs] = "${D}"
-#addtask package_write_deb before do_package_write after do_package
+addtask package_write_deb before do_package_write after do_package
============================================================
--- classes/package_ipk.bbclass 1872f53596730bd9e157720baf9341c875d2bc44
+++ classes/package_ipk.bbclass 89bc8829d8e01336d5c7388a5fa756a042940a40
@@ -1,9 +1,6 @@ inherit package
inherit package
-PACKAGE_EXTRA_DEPENDS += "ipkg-utils-native fakeroot-native"
-
BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
-PACKAGE_WRITE_FUNCS += "do_package_ipk"
IMAGE_PKGTYPE ?= "ipk"
IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf"
@@ -313,4 +310,4 @@ do_package_write_ipk[dirs] = "${D}"
bb.build.exec_func("do_package_ipk", d)
}
do_package_write_ipk[dirs] = "${D}"
+addtask package_write_ipk before do_package_write after do_package
-
============================================================
--- classes/package_rpm.bbclass bb81b0ca13339c5590f4287cb163cfd408618bab
+++ classes/package_rpm.bbclass 544d06eecdf8053fd26fb5ad0149bf70d704de12
@@ -1,8 +1,7 @@ RPMBUILD="rpmbuild --short-circuit ${RPM
inherit package
inherit rpm_core
RPMBUILD="rpmbuild --short-circuit ${RPMOPTS}"
-PACKAGE_WRITE_FUNCS += "do_package_rpm"
IMAGE_PKGTYPE ?= "rpm"
python write_specfile() {
@@ -144,4 +143,4 @@ do_package_write_rpm[dirs] = "${D}"
bb.build.exec_func("do_package_rpm", d)
}
do_package_write_rpm[dirs] = "${D}"
+addtask package_write_rpm before do_build after do_package
-#addtask package_write_rpm before do_build after do_package
============================================================
--- classes/package_tar.bbclass 3b2206e771dcb118314fab5af6570042df83f633
+++ classes/package_tar.bbclass cb0aff337888acb90332c226a3b5ba7c508f5190
@@ -1,8 +1,5 @@ inherit package
inherit package
-PACKAGE_EXTRA_DEPENDS += "tar-native"
-
-PACKAGE_WRITE_FUNCS += "do_package_tar"
IMAGE_PKGTYPE ?= "tar"
python package_tar_fn () {
@@ -111,4 +108,4 @@ do_package_write_tar[dirs] = "${D}"
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_package
============================================================
--- classes/rootfs_deb.bbclass 721dd852a06abb344a5af38514cf89deeaa73f78
+++ classes/rootfs_deb.bbclass 58bcec513e02215254895fcca453dfb26ab4d111
@@ -1,9 +1,9 @@ do_rootfs[depends] += "dpkg-native:do_po
#
# Copyright 2006-2007 Openedhand Ltd.
#
do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
-do_rootfs[recrdeptask] += "do_package_write"
+do_rootfs[recrdeptask] += "do_package_write_deb"
fakeroot rootfs_deb_do_rootfs () {
set +e
============================================================
--- classes/rootfs_ipk.bbclass c9bd969ffbc28a671b048b88d67a776b1b7fc57e
+++ classes/rootfs_ipk.bbclass 0a6a677036faf7c5f940acbb04357cb21c26a3fc
@@ -6,7 +6,7 @@ do_rootfs[depends] += "ipkg-native:do_po
#
do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
-do_rootfs[recrdeptask] += "do_package_write"
+do_rootfs[recrdeptask] += "do_package_write_ipk"
IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
More information about the Openembedded-commits
mailing list