meta packages: Create a new class, clean up the code and add correct dependencies for bitbake 1.8

13 files changed, 33 insertions, 61 deletions

diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index 21960c6573..cdc76402e1 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -4,7 +4,7 @@ ALLOW_EMPTY = "1"
 PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS="1"
 
-DEPENDS = "task-e-x11-core"
 RDEPENDS = "task-e-x11-core"
+
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 0edfd43496..1182b0cf42 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -4,7 +4,7 @@ ALLOW_EMPTY = "1"
 PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS = "1"
 
-DEPENDS = "task-e-x11"
 RDEPENDS = "task-e-x11"
+
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 0adb7c4e05..b4425a682e 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -2,15 +2,10 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environmen
 LICENSE = "MIT"
 PR="r2"
 
-ALLOW_EMPTY = "1"
-BUILD_ALL_DEPS = "1"
-
-DEPENDS = "task-gpe"
-
 RDEPENDS = "\
     gpe-task-apps-extra \
     gpe-task-games \
     gpe-task-web \
     gpe-task-desktopapps"
 
-
+inherit meta
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 2360db447f..d6e199f6d6 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -2,11 +2,6 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 LICENSE = "MIT"
 PR = "r42"
 
-ALLOW_EMPTY = "1"
-BUILD_ALL_DEPS = "1"
-
-DEPENDS = "task-gpe"
-
 RDEPENDS = "\
     gpe-base-depends \
     gpe-task-base \
@@ -15,3 +10,5 @@ RDEPENDS = "\
     gpe-task-apps \
     gpe-task-games \
     gpe-task-connectivity"
+
+inherit meta
diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb
index 96e393bf47..a0bd51e5fc 100644
--- a/packages/meta/meta-gpephone.bb
+++ b/packages/meta/meta-gpephone.bb
@@ -2,14 +2,11 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
 LICENSE = "MIT"
 PR = "r0"
 
-ALLOW_EMPTY = "1"
-BUILD_ALL_DEPS = "1"
-
-DEPENDS = "task-gpe"
-
 RDEPENDS = "\
     gpe-base-depends \
     gpephone-task-base \
     gpephone-task-settings \
     gpephone-task-pim \
     gpeph-task-connectivity"
+
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index 6f315d3306..ccdbbe973d 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -1,14 +1,16 @@
 DESCRIPTION = "Meta-package for QPE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-DEPENDS = "task-qpe"
 PR = "r3"
 
-BUILD_ALL_DEPS = "1"
-
-RDEPENDS = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
-	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
-	task-qpe-fonts task-qpe-settings"
+RDEPENDS = " \
+    task-qpe-applets \
+    task-qpe-games \
+    task-qpe-inputmethods \
+    task-qpe-multimedia \
+    task-qpe-emulators \
+    task-qpe-applications \
+    task-qpe-fonts \
+    task-qpe-settings"
 
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 1158d859a0..6a9c35c5e3 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,12 +1,8 @@
 DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
-ALLOW_EMPTY = "1"
 PR = "r34"
-PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS = "1"
 
-DEPENDS = "task-opie"
 RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-base-applets task-opie-base-apps \
             task-opie-base-decorations task-opie-base-inputmethods \
@@ -19,3 +15,4 @@ RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
             task-opie-multimedia task-opie-pim task-opie-settings \
             task-opie-styles task-opie-todayplugins task-opie-wlan"
 
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index 0642d49e0e..a586972a94 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -2,9 +2,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK"
 LICENSE = "MIT"
 PR = "r2"
 
-PACKAGES = ""
-
-inherit rootfs_ipk sdk debian
+inherit rootfs_ipk sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
@@ -23,8 +21,6 @@ TARGET_INSTALL = "\
 
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 RDEPENDS = "${TARGET_INSTALL}"
-BUILD_ALL_DEPS = "1"
-
 
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
@@ -92,4 +88,5 @@ EOF
 }
 
 do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
 addtask populate_sdk before do_build after do_install
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 7bf8606418..e49858398f 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -3,9 +3,7 @@ LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 PR = "r11"
 
-PACKAGES = ""
-
-inherit sdk
+inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
@@ -18,6 +16,7 @@ HOST_INSTALL = "\
     binutils-cross-sdk \
     gcc-cross-sdk \
     gdb-cross"
+
 TARGET_INSTALL = "\
     task-sdk-base \
     task-sdk-opie \
@@ -26,7 +25,6 @@ TARGET_INSTALL = "\
     task-sdk-gpe"
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
-BUILD_ALL_DEPS = "1"
 
 do_populate_sdk() {
 	touch ${DEPLOY_DIR_IPK}/Packages
@@ -99,4 +97,5 @@ EOF
 }
 
 do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
 addtask populate_sdk before do_build after do_install
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index cb19cb6834..a1ab3918b7 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -1,15 +1,7 @@
 DESCRIPTION = "Meta-package for SDL"
 LICENSE = "MIT"
-RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
 PR = "r2"
 
-ALLOW_EMPTY = "1"
-BUILD_ALL_DEPS = "1"
-
-# no need to add libsdl as all libsdl-* already rdepend on it
-RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
-
-RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
-
-RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
+RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
 
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 70bcfc4bc5..a73559ab1a 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -2,11 +2,6 @@ DESCRIPTION = "Meta-package for GPE Security Testing Image"
 LICENSE = "MIT"
 PR = "r6"
 
-ALLOW_EMPTY = "1"
-BUILD_ALL_DEPS = "1"
-
-DEPENDS = "task-gpe"
-
 RDEPENDS = "\
     gpe-task-base \
     gpe-base-depends \
@@ -14,3 +9,5 @@ RDEPENDS = "\
     gpe-task-settings \
     gpe-task-pim \
     gpe-task-sectest"
+
+inherit meta
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 7995ac3cb8..35dbe9f4cb 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -3,9 +3,7 @@ LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 PR = "r0"
 
-PACKAGES = ""
-
-inherit sdk
+inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
@@ -23,7 +21,6 @@ TARGET_INSTALL = "\
     "
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
-BUILD_ALL_DEPS = "1"
 
 do_populate_sdk() {
 	touch ${DEPLOY_DIR_IPK}/Packages
@@ -96,4 +93,5 @@ EOF
 }
 
 do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
 addtask populate_sdk before do_build after do_install
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index 4297440074..5f3c640f00 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "Basic X clients (meta package)"
+LICENSE = "MIT"
 PR = "r1"
 
 ALLOW_EMPTY = "1"
@@ -9,4 +10,4 @@ RDEPENDS = 'xauth \
 	xmodmap \
 	xrdb \
 	xset'
-LICENSE = "MIT"
+