[oe] [RFC] a small bbclass for task recipes

pHilipp Zabel philipp.zabel at gmail.com
Sun Aug 12 00:48:52 UTC 2007


On 8/11/07, Richard Purdie <rpurdie at rpsys.net> wrote:
> Hi,
>
> On Sat, 2007-08-11 at 12:20 +0200, pHilipp Zabel wrote:
> > Ah, great. I guessed something similar would have to exist, as the process would
> > be pretty much the same as for usual -dbg packages, right?
>
> Yes, its exactly the same.
>
> > I was just wondering because most of the packages that explicitly set
> > the PACKAGES variable in OE overwrite it completely, thus disabling
> > -dev and -dbg.
>
> They shouldn't do that.

Then PACKAGES += "task-b task-c task-d"?
That will help because it keeps ${PN}-dev and -dbg packages, but still
doesn't create -dev and -dbg for task-a and task-b ...

> > The code you speak of is not enabled for OE.dev as far as I can see,
> > for example all angstrom -dbg task packages have the same dependencies
> > as the main ones.
> > How can I enable this?
>
> It looks to be enabled already in OE.dev:
>
> DEPCHAIN_POST = "-dbg -dev" in bitbake.conf

Ah, thanks.
The reason it didn't work for some packages was that they set RDEPENDS
instead of RDEPENDS_${PN}.

The reason it didn't work for some other packages is that they use RRECOMMENDS,
not (only) RDEPENDS. Currently package_depchains()
only shovels the base packages' RDEPENDS into the flavoured packages'
RRECOMMENDS, adding the corresponding pre/postfix.
To make this mechanism useful for task packages, we'd have to scan
the base packages' RRECOMMENDS, too. Can we do this without negatively
affecting some existing -dbg or -dev packages?

#
# old_revision [686bf83f320d5497340ccb3c2daf7142d97ef54b]
#
# patch "classes/package.bbclass"
#  from [de47edf65ee6076b0e6ad324f73e8d80f8133cfd]
#    to [052d45d53d68cf2ca67b9357bdd62e3e1762b045]
#
============================================================
--- classes/package.bbclass     de47edf65ee6076b0e6ad324f73e8d80f8133cfd
+++ classes/package.bbclass     052d45d53d68cf2ca67b9357bdd62e3e1762b045
@@ -836,12 +836,13 @@ python package_depchains() {

        def pkg_addrrecs(pkg, base, func, d):
                rdepends = explode_deps(bb.data.getVar('RDEPENDS_' +
base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "")
+               rrecommends =
explode_deps(bb.data.getVar('RRECOMMENDS_' + base, d, 1) or
bb.data.getVar('RRECOMMENDS', d, 1) or "")
                # bb.note('rdepends for %s is %s' % (base, rdepends))
                rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_'
+ pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")

-               for depend in rdepends:
-                       split_depend = depend.split(' (')
-                       name = split_depend[0].strip()
+               for depmend in rdepends + rrecommends:
+                       split_depmend = depmend.split(' (')
+                       name = split_depmend[0].strip()
                        func(rreclist, name)

                bb.data.setVar('RRECOMMENDS_%s' % pkg, ' '.join(rreclist), d)

I further noticed that setting ALLOW_EMPTY_${PN}-dbg = "0" like in the
attached patch has no effect because (not "0") is False in python
(getVar returns a string).
Should not bb.data.getVar('ALLOW_EMPTY', localdata) be changed to
bb.data.getVar('ALLOW_EMPTY', localdata) != "1" in
package_ipk.bbclass?

cheers
Philipp
-------------- next part --------------
#
# old_revision [686bf83f320d5497340ccb3c2daf7142d97ef54b]
#
# add_file "classes/task.bbclass"
#  content [c4d0355055508f94b1dbc6f746eaefc60cd54173]
# 
# patch "classes/package.bbclass"
#  from [de47edf65ee6076b0e6ad324f73e8d80f8133cfd]
#    to [052d45d53d68cf2ca67b9357bdd62e3e1762b045]
# 
# patch "packages/angstrom/angstrom-gpe-task-apps.bb"
#  from [43aa72a3f7bfd92362d682fdd4919d1bc0233364]
#    to [4e9cfc056a3b0448c82b619628fae2c396889c5f]
# 
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
#  from [0bf76d6738a5513300fb44b9e760c30e6afefb63]
#    to [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
# 
# patch "packages/angstrom/angstrom-gpe-task-game.bb"
#  from [574b4b40ba91344f20ee266f571947eaf0bfabbf]
#    to [71196080803ea00dd59109c8bfa62ada41174b88]
# 
# patch "packages/angstrom/angstrom-gpe-task-pim.bb"
#  from [f95eb6c7ed13685671dbf9265a2096da41d4ec9a]
#    to [4720d5f026284dfb4a8f89cf99a2292cde8f4146]
# 
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
#  from [56e2c9ad5b4b1f6a1e92d8cd9ba55e2686f6cdcc]
#    to [04963f41f9195b2a20bddc9409a53ad153e779ff]
# 
# patch "packages/angstrom/angstrom-ohand-task-pim.bb"
#  from [6bd39e8996516c93fbf18298e7db73e5d6c7b5d2]
#    to [29117cd156e8860200d303c5d915d94029800006]
# 
# patch "packages/angstrom/angstrom-task-office.bb"
#  from [00b86208ff79a87aa59575a1613ff5dd050b9455]
#    to [68c13e992cbf4346142df95f6e0603b303c26778]
# 
# patch "packages/angstrom/angstrom-task-printing.bb"
#  from [1ed146611164572e7746082b18da64219484cd54]
#    to [37b5d726438ed3ba8ab86c1f272d8150c4e2dd8d]
# 
# patch "packages/angstrom/angstrom-task-sectest.bb"
#  from [0b52dec0b07a55dc09bbd4baefb5ac4ec3cab5b7]
#    to [0df8c6eb7d44b4b09ee6daecc100e47abb3ede24]
# 
# patch "packages/angstrom/angstrom-x11-base-depends.bb"
#  from [03c8106072956917c242198f906a35c52e261463]
#    to [ebb380f6be2ff7abd7c358f31210ccbcdd1ba8c8]
# 
# patch "packages/tasks/task-base.bb"
#  from [fe2979cb73be668163bfcc4d8438f2aef96d197b]
#    to [0050b050b1cdd00f0b219ea0fe8e5c93b21e0a36]
# 
# patch "packages/tasks/task-boot.bb"
#  from [0a607d5e5b7ae509d565fbbb3b925a3b21b28292]
#    to [c23c7a613f0b88d6f60bc742ec8af93640b7ebc7]
# 
# patch "packages/tasks/task-dvb.bb"
#  from [e97311dda09c583e443eb8d584d70013d5a9752a]
#    to [d0b580515a75dbbdb39c4b7e4f845033652fca41]
# 
# patch "packages/tasks/task-e-x11.bb"
#  from [5d4cab35fb3d671aabdf25040e26d1b8c29ae706]
#    to [6b5175734cf987a2e61042f94659d72151ac8838]
# 
# patch "packages/tasks/task-gmae.bb"
#  from [da0fc8581e2e382338b0673b4e59d4d4af906fff]
#    to [bc361109a67390638c62cd8ad9951d21c26a3f06]
# 
# patch "packages/tasks/task-gpe-apps.bb"
#  from [f9b0521eb9c70cf4c727468de9f158d4862e3913]
#    to [441eab197bd9798e82d054b10892ef79ea23c9c4]
# 
# patch "packages/tasks/task-gpe-base.bb"
#  from [45d607f3e11edf402d5e91f0cc3f7444e0713c27]
#    to [e9be8c58d9717243e6c5d0e5dbe341a7458adb5d]
# 
# patch "packages/tasks/task-gpe-connectivity.bb"
#  from [56c43e4bde77ad931eb095aadde525e8c8a325e4]
#    to [66a16f3b25fa29c93f5f8c58dfcb6eb17ae71761]
# 
# patch "packages/tasks/task-gpe-desktopapps.bb"
#  from [81a2bc87d3c4d7f54827c23561a6a3d789f7db2b]
#    to [fb7ce22094506055002c2309838eeeff2877f5eb]
# 
# patch "packages/tasks/task-gpe-games.bb"
#  from [5c5d0cd44736fa92600e96f9cbf0183021fa85dd]
#    to [f2538ca710d41e9be3bce81471173111863558a2]
# 
# patch "packages/tasks/task-gpe-pim.bb"
#  from [226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1]
#    to [06623e5aa806dbd203e55af4a714a14a358ce753]
# 
# patch "packages/tasks/task-gpe-sectest.bb"
#  from [84fa13529206a1c3f88d6fdffc5da80b79bcd10c]
#    to [01b6679530b92aa7e2abffbbd20421ac63960b09]
# 
# patch "packages/tasks/task-gpe-settings.bb"
#  from [e2954cba1dede6e2a966fbf9589afbd2de1cb6d7]
#    to [22acf3e3699630d32f32ad8c00db79dd9bca992d]
# 
# patch "packages/tasks/task-gpe-web.bb"
#  from [0a675047bd8b7c48761317cbcded83167b1800d4]
#    to [c8f046b12c0ba8dbf6d7510848ea437f21929e91]
# 
# patch "packages/tasks/task-gpe.bb"
#  from [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
#    to [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [8ad1cb7e128bf7c713a3601294598f2f45cbdbf2]
#    to [32f3ddece27b455887f907603ffe167f70aaadd7]
# 
# patch "packages/tasks/task-mokogateway.bb"
#  from [baab49be88ae0d782d8b73266ba9450f0c4af0a7]
#    to [cc0009b799659f59162fe0001f7b9020dff75404]
# 
# patch "packages/tasks/task-mythfront.bb"
#  from [99f682fdb8786fe44425466c0e958e57d9f4d0cf]
#    to [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
# 
# patch "packages/tasks/task-native-sdk.bb"
#  from [13fe14442e966c706388a77f8cf5ebbd35a55e9b]
#    to [3ce2e7f299da853c1d9aa7e6802ed2072b88a9f9]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [0362fd55ab796b7fe95c9d3f9af42dc9d2eb3839]
#    to [698ac1dcff293279c230050eae7806f9ef6cf5db]
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [c0a18727fc19ff18cf71d626b50d65ff16793273]
#    to [3573b05667876fc3c7747ce95d4433bd8d14b416]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [f882913a23b727a2f228423837f49cd69400af8b]
#    to [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
# 
# patch "packages/tasks/task-opie-apps.bb"
#  from [e192666adc8ea55dfd2d13880e39567451ff691b]
#    to [a0cf1520578fa36ea0181cd808c6885c6cf7d8b5]
# 
# patch "packages/tasks/task-opie-games.bb"
#  from [16c0e4e90b8f2a1107b929ac2cb5ddb8abd15f10]
#    to [62413c817012ca1ca8a7342ea3fae26b92672e23]
# 
# patch "packages/tasks/task-opie.bb"
#  from [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
#    to [33f680faf713d2b125f51eb210a4b761bb5784c2]
# 
# patch "packages/tasks/task-proper-tools.bb"
#  from [ef2689130c9052ea04a979f29a265f575b783aa0]
#    to [19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab]
# 
# patch "packages/tasks/task-python-everything_20060425.bb"
#  from [748d2af342f7a6130182e9007e85f0157e9e4a43]
#    to [062fad7e357b5417507c149904dbb9d13df03915]
# 
# patch "packages/tasks/task-python-sharprom_20060425.bb"
#  from [bb604ff879079decdfb7854f7f348520aae886ba]
#    to [ad5d82c0b3f6c1f7f3aef6debabd369fb25435a3]
# 
# patch "packages/tasks/task-qpe.bb"
#  from [067b3304f1e3f987b06d5928cff877b86572bc8e]
#    to [3c20204c3ba7122687a68e5d4dcb334d32570826]
# 
# patch "packages/tasks/task-sdk-base.bb"
#  from [b9a1559ed5d3757201e7a2cf6103eca7813cdce1]
#    to [a5b7559c8314608365e37186d0f5f8ba7210ba93]
# 
# patch "packages/tasks/task-sdk-extra.bb"
#  from [8c20a97867e4791729e96505460675d101a5fa72]
#    to [085828ce1318b8b3cf150a6c08b1af70558b6d78]
# 
# patch "packages/tasks/task-sdk-gpephone.bb"
#  from [ceb091b7158defcc81f45d9b1a2fdf86d31c7f95]
#    to [0956cfd1a3756a1371fff49a786aaf0d7a9a6b46]
# 
# patch "packages/tasks/task-sdk-opie.bb"
#  from [5d932ba8c6873f9b29c041d35ac20b75943111d8]
#    to [0820359f807a922a607c765f95933b8157c2f3ab]
# 
# patch "packages/tasks/task-sdk-sbox-gpe.bb"
#  from [8266025b01a23d0924405ad842b5961a2c912b22]
#    to [983de278994e7522cb42dcd6f8cbc5eb365045c5]
# 
# patch "packages/tasks/task-sdk-sbox.bb"
#  from [23fb47193d823cdbecf98b982837aa21b4a4ab1d]
#    to [238618fa3e20db65bcf79af17a5a4ff04629d513]
# 
# patch "packages/tasks/task-sdk.bb"
#  from [c0a5081b759775c0b891e8be2e7e55e4f2fe8388]
#    to [9513d3a1b9d5e39eeb0c1af62487b6dfd2761583]
# 
# patch "packages/tasks/task-sdl.bb"
#  from [149ccaa5d730299d35fb73acc6d38481deba29ea]
#    to [ccc842048039b23bb776391ae8290cc24e96148b]
# 
# patch "packages/tasks/task-self-hosting.bb"
#  from [e9a51ef1ff7489f2a65a8cdff728fae0ec6c7ac4]
#    to [06bcd89f05112943fbf4bad9ed2820589fc67306]
# 
# patch "packages/tasks/task-xfce-base.bb"
#  from [2ba45c027c2fde294c2bb4ad584d788bc330038d]
#    to [addec9b6129ccc1aa3a126f2d93a26c0dcc691ce]
# 
# patch "packages/tasks/task-xterminal.bb"
#  from [a90c170fd1a87a96fd18a14180b2abbc80d180c7]
#    to [3d1ffb522b93aa212cfa3b349e262727063ac56c]
#
============================================================
--- classes/task.bbclass	c4d0355055508f94b1dbc6f746eaefc60cd54173
+++ classes/task.bbclass	c4d0355055508f94b1dbc6f746eaefc60cd54173
@@ -0,0 +1,16 @@
+# Task packages are only used to pull in other packages
+# via their dependencies. They are empty.
+ALLOW_EMPTY = "1"
+
+# Instead of overwriting PACKAGES to only build -dev and -doc
+# (PACKAGES = "${PN} ${PN}-dbg ${PN}-dev"), Richard proposed
+# to disallow empty -doc and -locale packages:
+ALLOW_EMPTY_${PN}-doc = "0"
+ALLOW_EMPTY_${PN}-locale = "0"
+
+# By default, task packages do not depend on a certain architecture.
+# Only if dependencies are modified by MACHINE_FEATURES, packages
+# need to be set to MACHINE_ARCH after inheriting task.bbclass
+PACKAGE_ARCH = "all"
+
+DEPCHAIN_POST = "-dbg -dev -doc"
============================================================
--- classes/package.bbclass	de47edf65ee6076b0e6ad324f73e8d80f8133cfd
+++ classes/package.bbclass	052d45d53d68cf2ca67b9357bdd62e3e1762b045
@@ -836,12 +836,13 @@ python package_depchains() {
 
 	def pkg_addrrecs(pkg, base, func, d):
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "")
+		rrecommends = explode_deps(bb.data.getVar('RRECOMMENDS_' + base, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 		# bb.note('rdepends for %s is %s' % (base, rdepends))
 		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 
-		for depend in rdepends:
-			split_depend = depend.split(' (')
-			name = split_depend[0].strip()
+		for depmend in rdepends + rrecommends:
+			split_depmend = depmend.split(' (')
+			name = split_depmend[0].strip()
 			func(rreclist, name)
 
 		bb.data.setVar('RRECOMMENDS_%s' % pkg, ' '.join(rreclist), d)
============================================================
--- packages/angstrom/angstrom-gpe-task-apps.bb	43aa72a3f7bfd92362d682fdd4919d1bc0233364
+++ packages/angstrom/angstrom-gpe-task-apps.bb	4e9cfc056a3b0448c82b619628fae2c396889c5f
@@ -1,10 +1,11 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
+inherit task
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
============================================================
--- packages/angstrom/angstrom-gpe-task-base.bb	0bf76d6738a5513300fb44b9e760c30e6afefb63
+++ packages/angstrom/angstrom-gpe-task-base.bb	30a23f6dee4925d21a3bf27405e8f4c25f29be2c
@@ -1,10 +1,11 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
+inherit task
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     matchbox \
     matchbox-panel-hacks \
     xcursor-transparent-theme \
============================================================
--- packages/angstrom/angstrom-gpe-task-game.bb	574b4b40ba91344f20ee266f571947eaf0bfabbf
+++ packages/angstrom/angstrom-gpe-task-game.bb	71196080803ea00dd59109c8bfa62ada41174b88
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
============================================================
--- packages/angstrom/angstrom-gpe-task-pim.bb	f95eb6c7ed13685671dbf9265a2096da41d4ec9a
+++ packages/angstrom/angstrom-gpe-task-pim.bb	4720d5f026284dfb4a8f89cf99a2292cde8f4146
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
============================================================
--- packages/angstrom/angstrom-gpe-task-settings.bb	56e2c9ad5b4b1f6a1e92d8cd9ba55e2686f6cdcc
+++ packages/angstrom/angstrom-gpe-task-settings.bb	04963f41f9195b2a20bddc9409a53ad153e779ff
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     matchbox-panel-manager \
     gpe-su \
     gpe-conf \
============================================================
--- packages/angstrom/angstrom-ohand-task-pim.bb	6bd39e8996516c93fbf18298e7db73e5d6c7b5d2
+++ packages/angstrom/angstrom-ohand-task-pim.bb	29117cd156e8860200d303c5d915d94029800006
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     dates \
     contacts \
     tasks \
============================================================
--- packages/angstrom/angstrom-task-office.bb	00b86208ff79a87aa59575a1613ff5dd050b9455
+++ packages/angstrom/angstrom-task-office.bb	68c13e992cbf4346142df95f6e0603b303c26778
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gnumeric \
     abiword \
     imposter \
============================================================
--- packages/angstrom/angstrom-task-printing.bb	1ed146611164572e7746082b18da64219484cd54
+++ packages/angstrom/angstrom-task-printing.bb	37b5d726438ed3ba8ab86c1f272d8150c4e2dd8d
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     cups \
 #    gnome-cups-manager \
     "
============================================================
--- packages/angstrom/angstrom-task-sectest.bb	0b52dec0b07a55dc09bbd4baefb5ac4ec3cab5b7
+++ packages/angstrom/angstrom-task-sectest.bb	0df8c6eb7d44b4b09ee6daecc100e47abb3ede24
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     nmap \
     ettercap \
     stunnel \
============================================================
--- packages/angstrom/angstrom-x11-base-depends.bb	03c8106072956917c242198f906a35c52e261463
+++ packages/angstrom/angstrom-x11-base-depends.bb	ebb380f6be2ff7abd7c358f31210ccbcdd1ba8c8
@@ -1,7 +1,8 @@ DESCRIPTION = "Task packages for the Ang
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r35"
-ALLOW_EMPTY = "1"
+PR = "r36"
 
+inherit task
+
 XSERVER ?= "xserver-kdrive-fbdev"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/tasks/task-base.bb	fe2979cb73be668163bfcc4d8438f2aef96d197b
+++ packages/tasks/task-base.bb	0050b050b1cdd00f0b219ea0fe8e5c93b21e0a36
@@ -1,6 +1,8 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r41"
+PR = "r42"
 
+inherit task
+
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
 PACKAGES = ' \
@@ -36,10 +38,6 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
 	    '
 
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "all"
-
 #
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
============================================================
--- packages/tasks/task-boot.bb	0a607d5e5b7ae509d565fbbb3b925a3b21b28292
+++ packages/tasks/task-boot.bb	c23c7a613f0b88d6f60bc742ec8af93640b7ebc7
@@ -1,11 +1,8 @@ DESCRIPTION = "Basic task to get a devic
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r38"
+PR = "r39"
 
-PROVIDES = "${PACKAGES}"
-PACKAGES = 'task-boot'
+inherit task
 
-ALLOW_EMPTY = "1"
-
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
 PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/tasks/task-dvb.bb	e97311dda09c583e443eb8d584d70013d5a9752a
+++ packages/tasks/task-dvb.bb	d0b580515a75dbbdb39c4b7e4f845033652fca41
@@ -1,10 +1,10 @@
-PACKAGES = "task-dvb"
 DESCRIPTION = "Meta-package for DVB application"
-ALLOW_EMPTY = "1"
-PR = "r5"
+PR = "r6"
 
-RDEPENDS = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
+inherit task
 
+RDEPENDS_${PN} = "dvbstream dvbtune xserver-xorg tda1004x-firmware mythtv lirc lirc-modules drm-module-via"
+
 LICENSE = "MIT"
 
 # there is a -march=586 somewhere in the source tree of mythtv
============================================================
--- packages/tasks/task-e-x11.bb	5d4cab35fb3d671aabdf25040e26d1b8c29ae706
+++ packages/tasks/task-e-x11.bb	6b5175734cf987a2e61042f94659d72151ac8838
@@ -1,12 +1,13 @@ DESCRIPTION = "Tasks for Enlightenment/X
 DESCRIPTION = "Tasks for Enlightenment/X11"
+PR = "r10"
+
+inherit task
+
 PACKAGES = "task-e-x11-core task-e-x11"
 PROVIDES = "task-e-x11-core task-e-x11"
-PR = "r9"
 
 PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11"
 
-ALLOW_EMPTY = "1"
-
 #
 # X
 #
@@ -21,5 +22,3 @@ RDEPENDS_task-e-x11  = "task-e-x11-core"
 
 RDEPENDS_task-e-x11  = "task-e-x11-core"
 # entice eclair examine evidence e-modules e-utils elitaire"
-DEPENDS_task-e-x11 = "task-e-x11-core"
-# entice eclair examine evidence e-modules e-utils elitaire"
============================================================
--- packages/tasks/task-gmae.bb	da0fc8581e2e382338b0673b4e59d4d4af906fff
+++ packages/tasks/task-gmae.bb	bc361109a67390638c62cd8ad9951d21c26a3f06
@@ -1,17 +1,14 @@ DESCRIPTION = "GNOME Mobile & Embedded I
 DESCRIPTION = "GNOME Mobile & Embedded Initiative"
-PR = "r0"
+PR = "r1"
 
+inherit task
+
 PACKAGES = 'gmae-core \
             gmae-toolkit \
             gmae-user \
 	    task-gmae \
 	    '
 
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "all"
-
-
 RDEPENDS_gmae-core = " \
             ${XSERVER} \
 	    glib-2.0 \
============================================================
--- packages/tasks/task-gpe-apps.bb	f9b0521eb9c70cf4c727468de9f158d4862e3913
+++ packages/tasks/task-gpe-apps.bb	441eab197bd9798e82d054b10892ef79ea23c9c4
@@ -1,9 +1,10 @@ DESCRIPTION = "Application task package 
 DESCRIPTION = "Application task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
============================================================
--- packages/tasks/task-gpe-base.bb	45d607f3e11edf402d5e91f0cc3f7444e0713c27
+++ packages/tasks/task-gpe-base.bb	e9be8c58d9717243e6c5d0e5dbe341a7458adb5d
@@ -1,9 +1,10 @@ DESCRIPTION = "Base task package for GPE
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
============================================================
--- packages/tasks/task-gpe-connectivity.bb	56c43e4bde77ad931eb095aadde525e8c8a325e4
+++ packages/tasks/task-gpe-connectivity.bb	66a16f3b25fa29c93f5f8c58dfcb6eb17ae71761
@@ -1,9 +1,10 @@ DESCRIPTION = "Connectivity task package
 DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-mini-browser \
     gpe-irc"
 
============================================================
--- packages/tasks/task-gpe-desktopapps.bb	81a2bc87d3c4d7f54827c23561a6a3d789f7db2b
+++ packages/tasks/task-gpe-desktopapps.bb	fb7ce22094506055002c2309838eeeff2877f5eb
@@ -1,9 +1,10 @@ DESCRIPTION = "Additional desktop applic
 DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     sylpheed \
     firefox \
     thunderbird \
============================================================
--- packages/tasks/task-gpe-games.bb	5c5d0cd44736fa92600e96f9cbf0183021fa85dd
+++ packages/tasks/task-gpe-games.bb	f2538ca710d41e9be3bce81471173111863558a2
@@ -1,9 +1,10 @@ DESCRIPTION = "Games task package for GP
 DESCRIPTION = "Games task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
============================================================
--- packages/tasks/task-gpe-pim.bb	226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1
+++ packages/tasks/task-gpe-pim.bb	06623e5aa806dbd203e55af4a714a14a358ce753
@@ -1,8 +1,9 @@ DESCRIPTION = "PIM task packages for GPE
 DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 RDEPENDS_gpe-task-pim = "\
     gpe-timesheet \
     gpe-todo \
============================================================
--- packages/tasks/task-gpe-sectest.bb	84fa13529206a1c3f88d6fdffc5da80b79bcd10c
+++ packages/tasks/task-gpe-sectest.bb	01b6679530b92aa7e2abffbbd20421ac63960b09
@@ -1,9 +1,10 @@ DESCRIPTION = "Security testing task pac
 DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     nmap \
     ettercap \
     stunnel \
============================================================
--- packages/tasks/task-gpe-settings.bb	e2954cba1dede6e2a966fbf9589afbd2de1cb6d7
+++ packages/tasks/task-gpe-settings.bb	22acf3e3699630d32f32ad8c00db79dd9bca992d
@@ -1,9 +1,10 @@ DESCRIPTION = "Settings task package for
 DESCRIPTION = "Settings task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-mininet \
     gpe-bluetooth \
     gpe-beam \
============================================================
--- packages/tasks/task-gpe-web.bb	0a675047bd8b7c48761317cbcded83167b1800d4
+++ packages/tasks/task-gpe-web.bb	c8f046b12c0ba8dbf6d7510848ea437f21929e91
@@ -1,10 +1,10 @@ DESCRIPTION = "Additional web task packa
 DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     pidgin \
     minimo"
 
============================================================
--- packages/tasks/task-gpe.bb	cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2
+++ packages/tasks/task-gpe.bb	6d67c2a586f7786deaf06a8760041f2b4f96e72e
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for GPE Pal
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 PACKAGES = "\
     gpe-base-depends \
     gpe-task-base \
============================================================
--- packages/tasks/task-gpephone.bb	8ad1cb7e128bf7c713a3601294598f2f45cbdbf2
+++ packages/tasks/task-gpephone.bb	32f3ddece27b455887f907603ffe167f70aaadd7
@@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for GPE Pal
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r8"
+PR = "r9"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 PACKAGES = "\
     gpephone-task-base \
     gpephone-task-settings \
============================================================
--- packages/tasks/task-mokogateway.bb	baab49be88ae0d782d8b73266ba9450f0c4af0a7
+++ packages/tasks/task-mokogateway.bb	cc0009b799659f59162fe0001f7b9020dff75404
@@ -1,10 +1,10 @@ DESCRIPTION = "MokoGateway: Tasks for a 
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PROVIDES = "task-mokogateway-everything"
 PR = "r3"
 
+inherit task
+
+PROVIDES = "task-mokogateway-everything"
 PACKAGES = "\
 	task-mokogateway-everything \
 	${MOKOGATEWAY_PACKAGES} \
============================================================
--- packages/tasks/task-mythfront.bb	99f682fdb8786fe44425466c0e958e57d9f4d0cf
+++ packages/tasks/task-mythfront.bb	9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9
@@ -1,12 +1,14 @@
-PACKAGES = "${PN}"
 DESCRIPTION = "Meta-package for MythTV diskless frontend"
-ALLOW_EMPTY = "1"
-PR = "r13"
+PR = "r14"
 
-RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
+inherit task
 
-RDEPENDS_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
 
+RDEPENDS_${PN}_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+
+PACKAGE_ARCH_epia = "${MACHINE_ARCH}"
+
 LICENSE = "MIT"
 
 # there is a -march=586 somewhere in the source tree of mythtv
============================================================
--- packages/tasks/task-native-sdk.bb	13fe14442e966c706388a77f8cf5ebbd35a55e9b
+++ packages/tasks/task-native-sdk.bb	3ce2e7f299da853c1d9aa7e6802ed2072b88a9f9
@@ -1,9 +1,8 @@ DEPENDS = "gcc binutils make patch patch
 DESCRIPTION = "Packages required for native (on-device) SDK"
 LICENSE = "MIT"
 DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
-RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
+RDEPENDS_${PN} = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
 	    patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
 
+inherit task
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
============================================================
--- packages/tasks/task-openmoko.bb	0362fd55ab796b7fe95c9d3f9af42dc9d2eb3839
+++ packages/tasks/task-openmoko.bb	698ac1dcff293279c230050eae7806f9ef6cf5db
@@ -1,11 +1,10 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r56"
+PR = "r57"
 
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
+inherit task
 
 PACKAGES = "\
   task-openmoko-linux \
============================================================
--- packages/tasks/task-opie-16mb.bb	c0a18727fc19ff18cf71d626b50d65ff16793273
+++ packages/tasks/task-opie-16mb.bb	3573b05667876fc3c7747ce95d4433bd8d14b416
@@ -1,10 +1,9 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
+PR = "r1"
 
-PR = "r0"
+inherit task
 
 PACKAGES = "task-opie-16mb-base \
             task-opie-16mb-applets \
@@ -33,6 +32,8 @@ RDEPENDS_task-opie-16mb-applets = "opie-
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
+PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
+
 #
 # clamshell models can benefit from the autorotate applet
 #
============================================================
--- packages/tasks/task-opie-all.bb	f882913a23b727a2f228423837f49cd69400af8b
+++ packages/tasks/task-opie-all.bb	86ca8dc0275a5b8803e7637f1535121d73aa1fbb
@@ -1,9 +1,10 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
+inherit task
+
 PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \
             task-opie-decorations task-opie-multimedia task-opie-wlan \
             task-opie-settings task-opie-pim task-opie-datebookplugins \
============================================================
--- packages/tasks/task-opie-apps.bb	e192666adc8ea55dfd2d13880e39567451ff691b
+++ packages/tasks/task-opie-apps.bb	a0cf1520578fa36ea0181cd808c6885c6cf7d8b5
@@ -1,8 +1,9 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
 
+inherit task
+
 PACKAGES = "task-opie-apps task-opie-extra-apps"
 
 RDEPENDS_task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
============================================================
--- packages/tasks/task-opie-games.bb	16c0e4e90b8f2a1107b929ac2cb5ddb8abd15f10
+++ packages/tasks/task-opie-games.bb	62413c817012ca1ca8a7342ea3fae26b92672e23
@@ -1,8 +1,10 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
+PR = "r1"
 
+inherit task
+
 PACKAGES = "task-opie-games task-opie-extra-games"
 
 RDEPENDS_task-opie-games = "opie-backgammon opie-bounce opie-buzzword opie-fifteen \
============================================================
--- packages/tasks/task-opie.bb	3dd6719f9c7ba4832d9d3d9e23b649733e187673
+++ packages/tasks/task-opie.bb	33f680faf713d2b125f51eb210a4b761bb5784c2
@@ -1,12 +1,13 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY = "1"
 LICENSE = "MIT"
-PROVIDES = "task-opie-everything"
 
-PR = "r11"
+PR = "r12"
 
+inherit task
+
+PROVIDES = "task-opie-everything"
+
 PACKAGES = "task-opie-base \
             task-opie-base-applets task-opie-base-apps \
             task-opie-base-decorations task-opie-base-inputmethods \
@@ -32,6 +33,8 @@ RRECOMMENDS_task-opie-base = "opie-taskb
 RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
                               opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
 
+PACKAGE_ARCH_task-opie-base = "${MACHINE_ARCH}"
+
 #
 # things for reasonable bootstrap image
 #
@@ -44,6 +47,8 @@ RDEPENDS_task-opie-base-applets = "opie-
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
+PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
+
 #
 # clamshell models can benefit from the autorotate applet
 #
@@ -69,6 +74,8 @@ RDEPENDS_task-opie-extra-settings = "opi
     ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
 			    "
 
+PACKAGE_ARCH_task-opie-extra-settings = "${MACHINE_ARCH}"
+
 RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 RDEPENDS_task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
============================================================
--- packages/tasks/task-proper-tools.bb	ef2689130c9052ea04a979f29a265f575b783aa0
+++ packages/tasks/task-proper-tools.bb	19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab
@@ -1,10 +1,9 @@ DESCRIPTION = "Full versions of tools pr
 DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r4"
+PR = "r5"
 
-PACKAGE_ARCH = "all"
-ALLOW_EMPTY_${PN} = "1"
+inherit task
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
             coreutils \
 	    findutils \
 	    util-linux \
============================================================
--- packages/tasks/task-python-everything_20060425.bb	748d2af342f7a6130182e9007e85f0157e9e4a43
+++ packages/tasks/task-python-everything_20060425.bb	062fad7e357b5417507c149904dbb9d13df03915
@@ -6,7 +6,7 @@ BROKEN_BECAUSE_GCC4 = "\
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
 		python-ao 		\
 		python-pybluez		\
 		python-constraint	\
============================================================
--- packages/tasks/task-python-sharprom_20060425.bb	bb604ff879079decdfb7854f7f348520aae886ba
+++ packages/tasks/task-python-sharprom_20060425.bb	ad5d82c0b3f6c1f7f3aef6debabd369fb25435a3
@@ -16,7 +16,7 @@ NONWORKING = "\
 		python-sword            \
 		python-vorbis"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
 		python-ao 		\
 		python-constraint	\
 		python-dialog		\
============================================================
--- packages/tasks/task-qpe.bb	067b3304f1e3f987b06d5928cff877b86572bc8e
+++ packages/tasks/task-qpe.bb	3c20204c3ba7122687a68e5d4dcb334d32570826
@@ -1,10 +1,10 @@ SECTION = "opie/base"
 DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r9"
+PR = "r10"
 
+inherit task
+
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
 	task-qpe-fonts task-qpe-settings"
============================================================
--- packages/tasks/task-sdk-base.bb	b9a1559ed5d3757201e7a2cf6103eca7813cdce1
+++ packages/tasks/task-sdk-base.bb	a5b7559c8314608365e37186d0f5f8ba7210ba93
@@ -1,11 +1,12 @@ DESCRIPTION = "Basic SDK development pac
 DESCRIPTION = "Basic SDK development packages"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 DEPENDS = "task-sdk"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     task-sdk-bare \
     glibc \
     glibc-dev \
============================================================
--- packages/tasks/task-sdk-extra.bb	8c20a97867e4791729e96505460675d101a5fa72
+++ packages/tasks/task-sdk-extra.bb	085828ce1318b8b3cf150a6c08b1af70558b6d78
@@ -1,8 +1,9 @@ DESCRIPTION = "SDK packages"
 DESCRIPTION = "SDK packages"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 PACKAGES = "\
     task-sdk-x11 \
     task-sdk-x11-ext \
============================================================
--- packages/tasks/task-sdk-gpephone.bb	ceb091b7158defcc81f45d9b1a2fdf86d31c7f95
+++ packages/tasks/task-sdk-gpephone.bb	0956cfd1a3756a1371fff49a786aaf0d7a9a6b46
@@ -1,9 +1,10 @@ DESCRIPTION = "SDK task for GPE Phone Ed
 DESCRIPTION = "SDK task for GPE Phone Edition"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     libidn-dev \
     libim-dev \
     gloox-dev \
============================================================
--- packages/tasks/task-sdk-opie.bb	5d932ba8c6873f9b29c041d35ac20b75943111d8
+++ packages/tasks/task-sdk-opie.bb	0820359f807a922a607c765f95933b8157c2f3ab
@@ -1,9 +1,8 @@ DESCRIPTION = "SDK packages for Opie"
 DESCRIPTION = "SDK packages for Opie"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-PACKAGES = "task-sdk-opie"
+inherit task
 
 RDEPENDS_task-sdk-opie = "\
     libopiebluez2 \
============================================================
--- packages/tasks/task-sdk-sbox-gpe.bb	8266025b01a23d0924405ad842b5961a2c912b22
+++ packages/tasks/task-sdk-sbox-gpe.bb	983de278994e7522cb42dcd6f8cbc5eb365045c5
@@ -1,9 +1,10 @@ DESCRIPTION = "SDK task for Scratchbox r
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     glib-2.0-utils \
     gdk-pixbuf-loader-png \
     gdk-pixbuf-loader-jpeg \
============================================================
--- packages/tasks/task-sdk-sbox.bb	23fb47193d823cdbecf98b982837aa21b4a4ab1d
+++ packages/tasks/task-sdk-sbox.bb	238618fa3e20db65bcf79af17a5a4ff04629d513
@@ -1,9 +1,10 @@ DESCRIPTION = "SDK task for Scratchbox r
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     strace \
     gdb \
     sbrsh \
============================================================
--- packages/tasks/task-sdk.bb	c0a5081b759775c0b891e8be2e7e55e4f2fe8388
+++ packages/tasks/task-sdk.bb	9513d3a1b9d5e39eeb0c1af62487b6dfd2761583
@@ -1,8 +1,9 @@ DESCRIPTION = "SDK packages"
 DESCRIPTION = "SDK packages"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
 
+inherit task
+
 PACKAGES = "\
     task-sdk-bare \
     "
============================================================
--- packages/tasks/task-sdl.bb	149ccaa5d730299d35fb73acc6d38481deba29ea
+++ packages/tasks/task-sdl.bb	ccc842048039b23bb776391ae8290cc24e96148b
@@ -1,5 +1,9 @@ LICENSE = "MIT"
 DESCRIPTION = "Tasks for SDL stuff"
 LICENSE = "MIT"
+PR = "r1"
+
+inherit task
+
 PACKAGES = "task-sdl-libs task-sdl-games task-sdl-emulators"
 
 # no need to add libsdl as all libsdl-* already rdepend on it
============================================================
--- packages/tasks/task-self-hosting.bb	e9a51ef1ff7489f2a65a8cdff728fae0ec6c7ac4
+++ packages/tasks/task-self-hosting.bb	06bcd89f05112943fbf4bad9ed2820589fc67306
@@ -1,7 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION = "All tools needed for OpenEmbedded build"
 SECTION = "devel"
 LICENSE = "MIT"
-RDEPENDS = "cpp gcc-symlinks binutils-symlinks \
+
+inherit task
+
+RDEPENDS_${PN} = "cpp gcc-symlinks binutils-symlinks \
             perl perl-modules bitbake bash \
 			task-proper-tools glibc-utils \
 			linux-libc-headers-dev glibc-dev \
@@ -24,8 +27,3 @@ RDEPENDS = "cpp gcc-symlinks binutils-sy
 # - perl is so granulated that it is probably impossible
 #   to find out which packages are needed
 #
-
-ALLOW_EMPTY = "1"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
============================================================
--- packages/tasks/task-xfce-base.bb	2ba45c027c2fde294c2bb4ad584d788bc330038d
+++ packages/tasks/task-xfce-base.bb	addec9b6129ccc1aa3a126f2d93a26c0dcc691ce
@@ -1,15 +1,15 @@ LICENSE = "MIT"
 # task-xfce-base OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION = "All packages required for an base XFCE installation"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PR = "r2"
+PR = "r3"
 
-RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
+inherit task
+
+RDEPENDS_${PN} = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
 	xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \
 	xfce4-panel-mcs-plugins \
 	xfdesktop-mcs-plugins"
+RRECOMMENDS_${PN} = "xfce-utils-mcs-plugins"
-RRECOMMENDS = "xfce-utils-mcs-plugins"
============================================================
--- packages/tasks/task-xterminal.bb	a90c170fd1a87a96fd18a14180b2abbc80d180c7
+++ packages/tasks/task-xterminal.bb	3d1ffb522b93aa212cfa3b349e262727063ac56c
@@ -1,8 +1,9 @@ DESCRIPTION = "Meta-package for diskless
 PACKAGES = "task-xterminal"
 DESCRIPTION = "Meta-package for diskless X terminal"
-ALLOW_EMPTY = "1"
-PR = "r0"
+PR = "r1"
 
-RDEPENDS = "xserver-kdrive-fbdev minicom lrzsz dropbear"
+inherit task
 
+RDEPENDS_${PN} = "xserver-kdrive-fbdev minicom lrzsz dropbear"
+
 LICENSE = "MIT"


More information about the Openembedded-devel mailing list