merge of '56b25a110aa475e3158b4ad35b8444a1da0716cb'

     and '5a68fd7dd4ea1b818537db754ddc0d7ad79ca66b'

2 files changed, 137 insertions, 27 deletions

diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
new file mode 100644
index 0000000000..4e3151805e
--- /dev/null
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -0,0 +1,115 @@
+DESCRIPTION = "Meta package for a Scratchbox SDK"
+LICENSE = "MIT"
+PR = "r0"
+
+PACKAGES = ""
+PACKAGES = ""
+
+inherit sdk debian
+
+SDK_DIR = "${WORKDIR}/sdk"
+SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+prefix = "/"
+exec_prefix = "${prefix}"
+base_prefix = "${exec_prefix}"
+FILES_${PN} = "${prefix}"
+
+TARGET_INSTALL = "\
+    task-sdk-base \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe"
+
+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}"
+
+ipk_do_indexes () {
+	set -x
+
+	ipkgarchs="${PACKAGE_ARCHS}"
+
+        if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+                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}
+        fi
+
+	for arch in $ipkgarchs; do
+		if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+			if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then 
+				touch ${DEPLOY_DIR_IPK}/$arch/Packages
+				ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
+			fi
+		fi
+	done
+}
+
+do_populate_sdk() {
+	ipk_do_indexes
+
+	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
+
+	# remove broken .la files
+	#rm ${SDK_OUTPUT}/${prefix}/lib/*.la
+
+	# fix pkgconfig data files
+	cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
+	#for f in *.pc ; do
+	#	sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+	#done
+	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"
+addtask populate_sdk before do_build after do_install
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index a9814d51a1..cbd1ab72f1 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\
     glibc-dev \
     libgcc1 \
     alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
+    libaudiofile-dev \
+    libbluetooth-dev \
     dbus-dev \
     expat-dev \
     fontconfig-dev \
     freetype-dev \
-    glib-2.0-dev \
+    libglib-2.0-dev \
     gstreamer-dev \
     libice-dev \
     ipkg-dev \
-    jpeg-dev \
+    libjpeg-dev \
     libapm-dev \
-    libasound \
+    libasound2 \
     libdisplaymigration-dev \
     libetpan-dev \
     libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
+    libglade-2.0-dev \
+    libgnutls-dev \
     libgpg-error-dev \
-    libidl-dev \
+    libidl-2-dev \
     libiw-dev \
-    libmimedir-dev \
+    libmimedir-0.4-dev \
     libpcap-dev \
     libpixman-dev \
     libpng-dev \
     libschedule-dev \
     libsm-dev \
     libsoundgen-dev \
-    libsoup-dev \
+    libsoup-2.2-dev \
     libsvg-dev \
     libtododb-dev \
     libts-dev \
     libxml2-dev \
     ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
+    libopenobex-dev \
+    libpopt-dev \
+    libreadline-dev \
+    libsqlite-dev \
     zlib-dev \
     libxmu-dev"
 
 RDEPENDS_task-sdk-x11 := "\
-    atk-dev \
-    cairo-dev \
+    libatk-1.0-dev \
+    libcairo-dev \
     gconf-dbus-dev \
     gtk+-dev \
     gtk-engines-dev \
     libsvg-cairo-dev \
-    libmatchbox-dev \
+    libmb-dev \
     matchbox-desktop-dev \
     pango-dev \
-    startup-notification-dev"
+    libstartup-notification-1-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 \
     libx11-dev \
     libxau-dev \
@@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\
     libxt-dev \
     xtrans-dev \
     libxtst-dev"
-#    libxss-dev \
+
 
 RDEPENDS_task-sdk-gpe := "\
     libcontactsdb-dev \
-    esound-dev \
+    libesd-dev \
     libeventdb-dev \
     libgpepimc-dev \
     libgpevtype-dev \
     libgpelaunch-dev \
     libgpewidget-dev \
     libhandoff-dev"
+