[oe-commits] org.oe.dev meta-sdk: Some more directory layout related fixes.

[florian commit]

meta-sdk: Some more directory layout related fixes.

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

#
# mt diff -r62723979ced03010e85e9d1a17c18d07acc40760 -r5f6bdd724d23a961c97567e1765db207fdad93f0
#
# 
# 
# patch "packages/meta/meta-sdk.bb"
#  from [ff295d96a64b4812465dc168854063b3d3d0cb4a]
#    to [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
# 
============================================================
--- packages/meta/meta-sdk.bb	ff295d96a64b4812465dc168854063b3d3d0cb4a
+++ packages/meta/meta-sdk.bb	807b4b0871d6078e260e5f860e81d01c4d38a7b1
@@ -76,19 +76,19 @@ do_populate_sdk() {
         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
+	mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/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
+	rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
 	# fix pkgconfig data files
-	cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
+	cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
 	for f in *.pc ; do
-		sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
+		sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
 	done
 	for f in *.pc ; do
 		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"