[oe-commits] org.oe.dev merge of '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'

[koen commit]

merge of '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
     and '33f3d0a7c4cbdff4e2348d37b7add06e6c261f0e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 453683170be608ea537c8e9133e9808544d8ac3c
ViewMTN: http://monotone.openembedded.org/revision/info/453683170be608ea537c8e9133e9808544d8ac3c
Files:
1
classes/autotools.bbclass
packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
Diffs:

#
# mt diff -r26ec78f4f59453ecd4343ab4c92d4787ab5a81fe -r453683170be608ea537c8e9133e9808544d8ac3c
#
#
#
# patch "classes/autotools.bbclass"
#  from [3acb6dbe08d32ccda69ed2a8b6a695611888de97]
#    to [b231959ebff8805dedb065d1dec1aa37cc39528b]
#
============================================================
--- classes/autotools.bbclass	3acb6dbe08d32ccda69ed2a8b6a695611888de97
+++ classes/autotools.bbclass	b231959ebff8805dedb065d1dec1aa37cc39528b
@@ -215,8 +215,10 @@ autotools_stage_all() {
 	# b) packaged staging will fix that anyways. :M:
 	if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ]
 	then
-		echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
-		cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
+		if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then
+			echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
+			cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
+		fi
 	fi
 	rm -rf ${STAGE_TEMP}/${mandir} || true
 	rm -rf ${STAGE_TEMP}/${infodir} || true


#
# mt diff -r33f3d0a7c4cbdff4e2348d37b7add06e6c261f0e -r453683170be608ea537c8e9133e9808544d8ac3c
#
#
#
# patch "packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc"
#  from [7d99efacb78551a1709a390b5a5b38d64a30a994]
#    to [00fda80068708f9a10656fd9777654f54435a66b]
#
============================================================
--- packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc	7d99efacb78551a1709a390b5a5b38d64a30a994
+++ packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc	00fda80068708f9a10656fd9777654f54435a66b
@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
            ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
-           http://developer.ezaurus.com/sl_j/source/c860/${SHARPV}/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \
+           http://openzaurus.org/mirror/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \
            file://piro.patch;patch=1 \
            file://swap-performance.patch;patch=1 \
            file://bluetooth-2.4.18-mh15.patch;patch=1 \