[oe-commits] org.oe.dev meta-sdk*: Update to reflect task-sdk changes.

[florian commit]

meta-sdk*: Update to reflect task-sdk changes.

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: cd0b184ac8d7d7c25e329cc8419c3d8a36cbfd22
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cd0b184ac8d7d7c25e329cc8419c3d8a36cbfd22
Files:
1
packages/meta/meta-sdk-sbox-gpe.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
Diffs:

#
# mt diff -r4689714fd9da663f675dfe96a9615ec5cb5459a0 -rcd0b184ac8d7d7c25e329cc8419c3d8a36cbfd22
#
# 
# 
# add_file "packages/meta/meta-sdk-sbox-gpe.bb"
#  content [322b780f7dad8211c0f9aa2d37c1e7186acfbeee]
# 
# patch "packages/meta/meta-sdk-sbox.bb"
#  from [d0b57e5da143f0c475c773c1be14324cab68678c]
#    to [5c6d37e9c25484ea705abaf57c0939c4a39fb6f5]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [619a355b6df8c86f32b7018b95a6279ae910bc50]
#    to [910b305dc5032b64156b185e8601142b6b4d1ada]
# 
============================================================
--- packages/meta/meta-sdk-sbox-gpe.bb	322b780f7dad8211c0f9aa2d37c1e7186acfbeee
+++ packages/meta/meta-sdk-sbox-gpe.bb	322b780f7dad8211c0f9aa2d37c1e7186acfbeee
@@ -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
============================================================
--- packages/meta/meta-sdk-sbox.bb	d0b57e5da143f0c475c773c1be14324cab68678c
+++ packages/meta/meta-sdk-sbox.bb	5c6d37e9c25484ea705abaf57c0939c4a39fb6f5
@@ -1,7 +1,7 @@ PACKAGES = ""
 DESCRIPTION = "Meta package for a Scratchbox SDK"
 LICENSE = "MIT"
 PACKAGES = ""
-PR = "r5"
+PR = "r6"
 
 inherit rootfs_ipk sdk meta
 
@@ -14,7 +14,7 @@ TARGET_INSTALL = "\
 FILES_${PN} = "${prefix}"
 
 TARGET_INSTALL = "\
-    task-sdk-base \
+    task-sdk-bare \
     task-sdk-sbox \
     "
 
@@ -74,12 +74,13 @@ 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
 	for f in *.pc ; do
============================================================
--- packages/meta/meta-sdk.bb	619a355b6df8c86f32b7018b95a6279ae910bc50
+++ packages/meta/meta-sdk.bb	910b305dc5032b64156b185e8601142b6b4d1ada
@@ -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 @@ TARGET_INSTALL = "\
     gdb-cross"
 
 TARGET_INSTALL = "\
-    task-sdk-base \
+    task-sdk-bare \
     "
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"