Split meta-sdk into task-sdk and meta-sdk. Split packages into logical units. Update RDEPENDS to match package names, not renamed names as generated by debian.bbclass.

2 files changed, 132 insertions, 103 deletions

diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 1b009bb5a8..8d50034e00 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,11 +1,7 @@
 DESCRIPTION = "Meta package for SDK including GPE and Opie"
 LICENSE = MIT
-DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \
-           binutils-cross-sdk gcc-cross-sdk gdb-cross \
-           libidl libsvg-cairo sed-native \
-           meta-gpe gstreamer\
-           opie-mail"
-PR = "r9"
+DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r10"
 
 PACKAGES = ""
 
@@ -18,104 +14,16 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
-HOST_INSTALL = "binutils-cross-sdk gcc-cross-sdk gdb-cross"
-TARGET_INSTALL = "libc6 libc6-dev \
-compositeext-dev \
-damageext-dev \
-dbus-dev \
-fixesext-dev \
-gconf-dbus-dev \
-gtk+-dev \
-gtk-engines-dev \
-libapm-dev \
-libatk-1.0-dev \
-libaudiofile-dev \
-libbluetooth-dev \
-libcairo-dev \
-libdisplaymigration-dev \
-libetpan-dev \
-libesd-dev \
-libeventdb-dev \
-libexpat-dev \
-libfontconfig-dev \
-libfreetype-dev \
-libgcrypt-dev \
-libglade-2.0-dev \
-libglib-2.0-dev \
-libgpelaunch-dev \
-libgpepimc-dev \
-libgpevtype-dev \
-libgpewidget-dev \
-libgpg-error-dev \
-libice-dev \
-libidl-2-dev \
-libipkg-dev \
-libjpeg-dev \
-libmb-dev \
-libmimedir-dev \
-libopenobex-1.0-dev \
-libpcap-dev \
-libpixman-dev \
-libpng-dev \
-libpng12-dev \
-libpopt-dev \
-libreadline-dev \
-libschedule-dev \
-libsm-dev \
-libsoundgen-dev \
-libsqlite-dev \
-libstartup-notification-1-dev \
-libsvg-cairo-dev \
-libsvg-dev \
-libtododb-dev \
-libts-0.0-dev \
-libx11-dev \
-libxau-dev \
-libxcalibrate-dev \
-libxcomposite-dev \
-libxcursor-dev \
-libxdamage-dev \
-libxdmcp-dev \
-libxext-dev \
-libxfixes-dev \
-libxfont-dev \
-libxft-dev \
-libxml2-dev \
-libxpm-dev \
-libxrandr-dev \
-libxrender-dev \
-libxsettings-client-dev \
-libxss-dev \
-libxt-dev \
-libxtst-dev \
-libz-dev \
-matchbox-desktop-dev \
-ncurses-dev \
-pango-dev \
-randrext-dev \
-recordext-dev \
-renderext-dev \
-resourceext-dev \
-libiw-dev \
-xcalibrateext-dev \
-xextensions-dev \
-libxmu-dev \
-xproto-dev \
-xtrans-dev \
-gstreamer-dev \
-"
-
-#libopiebluez2-dev \
-#libopiedb2-dev \
-#libopiecore2-dev \
-#libopienet2-dev \
-#libopiepim2-dev \
-#libopieui2-dev \
-#libqpe1-dev \
-#libqte2-dev \
-#libqtaux2-dev \
-#libmailwrapper-dev \
+HOST_INSTALL = "task-sdk-cross"
+TARGET_INSTALL = "\
+    task-sdk-base \
+    task-sdk-opie \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe"
 
+RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
+BUILD_ALL_DEPS = "1"
 
 do_populate_sdk() {
 	touch ${DEPLOY_DIR_IPK}/Packages
diff --git a/packages/meta/task-sdk.bb b/packages/meta/task-sdk.bb
new file mode 100644
index 0000000000..271f2a128b
--- /dev/null
+++ b/packages/meta/task-sdk.bb
@@ -0,0 +1,121 @@
+DESCRIPTION = "SDK packages for Opie and GPE"
+PR = "r0"
+LICENSE = MIT
+ALLOW_EMPTY = "1"
+
+PACKAGES = "\
+    task-sdk-cross \
+    task-sdk-base \
+    task-sdk-opie \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe"
+
+RDEPENDS_task-sdk-cross := "\
+    binutils-cross-sdk \
+    gcc-cross-sdk \
+    gdb-cross"
+
+RDEPENDS_task-sdk-base := "\
+    glibc \
+    glibc-dev \
+    audiofile-dev \
+    bluez-libs-dev \
+    dbus-dev \
+    expat-dev \
+    fontconfig-dev \
+    freetype-dev \
+    glib-2.0-dev \
+    gstreamer-dev \
+    ice-dev \
+    ipkg-dev \
+    jpeg-dev \
+    libapm-dev \
+    libdisplaymigration-dev \
+    libetpan-dev \
+    libgcrypt-dev \
+    libglade-dev \
+    libgpg-error-dev \ 
+    libidl-dev \
+    libiw-dev \
+    libmimedir-dev \
+    libpcap-dev \
+    libpixman-dev \
+    libpng-dev \
+    libschedule-dev \
+    libsm-dev \
+    libsoundgen-dev \
+    libsvg-dev \
+    libtododb-dev \
+    libts-dev \
+    libxml2-dev \    
+    ncurses-dev \
+    openobex-dev \
+    popt-dev \
+    readline-dev \
+    sqlite-dev \
+    zlib-dev \
+    xmu-dev"
+
+RDEPENDS_task-sdk-x11 := "\
+    atk-dev \
+    cairo-dev \
+    gconf-dbus-dev \
+    gtk+-dev \
+    gtk-engines-dev \
+    libsvg-cairo-dev \
+    libmatchbox-dev \
+    matchbox-desktop-dev \
+    pango-dev \
+    startup-notification-dev"
+
+RDEPENDS_task-sdk-x11-ext := "\
+    compositeext-dev \
+    damageext-dev \
+    fixesext-dev \
+    libxcursor-dev \
+    libxdmcp-dev \
+    libxfixes-dev \
+    libxft-dev \
+    libxrandr-dev \
+    libxrender-dev \
+    libxsettings-client-dev \
+    randrext-dev \
+    recordext-dev \
+    renderext-dev \
+    resourceext-dev \
+    x11-dev \
+    xau-dev \
+    xcalibrate-dev \
+    xcalibrateext-dev \
+    xcomposite-dev \
+    xdamage-dev \
+    xext-dev \
+    xextensions-dev \
+    xfont-dev \
+    xpm-dev \
+    xproto-dev \
+    xt-dev \
+    xtrans-dev \
+    xtst-dev"
+#    libxss-dev \
+
+RDEPENDS_task-sdk-gpe := "\
+    esound-gpe-dev \
+    libeventdb-dev \
+    libgpepimc-dev \
+    libgpevtype-dev \
+    libgpelaunch-dev \
+    libgpewidget-dev"
+
+RDEPENDS_task-sdk-opie := "\
+    libopiebluez2 \
+    libopiedb2 \
+    libopiecore2 \
+    libopienet2 \
+    libopiepim2 \
+    libopieui2 \
+    libqpe1 \
+    qte \
+    libqtaux2 \
+    libmailwrapper"