meta-sdk: Move the cross packages back into meta-sdk.bb

Cross tools are installed without resolving dependencies so they can't use
the usual task approach.

diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 8d50034..4ae2718 100644 (file)
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -14,7 +14,10 @@ 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 = "task-sdk-cross"
+HOST_INSTALL = "\
+    binutils-cross-sdk \
+    gcc-cross-sdk \
+    gdb-cross"
 TARGET_INSTALL = "\
     task-sdk-base \
     task-sdk-opie \

diff --git a/packages/meta/task-sdk.bb b/packages/meta/task-sdk.bb
index 271f2a1..8508e38 100644 (file)
--- a/packages/meta/task-sdk.bb
+++ b/packages/meta/task-sdk.bb
@@ -1,21 +1,15 @@
 DESCRIPTION = "SDK packages for Opie and GPE"
-PR = "r0"
+PR = "r1"
 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 \