[oe-commits] org.oe.dev meta packages: Create a new class, clean up the code and add correct dependencies for bitbake 1.8
rpurdie commit
openembedded-commits at lists.openembedded.org
Thu Apr 5 04:10:36 UTC 2007
meta packages: Create a new class, clean up the code and add correct dependencies for bitbake 1.8
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 4fa7627848aee19c170697491ca6e335fa384d4c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4fa7627848aee19c170697491ca6e335fa384d4c
Files:
1
classes/meta.bbclass
packages/meta/meta-e-x11-core.bb
packages/meta/meta-e-x11.bb
packages/meta/meta-gpe-extras.bb
packages/meta/meta-gpe.bb
packages/meta/meta-gpephone.bb
packages/meta/meta-opie-all.bb
packages/meta/meta-opie.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
packages/meta/meta-sdl.bb
packages/meta/meta-sectest-gpe.bb
packages/meta/meta-toolchain.bb
packages/meta/xbase-clients.bb
Diffs:
#
# mt diff -r4d695f199c4502279bb593c16b45e4f5e13adcf9 -r4fa7627848aee19c170697491ca6e335fa384d4c
#
#
#
# add_file "classes/meta.bbclass"
# content [7743ea6d250c46af99b14f35b48ceef9a1f19aaa]
#
# patch "packages/meta/meta-e-x11-core.bb"
# from [74dece7776403d89bf7b982cb7838328dbf04aa9]
# to [00f5f2c544e604d11bcf1a83e6972f603e848e39]
#
# patch "packages/meta/meta-e-x11.bb"
# from [3564104cb0e084d6c0b1bd27e9d47f92727a6ba1]
# to [ef98ce0ac29b7778c540a5ebbc586c2cbbdf7cde]
#
# patch "packages/meta/meta-gpe-extras.bb"
# from [d640bed0494f1e45990cb09b97e6f4dd88a77115]
# to [51bb5d3c20d623b55cf3e00b3ed4f1c9a52c7a48]
#
# patch "packages/meta/meta-gpe.bb"
# from [e0d876fdd355c24763af70febe3b8989e84c6a76]
# to [c482e70facadcbb086ed54340e520838999241c8]
#
# patch "packages/meta/meta-gpephone.bb"
# from [0b22ae16acd48b3ff7f634140ed387fdae985418]
# to [97338d051dcf38aadadb0299c20a27cb6fafc588]
#
# patch "packages/meta/meta-opie-all.bb"
# from [36fe68274d95fb0674b98426238e87085196e458]
# to [7bed28f4e688181764dd61f3bf2792b9212275ae]
#
# patch "packages/meta/meta-opie.bb"
# from [34c81d9f860f7ce223809673ad3f3f8712fbdb2e]
# to [f729ff708c78c341aa9c42c6eae373e5eab85b14]
#
# patch "packages/meta/meta-sdk-sbox.bb"
# from [abc701975f13bb05a7ba80cd1871cbc391b237a7]
# to [9c61510cef6af145b4512e59b6e50d3e8da26c90]
#
# patch "packages/meta/meta-sdk.bb"
# from [6545273d9d173226ab47327c2bf40f6eb6e954be]
# to [b7a259b8024130e4d0d3c2d658ba7fa78ec2fa14]
#
# patch "packages/meta/meta-sdl.bb"
# from [a40899d45515362d43bd649762aa1cdde7dab6d2]
# to [9ea65156cf6b5869633128b96734f0bfe9a57a97]
#
# patch "packages/meta/meta-sectest-gpe.bb"
# from [0298ccc28d6128ed3fd2da85465a99dc9cafb8d1]
# to [4fed78f349dd284f20f281cd840f37a309eecd37]
#
# patch "packages/meta/meta-toolchain.bb"
# from [8c10b97636714d27ac2397c74e731d9b67d38430]
# to [f594f8215a980b4238712903ae86c8aaf97f61f2]
#
# patch "packages/meta/xbase-clients.bb"
# from [51c3e69bb8a2f125149845f20f40997088471f9d]
# to [84197cd812ebeef5e4e7f085f4a6c486fe083c9a]
#
============================================================
--- classes/meta.bbclass 7743ea6d250c46af99b14f35b48ceef9a1f19aaa
+++ classes/meta.bbclass 7743ea6d250c46af99b14f35b48ceef9a1f19aaa
@@ -0,0 +1,5 @@
+
+PACKAGES = ""
+
+BUILD_ALL_DEPS = "1"
+do_build[recrdeptask] = "do_build"
============================================================
--- packages/meta/meta-e-x11-core.bb 74dece7776403d89bf7b982cb7838328dbf04aa9
+++ packages/meta/meta-e-x11-core.bb 00f5f2c544e604d11bcf1a83e6972f603e848e39
@@ -1,10 +1,10 @@ LICENSE = "MIT"
DESCRIPTION = "Meta-package for Enlightenment/X11"
SECTION = "x11/base"
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
============================================================
--- packages/meta/meta-e-x11.bb 3564104cb0e084d6c0b1bd27e9d47f92727a6ba1
+++ packages/meta/meta-e-x11.bb ef98ce0ac29b7778c540a5ebbc586c2cbbdf7cde
@@ -1,10 +1,10 @@ LICENSE = "MIT"
DESCRIPTION = "Meta-package for Enlightenment/X11"
SECTION = "x11/base"
ALLOW_EMPTY = "1"
PR = "r1"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
-BUILD_ALL_DEPS = "1"
-DEPENDS = "task-e-x11"
RDEPENDS = "task-e-x11"
+
+inherit meta
============================================================
--- packages/meta/meta-gpe-extras.bb d640bed0494f1e45990cb09b97e6f4dd88a77115
+++ packages/meta/meta-gpe-extras.bb 51bb5d3c20d623b55cf3e00b3ed4f1c9a52c7a48
@@ -1,16 +1,11 @@ PR="r2"
DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
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
-
============================================================
--- packages/meta/meta-gpe.bb e0d876fdd355c24763af70febe3b8989e84c6a76
+++ packages/meta/meta-gpe.bb c482e70facadcbb086ed54340e520838999241c8
@@ -1,12 +1,7 @@ PR = "r42"
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
============================================================
--- packages/meta/meta-gpephone.bb 0b22ae16acd48b3ff7f634140ed387fdae985418
+++ packages/meta/meta-gpephone.bb 97338d051dcf38aadadb0299c20a27cb6fafc588
@@ -1,15 +1,12 @@ PR = "r0"
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
============================================================
--- packages/meta/meta-opie-all.bb 36fe68274d95fb0674b98426238e87085196e458
+++ packages/meta/meta-opie-all.bb 7bed28f4e688181764dd61f3bf2792b9212275ae
@@ -1,14 +1,16 @@ SECTION = "opie/base"
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"
+inherit meta
-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"
-
============================================================
--- packages/meta/meta-opie.bb 34c81d9f860f7ce223809673ad3f3f8712fbdb2e
+++ packages/meta/meta-opie.bb f729ff708c78c341aa9c42c6eae373e5eab85b14
@@ -1,12 +1,8 @@ SECTION = "opie/base"
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-
task-opie-multimedia task-opie-pim task-opie-settings \
task-opie-styles task-opie-todayplugins task-opie-wlan"
+inherit meta
============================================================
--- packages/meta/meta-sdk-sbox.bb abc701975f13bb05a7ba80cd1871cbc391b237a7
+++ packages/meta/meta-sdk-sbox.bb 9c61510cef6af145b4512e59b6e50d3e8da26c90
@@ -1,11 +1,9 @@ PR = "r2"
DESCRIPTION = "Meta package for a Scratchbox SDK"
LICENSE = "MIT"
PR = "r2"
-PACKAGES = ""
+inherit rootfs_ipk sdk meta
-inherit rootfs_ipk sdk debian
-
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
@@ -23,9 +21,7 @@ RDEPENDS = "${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}"
do_populate_sdk() {
@@ -92,4 +88,5 @@ do_populate_sdk[nostamp] = "1"
}
do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
addtask populate_sdk before do_build after do_install
============================================================
--- packages/meta/meta-sdk.bb 6545273d9d173226ab47327c2bf40f6eb6e954be
+++ packages/meta/meta-sdk.bb b7a259b8024130e4d0d3c2d658ba7fa78ec2fa14
@@ -1,12 +1,10 @@ PR = "r11"
DESCRIPTION = "Meta package for SDK including GPE and Opie"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
PR = "r11"
-PACKAGES = ""
+inherit sdk meta
-inherit sdk
-
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
@@ -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 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
task-sdk-gpe"
RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
-BUILD_ALL_DEPS = "1"
do_populate_sdk() {
touch ${DEPLOY_DIR_IPK}/Packages
@@ -99,4 +97,5 @@ do_populate_sdk[nostamp] = "1"
}
do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
addtask populate_sdk before do_build after do_install
============================================================
--- packages/meta/meta-sdl.bb a40899d45515362d43bd649762aa1cdde7dab6d2
+++ packages/meta/meta-sdl.bb 9ea65156cf6b5869633128b96734f0bfe9a57a97
@@ -1,15 +1,7 @@ LICENSE = "MIT"
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"
+RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
+inherit meta
-# 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"
-
============================================================
--- packages/meta/meta-sectest-gpe.bb 0298ccc28d6128ed3fd2da85465a99dc9cafb8d1
+++ packages/meta/meta-sectest-gpe.bb 4fed78f349dd284f20f281cd840f37a309eecd37
@@ -1,12 +1,7 @@ PR = "r6"
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
============================================================
--- packages/meta/meta-toolchain.bb 8c10b97636714d27ac2397c74e731d9b67d38430
+++ packages/meta/meta-toolchain.bb f594f8215a980b4238712903ae86c8aaf97f61f2
@@ -1,12 +1,10 @@ PR = "r0"
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
PR = "r0"
-PACKAGES = ""
+inherit sdk meta
-inherit sdk
-
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
@@ -23,7 +21,6 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
"
RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
-BUILD_ALL_DEPS = "1"
do_populate_sdk() {
touch ${DEPLOY_DIR_IPK}/Packages
@@ -96,4 +93,5 @@ do_populate_sdk[nostamp] = "1"
}
do_populate_sdk[nostamp] = "1"
+do_populate_sdk[recrdeptask] = "do_package_write"
addtask populate_sdk before do_build after do_install
============================================================
--- packages/meta/xbase-clients.bb 51c3e69bb8a2f125149845f20f40997088471f9d
+++ packages/meta/xbase-clients.bb 84197cd812ebeef5e4e7f085f4a6c486fe083c9a
@@ -1,4 +1,5 @@ DESCRIPTION = "Basic X clients (meta pac
DESCRIPTION = "Basic X clients (meta package)"
+LICENSE = "MIT"
PR = "r1"
ALLOW_EMPTY = "1"
@@ -9,4 +10,4 @@ RDEPENDS = 'xauth \
xmodmap \
xrdb \
xset'
+
-LICENSE = "MIT"
More information about the Openembedded-commits
mailing list