[oe-commits] org.oe.angstrom-2007.12-stable merge of '9e406f8db2bde54e66b99557988c4eb7d7f56676'

koen commit oe at amethyst.openembedded.net
Thu Mar 20 19:33:59 UTC 2008 

merge of '9e406f8db2bde54e66b99557988c4eb7d7f56676'
     and 'e5dfd7992b2244d4e01908aa76025380bd3281d8'

Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 5a9b33b3608142864bb7c7dcbd6097c68b0952c4
ViewMTN: http://monotone.openembedded.org/revision/info/5a9b33b3608142864bb7c7dcbd6097c68b0952c4
Files:
1
BACKPORTS.txt
classes/mono.bbclass
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/mono/README
packages/mono/mono-mcs-intermediate.inc
packages/mono/mono-native_1.2.5.1.bb
packages/mono/mono_1.2.5.1-files.inc
packages/mono/mono_1.2.5.1.bb
packages/mono/mono_1.2.6.bb
packages/mono/mono_svn.bb
contrib/angstrom/sort.sh
Diffs:

#
# mt diff -r9e406f8db2bde54e66b99557988c4eb7d7f56676 -r5a9b33b3608142864bb7c7dcbd6097c68b0952c4
#
#
#
# patch "BACKPORTS.txt"
#  from [9a24367ce0515061e1ef8d2d1863b77864927052]
#    to [beea1e3ce1fe4de3d708c85a56791a57c9d0d320]
# 
# patch "classes/mono.bbclass"
#  from [5d50e08d7aafe36c91db4fc56497a7b639ccc431]
#    to [151ae18991616e411a23875f2b867b1a38f6d548]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [dfa7f4c929b955f6f7f82114f42719319d821943]
#    to [6ba28abd1dba3062e30330b29df1c433b12c1a0f]
# 
# patch "packages/mono/README"
#  from [d1f3e17ed747876212c9db254308b2267f19c3c5]
#    to [ce24307d6afe8343f5db95c14efcac462e36c160]
# 
# patch "packages/mono/mono-mcs-intermediate.inc"
#  from [ece31464cff70bcaf69ba895f3b5b45659766426]
#    to [7ccec4b4eee7517e65523bdf392cf961af742077]
# 
# patch "packages/mono/mono-native_1.2.5.1.bb"
#  from [e463e56ce2e9dae0cd9780d8e21578fbe2c87ead]
#    to [8b7896804cad7ef3c1b4c10dbf0223ae1d8f67f0]
# 
# patch "packages/mono/mono_1.2.5.1-files.inc"
#  from [2378f3d3796f1ee616105492daebf9d6a36f8270]
#    to [2ff98963abe69b66c10195fe427bd0b907eb3aa1]
# 
# patch "packages/mono/mono_1.2.5.1.bb"
#  from [0b3b8556d5b81453367c1df8e20663e5aa98052b]
#    to [41d36ce7224102d48d7757b26c0ad42be6468b8b]
# 
# patch "packages/mono/mono_1.2.6.bb"
#  from [642bc86c2b995b52f4648891b36cbb23eade40f3]
#    to [9a843e5587e9203b8ab1d57303d10099b0750a45]
# 
# patch "packages/mono/mono_svn.bb"
#  from [3328353eac6d44a486ea3348fd54ebaebde29a22]
#    to [f23d529d8625d39cc83c06bf21302f6a314341fe]
#
============================================================
--- BACKPORTS.txt	9a24367ce0515061e1ef8d2d1863b77864927052
+++ BACKPORTS.txt	beea1e3ce1fe4de3d708c85a56791a57c9d0d320
@@ -20,11 +20,6 @@
 16d9e54aa5518e5cf7f8c86dcf394a34ca1e771d   "
 334c3fe81497cd0c121f6445b9053dc3b6b40a2e   "
 c6fac7ea20ca568a16a2b76aae0eb280f2faf7a3   "
-10d839841515280475537b389b383e3e3686c117 divers: replace '=' definition of dbg packages with '+=' for 43 files.  fixes 2317. (Koen)
-5210c083ec8a6cdc5a8ab04ea377114cbb2938b3 mono.bclass: Fix the location used for mono clilibs information to be host specific (Koen) 
-2a0669f06c54e672869fd5943c0428fb5563a512 mono: Use STAGING_DATADIR (Koen)
-7f6d4f240d436d8c36dacf0e5f60d0a68a945992 mono: replace STAGING_DATADIR by STAGING_DATADIR_NATIVE since it's where (Koen)
-96e096c38993a62c2921342c5f3ce446dda4e884 mono: use monoburg from mono-native instead (Koen)
 
 Applied:
 fc6211a28427a6d82895be30299c901ec3e85868 autotools.bbclass libtool (Koen, Marcin)
@@ -224,3 +219,10 @@
 03964808c40cbc7460d4711fae17d07972e6ceb6 setserial: add DESCRIPTION, HOMEPAGE, AUTHOR. fix packaging (xjqian PaulS)  | added to feed
 1b6b8412e77f2d8600a5b7bf7e70948e38007d48 openvpn: unify. (xjqian PaulS)  | added to feed
 130abdbeeb7888b012bab591e834a85892fad020 vpnc: add 0.5.1, unify (xjqian PaulS)  | added to feed
+10d839841515280475537b389b383e3e3686c117 divers: replace '=' definition of dbg packages with '+=' for 43 files.  fixes 2317. (Koen, PaulS)
+5210c083ec8a6cdc5a8ab04ea377114cbb2938b3 mono.bclass: Fix the location used for mono clilibs information to be host specific (Koen, PaulS)
+2a0669f06c54e672869fd5943c0428fb5563a512 mono: Use STAGING_DATADIR (Koen, PaulS)
+7f6d4f240d436d8c36dacf0e5f60d0a68a945992 mono: replace STAGING_DATADIR by STAGING_DATADIR_NATIVE since it's where (Koen, PaulS)
+96e096c38993a62c2921342c5f3ce446dda4e884 mono: use monoburg from mono-native instead (Koen, PaulS)
+
+
============================================================
--- classes/mono.bbclass	5d50e08d7aafe36c91db4fc56497a7b639ccc431
+++ classes/mono.bbclass	151ae18991616e411a23875f2b867b1a38f6d548
@@ -52,6 +52,8 @@ def mono_find_provides_and_requires(file
 	requires = [e for e in requires if not e in provides]
 	return provides, requires
 
+CLILIBSDIR = "${STAGING_DIR_HOST}/clilibs"
+
 python mono_do_clilibs() {
 	import bb, os, re, os.path
 
@@ -70,14 +72,9 @@ python mono_do_clilibs() {
 		bb.error("WORKDIR not defined")
 		return
 
-	staging = bb.data.getVar('STAGING_DIR', d, 1)
-	if not staging:
-		bb.error("STAGING_DIR not defined")
-		return
-
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 
-	clilibs_dir = os.path.join(staging, "clilibs")
+	clilibs_dir = bb.data.getVar('CLILIBSDIR', d, 1)
 	bb.mkdirhier(clilibs_dir)
 
 	provides, requires = {}, {}
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	dfa7f4c929b955f6f7f82114f42719319d821943
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	6ba28abd1dba3062e30330b29df1c433b12c1a0f
@@ -1259,9 +1259,9 @@ PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
-PREFERRED_VERSION_mono ?= "1.2.5.1"
-PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
-PREFERRED_VERSION_mono-native ?= "1.2.5.1"
+PREFERRED_VERSION_mono ?= "1.2.6"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.6"
+PREFERRED_VERSION_mono-native ?= "1.2.6"
 PREFERRED_VERSION_monotone-4 ?= "0.19"
 PREFERRED_VERSION_monotone-5 ?= "0.25.2"
 PREFERRED_VERSION_monotone-6 ?= "0.34"
============================================================
--- packages/mono/README	d1f3e17ed747876212c9db254308b2267f19c3c5
+++ packages/mono/README	ce24307d6afe8343f5db95c14efcac462e36c160
@@ -28,6 +28,6 @@ puts the information about provided asse
 calls to monodis --assembly and monodis --assemblyref) which assemblies are
 provided and required by a particular package. mono_do_clilibs then
 puts the information about provided assemblies into
-${STAGING_DIR}/clilibs/${packagename}.list and information about the
+${CLILIBSDIR}/${packagename}.list and information about the
 required packages into ${PKGDEST}/{packagename}.clilibdeps where it
 will later be picked up by read_shlibdeps.
============================================================
--- packages/mono/mono-mcs-intermediate.inc	ece31464cff70bcaf69ba895f3b5b45659766426
+++ packages/mono/mono-mcs-intermediate.inc	7ccec4b4eee7517e65523bdf392cf961af742077
@@ -47,8 +47,8 @@ do_populate_staging() {
 	cd ${D}
 	rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz
 	tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz .
-	install -d ${STAGING_DIR}/share/mono-mcs
-	cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/
+	install -d ${STAGING_DATADIR}/mono-mcs
+	cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/
 }
 
 do_package_write_ipk() {
============================================================
--- packages/mono/mono-native_1.2.5.1.bb	e463e56ce2e9dae0cd9780d8e21578fbe2c87ead
+++ packages/mono/mono-native_1.2.5.1.bb	8b7896804cad7ef3c1b4c10dbf0223ae1d8f67f0
@@ -1,5 +1,5 @@ require mono_1.2.5.inc
 require mono_1.2.5.inc
-PR = "r1"
+PR = "r2"
 DEPENDS = "glib-2.0-native perl-native"
 
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
@@ -8,9 +8,9 @@ inherit native
 
 inherit native
 
-#do_stage_prepend() {
-#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
+do_stage_prepend() {
+	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
 
 do_fix_libtool_name() {
 	# inherit native will make that all native tools that are being
============================================================
--- packages/mono/mono_1.2.5.1-files.inc	2378f3d3796f1ee616105492daebf9d6a36f8270
+++ packages/mono/mono_1.2.5.1-files.inc	2ff98963abe69b66c10195fe427bd0b907eb3aa1
@@ -1,21 +1,21 @@
 # This is a generated file, please do not edit directly
 # Use collect-files.py instead. -- Henryk <henryk at openmoko.org>
-FILES_mono-jit-dbg = "/usr/bin/mono*.mdb \
+FILES_mono-jit-dbg += "/usr/bin/mono*.mdb \
 	/usr/bin/mono*/*.mdb"
 FILES_mono-jit = "/usr/bin/mono"
-FILES_mono-gac-dbg = "/usr/bin/gacutil*.mdb \
+FILES_mono-gac-dbg += "/usr/bin/gacutil*.mdb \
 	/usr/bin/gacutil*/*.mdb \
 	/usr/lib/mono/1.0/gacutil.exe*.mdb \
 	/usr/lib/mono/1.0/gacutil.exe*/*.mdb"
 FILES_mono-gac = "/usr/bin/gacutil \
 	/usr/lib/mono/1.0/gacutil.exe"
-FILES_mono-mjs-dbg = "/usr/bin/mjs*.mdb \
+FILES_mono-mjs-dbg += "/usr/bin/mjs*.mdb \
 	/usr/bin/mjs*/*.mdb \
 	/usr/lib/mono/1.0/mjs.exe*.mdb \
 	/usr/lib/mono/1.0/mjs.exe*/*.mdb"
 FILES_mono-mjs = "/usr/bin/mjs \
 	/usr/lib/mono/1.0/mjs.exe*"
-FILES_mono-gmcs-dbg = "/usr/bin/gmcs*.mdb \
+FILES_mono-gmcs-dbg += "/usr/bin/gmcs*.mdb \
 	/usr/bin/gmcs*/*.mdb \
 	/usr/bin/wsdl2*.mdb \
 	/usr/bin/wsdl2*/*.mdb \
@@ -77,7 +77,7 @@ FILES_mono-gmcs = "/usr/bin/gmcs \
 	/usr/lib/mono/2.0/Microsoft.Common.tasks \
 	/usr/lib/mono/2.0/Microsoft.Common.targets \
 	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets"
-FILES_mono-utils-dbg = "/usr/bin/pedump*.mdb \
+FILES_mono-utils-dbg += "/usr/bin/pedump*.mdb \
 	/usr/bin/pedump*/*.mdb \
 	/usr/bin/monodis*.mdb \
 	/usr/bin/monodis*/*.mdb \
@@ -92,7 +92,7 @@ FILES_mono-utils = "/usr/bin/pedump \
 	/usr/bin/monograph \
 	/usr/bin/mono-find-provides \
 	/usr/bin/mono-find-requires"
-FILES_libmono-peapi1.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
+FILES_libmono-peapi1.0-cil-dbg += "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
 	/usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \
 	/usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \
@@ -100,7 +100,7 @@ FILES_libmono-peapi1.0-cil = "/usr/lib/m
 	/usr/lib/mono/1.0/PEAPI.dll*/*.mdb"
 FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \
 	/usr/lib/mono/1.0/PEAPI.dll"
-FILES_libmono-cairo1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
+FILES_libmono-cairo1.0-cil-dbg += "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
 	/usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \
 	/usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \
@@ -111,7 +111,7 @@ FILES_libmono-cairo1.0-cil = "/usr/lib/m
 FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \
 	/usr/lib/mono/1.0/Mono.Cairo.dll \
 	/usr/lib/pkgconfig/mono-cairo.pc"
-FILES_libmono-system-web2.0-cil-dbg = "/usr/lib/mono/gac/System.Web/2.0.*/*.mdb \
+FILES_libmono-system-web2.0-cil-dbg += "/usr/lib/mono/gac/System.Web/2.0.*/*.mdb \
 	/usr/lib/mono/gac/System.Web/2.0.*/*/*.mdb \
 	/usr/lib/mono/gac/System.Web/2.0.*/.debug/ \
 	/usr/lib/mono/gac/System.Web/2.0.*/../.debug/ \
@@ -127,7 +127,7 @@ FILES_libmono-system-web2.0-cil = "/usr/
 	/usr/lib/mono/gac/System.Web.Services/2.0.*/ \
 	/usr/lib/mono/2.0/System.Web.dll \
 	/usr/lib/mono/2.0/System.Web.Services.dll"
-FILES_libmono-accessibility2.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
+FILES_libmono-accessibility2.0-cil-dbg += "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
 	/usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \
 	/usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \
 	/usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \
@@ -135,7 +135,7 @@ FILES_libmono-accessibility2.0-cil = "/u
 	/usr/lib/mono/2.0/Accessibility.dll*/*.mdb"
 FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \
 	/usr/lib/mono/2.0/Accessibility.dll"
-FILES_libmono-microsoft7.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
+FILES_libmono-microsoft7.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
 	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \
 	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \
 	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \
@@ -159,7 +159,7 @@ FILES_libmono-microsoft7.0-cil = "/usr/l
 	/usr/lib/mono/1.0/Microsoft.JScript.dll \
 	/usr/lib/mono/1.0/Microsoft.VisualC.dll \
 	/usr/lib/mono/1.0/Microsoft.Vsa.dll"
-FILES_libmono-winforms2.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \
+FILES_libmono-winforms2.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \
 	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*/*.mdb \
 	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/.debug/ \
 	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/../.debug/ \
@@ -183,7 +183,7 @@ FILES_libmono-winforms2.0-cil = "/usr/li
 	/usr/lib/mono/2.0/System.Windows.Forms.dll \
 	/usr/lib/mono/2.0/System.Drawing.Design.dll \
 	/usr/lib/mono/2.0/System.Design.dll"
-FILES_libmono-ldap1.0-cil-dbg = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \
+FILES_libmono-ldap1.0-cil-dbg += "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \
 	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/.debug/ \
 	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/../.debug/ \
@@ -191,7 +191,7 @@ FILES_libmono-ldap1.0-cil = "/usr/lib/mo
 	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*/*.mdb"
 FILES_libmono-ldap1.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/ \
 	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll"
-FILES_libmono-sharpzip2.84-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \
+FILES_libmono-sharpzip2.84-cil-dbg += "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \
 	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*/*.mdb \
 	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/.debug/ \
 	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/../.debug/ \
@@ -199,7 +199,7 @@ FILES_libmono-sharpzip2.84-cil = "/usr/l
 	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
 FILES_libmono-sharpzip2.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/ \
 	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll"
-FILES_libmono-system-data2.0-cil-dbg = "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \
+FILES_libmono-system-data2.0-cil-dbg += "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \
 	/usr/lib/mono/gac/System.Data/2.0.*/*/*.mdb \
 	/usr/lib/mono/gac/System.Data/2.0.*/.debug/ \
 	/usr/lib/mono/gac/System.Data/2.0.*/../.debug/ \
@@ -207,7 +207,7 @@ FILES_libmono-system-data2.0-cil = "/usr
 	/usr/lib/mono/2.0/System.Data.dll*/*.mdb"
 FILES_libmono-system-data2.0-cil = "/usr/lib/mono/gac/System.Data/2.0.*/ \
 	/usr/lib/mono/2.0/System.Data.dll"
-FILES_libmono-corlib2.0-cil-dbg = "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \
+FILES_libmono-corlib2.0-cil-dbg += "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \
 	/usr/lib/mono/gac/I18N*/2.0.*/*/*.mdb \
 	/usr/lib/mono/gac/I18N*/2.0.*/.debug/ \
 	/usr/lib/mono/gac/I18N*/2.0.*/../.debug/ \
@@ -218,7 +218,7 @@ FILES_libmono-corlib2.0-cil = "/usr/lib/
 FILES_libmono-corlib2.0-cil = "/usr/lib/mono/gac/I18N*/2.0.*/ \
 	/usr/lib/mono/2.0/I18N*.dll \
 	/usr/lib/mono/2.0/mscorlib.dll*"
-FILES_libmono-winforms1.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \
+FILES_libmono-winforms1.0-cil-dbg += "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \
 	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/.debug/ \
 	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/../.debug/ \
@@ -242,7 +242,7 @@ FILES_libmono-winforms1.0-cil = "/usr/li
 	/usr/lib/mono/1.0/System.Windows.Forms.dll \
 	/usr/lib/mono/1.0/System.Drawing.Design.dll \
 	/usr/lib/mono/1.0/System.Design.dll"
-FILES_libmono-microsoft8.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \
+FILES_libmono-microsoft8.0-cil-dbg += "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \
 	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*/*.mdb \
 	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/.debug/ \
 	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/../.debug/ \
@@ -266,7 +266,7 @@ FILES_libmono-microsoft8.0-cil = "/usr/l
 	/usr/lib/mono/2.0/Microsoft.JScript.dll \
 	/usr/lib/mono/2.0/Microsoft.VisualC.dll \
 	/usr/lib/mono/2.0/Microsoft.Vsa.dll"
-FILES_libmono-corlib1.0-cil-dbg = "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \
+FILES_libmono-corlib1.0-cil-dbg += "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \
 	/usr/lib/mono/gac/I18N*/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/I18N*/1.0.*/.debug/ \
 	/usr/lib/mono/gac/I18N*/1.0.*/../.debug/ \
@@ -277,7 +277,7 @@ FILES_libmono-corlib1.0-cil = "/usr/lib/
 FILES_libmono-corlib1.0-cil = "/usr/lib/mono/gac/I18N*/1.0.*/ \
 	/usr/lib/mono/1.0/I18N*.dll \
 	/usr/lib/mono/1.0/mscorlib.dll*"
-FILES_libmono-system-web1.0-cil-dbg = "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \
+FILES_libmono-system-web1.0-cil-dbg += "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \
 	/usr/lib/mono/gac/System.Web/1.0.*/*/*.mdb \
 	/usr/lib/mono/gac/System.Web/1.0.*/.debug/ \
 	/usr/lib/mono/gac/System.Web/1.0.*/../.debug/ \
@@ -293,7 +293,7 @@ FILES_libmono-system-web1.0-cil = "/usr/
 	/usr/lib/mono/gac/System.Web.Services/1.0.*/ \
 	/usr/lib/mono/1.0/System.Web.dll \
 	/usr/lib/mono/1.0/System.Web.Services.dll"
-FILES_libmono-system-runtime2.0-cil-dbg = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/*.mdb \
+FILES_libmono-system-runtime2.0-%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re5dfd7992b2244d4e01908aa76025380bd3281d8 -r5a9b33b3608142864bb7c7dcbd6097c68b0952c4
#
#
#
# patch "contrib/angstrom/sort.sh"
#  from [1ca87a37ed30f99544bc51f6d766632632f65138]
#    to [15034c1ae1bdfc3c843c2b88c8ccfb0daa613f4b]
#
============================================================
--- contrib/angstrom/sort.sh	1ca87a37ed30f99544bc51f6d766632632f65138
+++ contrib/angstrom/sort.sh	15034c1ae1bdfc3c843c2b88c8ccfb0daa613f4b
@@ -26,7 +26,7 @@ cat files-duplicate | xargs rm -f
 cat files-duplicate | xargs rm -f
 
 # Log remaining packages to a file 
-find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v locale > new-files.txt
+find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt
 for newfile in $(cat new-files.txt | sed s:./::g) ; do
     echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload.txt
 done    
@@ -40,11 +40,13 @@ case "$arch" in
 	"armv4t")
 			machines="ep93xx h6300 fic-gta01 fic-gta02" ;;
 	"armv5te")
-			machines="davinci-dvevm gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
+			machines="davinci-dvevm gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
 	"armv5teb")
 			machines="ixp4xxbe nslu2be" ;;
 	"armv6")	
-			machines="mx31ads nokia800" ;;
+			machines="mx31ads nokia800 beagleboard" ;;
+	"armv7")
+			machine="beagleboard" ;;
 	"avr32")
 			machines="atngw100 at32stk1000" ;;
 	"bfin")
@@ -137,3 +139,5 @@ done
 for arch in arm-oabi armv4t armv5teb armv5te armv6 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do 
 	do_sort
 done
+
+(cd ~/website/repo ; php update.php)

More information about the Openembedded-commits mailing list