[oe-commits] org.oe.dev merge of '261e22bd3535ccf811a14529928bb45c658241c2'

[oe commit]

merge of '261e22bd3535ccf811a14529928bb45c658241c2'
     and 'c18beadc5b113fa9ca28944c4fd379127c3ba500'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1a46fc762d9a0cbf1e265d5f4815e52563948ab6
ViewMTN: http://monotone.openembedded.org/revision/info/1a46fc762d9a0cbf1e265d5f4815e52563948ab6
Files:
1
packages/linux/linux.inc
packages/mono-xsp/mono-xsp_1.2.5.bb
Diffs:

#
# mt diff -r261e22bd3535ccf811a14529928bb45c658241c2 -r1a46fc762d9a0cbf1e265d5f4815e52563948ab6
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [725c2f919e6f7ef208779c7e133aaa60648fb1b3]
#    to [14e3b9590c6a3ef9334959ab19c1b24b1954b55b]
# 
============================================================
--- packages/linux/linux.inc	725c2f919e6f7ef208779c7e133aaa60648fb1b3
+++ packages/linux/linux.inc	14e3b9590c6a3ef9334959ab19c1b24b1954b55b
@@ -35,7 +35,7 @@ do_configure_prepend() {
         #
         if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
-                echo "# CONFIG_OABI_COMPAT is not set"             >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
         else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config


#
# mt diff -rc18beadc5b113fa9ca28944c4fd379127c3ba500 -r1a46fc762d9a0cbf1e265d5f4815e52563948ab6
#
# 
# 
# patch "packages/mono-xsp/mono-xsp_1.2.5.bb"
#  from [4b9d7c4ed6dd97dbfcc8260ac2d323785aa1fb95]
#    to [c07f58f87eccceac91242a9ea6e52aa94b9f439c]
# 
============================================================
--- packages/mono-xsp/mono-xsp_1.2.5.bb	4b9d7c4ed6dd97dbfcc8260ac2d323785aa1fb95
+++ packages/mono-xsp/mono-xsp_1.2.5.bb	c07f58f87eccceac91242a9ea6e52aa94b9f439c
@@ -45,10 +45,10 @@ FILES_libmono-webserver2.0-cil = " \
 	/usr/lib/mono/gac/Mono.WebServer2/0.2.*/ \
 	/usr/lib/mono/2.0/Mono.WebServer2.dll \
 	"
-FILES_mono-xsp-dbg = " \
+FILES_${PN}-dbg = " \
 	/usr/lib/mono/gac/xsp/1.2.*/*.mdb \
 	"
-FILES_mono-xsp = " \
+FILES_${PN} = " \
 	/usr/lib/mono/gac/xsp/1.2.*/ \
 	/usr/lib/mono/1.0/xsp.exe \
 	/usr/bin/xsp \