[oe-commits] org.oe.dev merge of '9b11d89eb867c4452963750a9d48fa45c70d0de6'

[cbrake commit]

merge of '9b11d89eb867c4452963750a9d48fa45c70d0de6'
     and 'd3bdc1b5bee60534f5a4180d1fb74d09b59c68a4'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 84c5f1855c9c61c62ef5e9a7eeb2514dc9483714
ViewMTN: http://monotone.openembedded.org/revision/info/84c5f1855c9c61c62ef5e9a7eeb2514dc9483714
Files:
1
packages/wifistix/wifistix-modules/marvell-devicename.patch
packages/wifistix/wifistix-modules/wifistix.conf
packages/wifistix/wifistix-modules_5.0.16.p0.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
classes/mono.bbclass
Diffs:

#
# mt diff -r9b11d89eb867c4452963750a9d48fa45c70d0de6 -r84c5f1855c9c61c62ef5e9a7eeb2514dc9483714
#
# 
# 
# patch "packages/wifistix/wifistix-modules/marvell-devicename.patch"
#  from [9b6c883a9fb5312a4df55598518c6eb2545a4f97]
#    to [c65d3a0361b8329187a0123dc4dc6891fe711842]
# 
# patch "packages/wifistix/wifistix-modules/wifistix.conf"
#  from [4f54c69eb79183559844c1a626d6423719ac141f]
#    to [8e05a5ef94bf024fba3186952cbf09c52e2b187f]
# 
# patch "packages/wifistix/wifistix-modules_5.0.16.p0.bb"
#  from [1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11]
#    to [1f6020f4a46c11c6f194b1f39764e362f282c95b]
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [9942a34a0ec3c2a5eca955706e5a9bf22f0b22ee]
#    to [ab6b7713f6a5d17b7c19e07445de40a86cc924e5]
# 
============================================================
--- packages/wifistix/wifistix-modules/marvell-devicename.patch	9b6c883a9fb5312a4df55598518c6eb2545a4f97
+++ packages/wifistix/wifistix-modules/marvell-devicename.patch	c65d3a0361b8329187a0123dc4dc6891fe711842
@@ -5,7 +5,7 @@
  	if (!(dev = init_etherdev(dev, sizeof(wlan_private)))) {
  #else
 -	if (!(dev = alloc_etherdev(sizeof(wlan_private)))) {
-+	if (!(dev = alloc_netdev(sizeof(wlan_private), "mwlan%d", ether_setup))) {
++	if (!(dev = alloc_netdev(sizeof(wlan_private), "wlan%d", ether_setup))) {
  #endif
  		PRINTM(MSG, "Init ethernet device failed!\n");
  		return NULL;
============================================================
--- packages/wifistix/wifistix-modules/wifistix.conf	4f54c69eb79183559844c1a626d6423719ac141f
+++ packages/wifistix/wifistix-modules/wifistix.conf	8e05a5ef94bf024fba3186952cbf09c52e2b187f
@@ -1,4 +1,4 @@ install pcmcia /sbin/modprobe --ignore-i
 install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
 
-alias mwlan0 mcf25
+alias wlan0 mcf25
 
============================================================
--- packages/wifistix/wifistix-modules_5.0.16.p0.bb	1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11
+++ packages/wifistix/wifistix-modules_5.0.16.p0.bb	1f6020f4a46c11c6f194b1f39764e362f282c95b
@@ -25,10 +25,10 @@ inherit module-base
 
 inherit module-base
 
-EXTRA_OEMAKE = "CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
-                KERNELDIR=${KERNEL_SOURCE} ARCH=${TARGET_ARCH} \
-                CC=${KERNEL_CC} EXTRA_CFLAGS=${CFLAGS} \
-                INSTALL_MOD_PATH="${D}"
+EXTRA_OEMAKE = 'CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
+                KERNELDIR="${KERNEL_SOURCE}" ARCH="${TARGET_ARCH}" \
+                CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" \
+                INSTALL_MOD_PATH="${D}"'
 
 do_compile() {	
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	9942a34a0ec3c2a5eca955706e5a9bf22f0b22ee
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	ab6b7713f6a5d17b7c19e07445de40a86cc924e5
@@ -7,7 +7,7 @@ PE = "1"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
         file://kdrive-vidmemarea.patch;patch=1 \
         file://kdrive-imageon.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
+        file://enable-builtin-fonts.patch;patch=1 \
         "
        
 S = "${WORKDIR}/xorg-server-${PV}"


#
# mt diff -rd3bdc1b5bee60534f5a4180d1fb74d09b59c68a4 -r84c5f1855c9c61c62ef5e9a7eeb2514dc9483714
#
# 
# 
# patch "classes/mono.bbclass"
#  from [8c6f975d1387bb98881133402216adc4c3dcaac8]
#    to [0877f77ba914921ba869e976db741cb7a21eabff]
# 
============================================================
--- classes/mono.bbclass	8c6f975d1387bb98881133402216adc4c3dcaac8
+++ classes/mono.bbclass	0877f77ba914921ba869e976db741cb7a21eabff
@@ -186,7 +186,7 @@ python mono_do_clilibs() {
 				if not dep_pkg in deps:
 					deps.append(dep_pkg)
 			else:
-				bb.note("Couldn't find CLI library provider for %s" % n)
+				bb.note("Couldn't find CLI library provider for %s" % (n,))
 
 		deps_file = os.path.join(pkgdest, pkg + ".clilibdeps")
 		if os.path.exists(deps_file):
@@ -198,7 +198,8 @@ python mono_do_clilibs() {
 			fd.close()
 }
 
-python() {
+def mono_after_parse(d):
+	import bb
 	# Insert mono_do_clilibs into PACKAGEFUNCS
 	# Needs to be called after populate_packages, but before read_shlibdeps
 	PACKAGEFUNCS = bb.data.getVar("PACKAGEFUNCS", d, 1)
@@ -211,4 +212,7 @@ python() {
 			i = PACKAGEFUNCS.index("populate_packages")
 			PACKAGEFUNCS.insert(i+1, "mono_do_clilibs")
 		bb.data.setVar("PACKAGEFUNCS", " ".join(PACKAGEFUNCS), d)
+
+python () {
+    mono_after_parse(d)
 }