merge of 'bd1aedcfc0d89a11dd3dbbdca29b177ebb37278a'

     and 'bd57e3a2384dcb07934621216542ba6fc94f536e'

8 files changed, 289 insertions, 73 deletions

diff --git a/packages/meta/meta-sdk-gpe.bb b/packages/meta/meta-sdk-gpe.bb
new file mode 100644
index 0000000000..5dd6b5cc0c
--- /dev/null
+++ b/packages/meta/meta-sdk-gpe.bb
@@ -0,0 +1,101 @@
+DESCRIPTION = "Meta package for SDK including GPE"
+LICENSE = "MIT"
+DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r0"
+
+inherit sdk meta
+
+SDK_DIR = "${WORKDIR}/sdk"
+SDK_OUTPUT = "${SDK_DIR}/image"
+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 = "\
+    task-sdk-base \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe \
+    task-sdk-gpephone"
+
+RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
+
+do_populate_sdk() {
+	touch ${DEPLOY_DIR_IPK}/Packages
+	ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+
+	rm -rf ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+	cat <<EOF >${SDK_DIR}/ipkg-host.conf
+src oe file:${DEPLOY_DIR_IPK}
+arch ${BUILD_ARCH} 1
+EOF
+        cat <<EOF >${SDK_DIR}/ipkg-target.conf
+src oe file:${DEPLOY_DIR_IPK}
+EOF
+	ipkgarchs="${PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do
+                echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
+	        priority=$(expr $priority + 5)
+        done
+
+	rm -r ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+	${IPKG_HOST} update
+	${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+
+	${IPKG_TARGET} update
+	${IPKG_TARGET} install ${TARGET_INSTALL}
+
+	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
+	cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
+	rm -rf ${SDK_OUTPUT}/${prefix}/usr/
+
+        cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
+        rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
+
+	mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
+
+	cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+        cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+	chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+	find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x
+
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
+	# remove unwanted housekeeping files
+	mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
+
+	# remove unwanted executables
+	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
+
+	# remove broken .la files
+	rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la
+
+	# fix pkgconfig data files
+	cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
+	for f in *.pc ; do
+		sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
+	done
+	for f in *.pc ; do
+		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
+	done
+
+        mkdir -p ${SDK_DEPLOY}
+	cd ${SDK_OUTPUT}
+	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-sdk-${DATE}.tar.bz2 .
+}
+
+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-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb
new file mode 100644
index 0000000000..a66989b3aa
--- /dev/null
+++ b/packages/meta/meta-sdk-sbox-gpe.bb
@@ -0,0 +1,101 @@
+DESCRIPTION = "Meta package for a Scratchbox GPE SDK"
+LICENSE = "MIT"
+PACKAGES = ""
+PR = "r0"
+
+inherit rootfs_ipk sdk meta
+
+SDK_DIR = "${WORKDIR}/sdk"
+SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
+prefix = "/"
+exec_prefix = "${prefix}"
+base_prefix = "${exec_prefix}"
+FILES_${PN} = "${prefix}"
+
+TARGET_INSTALL = "\
+    task-sdk-base \
+    task-sdk-sbox \
+    task-sdk-sbox-gpe \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe \
+    task-sdk-gpephone"
+
+DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+RDEPENDS = "${TARGET_INSTALL}"
+
+
+IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
+
+do_populate_sdk() {
+
+        set -ex
+        rootfs_ipk_do_indexes
+        set +ex
+
+	rm -rf ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+        cat <<EOF >${SDK_DIR}/ipkg-target.conf
+src oe file:${DEPLOY_DIR_IPK}
+EOF
+	ipkgarchs="${PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do
+                echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
+	        priority=$(expr $priority + 5)
+		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf
+		fi
+        done
+
+	rm -r ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+	${IPKG_TARGET} update
+	${IPKG_TARGET} install ${TARGET_INSTALL}
+
+	mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include
+	#cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
+	#rm -rf ${SDK_OUTPUT}/${prefix}/usr/
+
+        #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
+        #rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
+
+	cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/
+        cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/
+	chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/
+	find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x
+
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so
+	# remove unwanted housekeeping files
+	mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
+
+	# remove unwanted executables
+	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
+
+	# fixup libtool files
+	rm  ${SDK_OUTPUT}/${prefix}/usr/lib/*.la
+	#cd  ${SDK_OUTPUT}/${prefix}/usr/lib/
+	#for f in *.la ; do
+        #        sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f"
+        #done
+	
+
+	# fix pkgconfig data files
+	cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
+	for f in *.pc ; do
+		sed -i 's%${STAGING_DIR}%/usr/%g' "$f"
+	done
+
+        mkdir -p ${SDK_DEPLOY}
+	cd ${SDK_OUTPUT}
+	fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz .
+}
+
+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-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index 1e96e76d5a..c0cb27d404 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for a Scratchbox SDK"
 LICENSE = "MIT"
 PACKAGES = ""
-PR = "r5"
+PR = "r6"
 
 inherit rootfs_ipk sdk meta
 
@@ -14,7 +14,7 @@ base_prefix = "${exec_prefix}"
 FILES_${PN} = "${prefix}"
 
 TARGET_INSTALL = "\
-    task-sdk-base \
+    task-sdk-bare \
     task-sdk-sbox \
     "
 
@@ -74,11 +74,12 @@ EOF
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
 	# fixup libtool files
-	cd  ${SDK_OUTPUT}/${prefix}/lib/
-	for f in *.la ; do
-                sed -i 's%${STAGING_DIR}${TARGET_SYS}%/usr/%g' "$f"
-        done
-
+	rm  ${SDK_OUTPUT}/${prefix}/usr/lib/*.la
+	#cd  ${SDK_OUTPUT}/${prefix}/usr/lib/
+	#for f in *.la ; do
+        #        sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f"
+        #done
+	
 
 	# fix pkgconfig data files
 	cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 86bb212214..e793c08de0 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Meta package for SDK including GPE and Opie"
+DESCRIPTION = "Meta package for bare SDK package"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r12"
+PR = "r13"
 
 inherit sdk meta
 
@@ -18,7 +18,7 @@ HOST_INSTALL = "\
     gdb-cross"
 
 TARGET_INSTALL = "\
-    task-sdk-base \
+    task-sdk-bare \
     "
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
new file mode 100644
index 0000000000..3bf708902f
--- /dev/null
+++ b/packages/tasks/task-sdk-base.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Basic SDK development packages"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+DEPENDS = "task-sdk"
+
+RDEPENDS := "\
+    task-sdk-bare \
+    glibc \
+    glibc-dev \
+    libgcc1 \
+    alsa-dev \
+    audiofile-dev \
+    bluez-libs-dev \
+    dbus-dev \
+    expat-dev \
+    fontconfig-dev \
+    freetype-dev \
+    glib-2.0-dev \
+    gstreamer-dev \
+    libice-dev \
+    ipkg-dev \
+    jpeg-dev \
+    libapm-dev \
+    alsa-lib-dev \
+    libdisplaymigration-dev \
+    libetpan-dev \
+    libgcrypt-dev \
+    libglade-dev \
+    gnutls-dev \
+    libgpg-error-dev \
+    libidl-dev \
+    libiw-dev \
+    libmimedir-dev \
+    libpcap-dev \
+    libpixman-dev \
+    libpng-dev \
+    libschedule-dev \
+    libsm-dev \
+    libsoundgen-dev \
+    libsoup-dev \
+    libsvg-dev \
+    libtododb-dev \
+    libts-dev \
+    libxml2-dev \
+    ncurses-dev \
+    openobex-dev \
+    popt-dev \
+    readline-dev \
+    libsqlite-dev \
+    zlib-dev \
+    libxmu-dev"
diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb
new file mode 100644
index 0000000000..77950dfb01
--- /dev/null
+++ b/packages/tasks/task-sdk-sbox-gpe.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
+PR = "r0"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS := "\
+    glib-2.0-utils \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-jpeg \
+    gdk-pixbuf-loader-gif \
+    gdk-pixbuf-loader-xpm \
+    intltool \
+    intltool-dev \
+    ipkg \
+    ipkg-utils \
+    gettext-dev \
+    pkgconfig-dev \
+    autoconf \
+    automake \
+    "
diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
index 5540bb610b..aa8dddfbd8 100644
--- a/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -1,25 +1,13 @@
-DESCRIPTION = "SDK task for Scratchbox rootstraps"
+DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
 PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 RDEPENDS := "\
-    glib-2.0-utils \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-jpeg \
-    gdk-pixbuf-loader-gif \
-    gdk-pixbuf-loader-xpm \
-    intltool \
-    intltool-dev \
     strace \
     gdb \
     sbrsh \
     fakeroot \
-    matchbox-wm \
-    dbus \
-    joe \
     ipkg \
-    gettext-dev \
-    pkgconfig-dev \
     ipkg-utils \
     "
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index f94f7f17ff..6e6770c913 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,62 +1,14 @@
 DESCRIPTION = "SDK packages"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
     task-sdk-bare \
-    task-sdk-base \
     "
 
 RDEPENDS_task-sdk-bare := "\
     glibc \
     glibc-dev \
     libgcc1 \
-    "
-
-RDEPENDS_task-sdk-base := "\
-    glibc \
-    glibc-dev \
-    libgcc1 \
-    alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
-    dbus-dev \
-    expat-dev \
-    fontconfig-dev \
-    freetype-dev \
-    glib-2.0-dev \
-    gstreamer-dev \
-    libice-dev \
-    ipkg-dev \
-    jpeg-dev \
-    libapm-dev \
-    alsa-lib-dev \
-    libdisplaymigration-dev \
-    libetpan-dev \
-    libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
-    libgpg-error-dev \
-    libidl-dev \
-    libiw-dev \
-    libmimedir-dev \
-    libpcap-dev \
-    libpixman-dev \
-    libpng-dev \
-    libschedule-dev \
-    libsm-dev \
-    libsoundgen-dev \
-    libsoup-dev \
-    libsvg-dev \
-    libtododb-dev \
-    libts-dev \
-    libxml2-dev \
-    ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    libsqlite-dev \
-    zlib-dev \
-    libxmu-dev"
-
+    "
\ No newline at end of file