[oe-commits] org.oe.dev merge of 'b82d34d538132713ba10d59d0209f562e276f44b'

[oe commit]

merge of 'b82d34d538132713ba10d59d0209f562e276f44b'
     and 'fa252fa4613643090cf4875e44edac9246d3fcd0'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2d3caee9e1e9ea33c5c7e40e574742c2c7cefc64
ViewMTN: http://monotone.openembedded.org/revision/info/2d3caee9e1e9ea33c5c7e40e574742c2c7cefc64
Files:
1
packages/linux/linux-omap2-git/beagleboard/serialfix.diff
packages/linux/linux-omap2_git.bb
packages/pidgin/pidgin_2.4.2.bb
packages/pidgin/pidgin_2.4.3.bb
packages/pidgin/pidgin/pidgin-cross-python.patch
Diffs:

#
# mt diff -rb82d34d538132713ba10d59d0209f562e276f44b -r2d3caee9e1e9ea33c5c7e40e574742c2c7cefc64
#
#
#
# add_file "packages/linux/linux-omap2-git/beagleboard/serialfix.diff"
#  content [b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [26c924f048ec4a31e03284f8a09a9fcebcd5c6f6]
#    to [4daa78d5a50833c7b86ab2ab05dee181fb3ba85e]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/serialfix.diff	b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1
+++ packages/linux/linux-omap2-git/beagleboard/serialfix.diff	b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1
@@ -0,0 +1,18 @@
+--- /tmp/pm34xx.c	2008-07-14 18:09:08.000000000 +0200
++++ git/arch/arm/mach-omap2/pm34xx.c	2008-07-14 18:09:42.453198000 +0200
+@@ -398,13 +398,13 @@
+ 		       INT_34XX_PRCM_MPU_IRQ);
+ 		goto err1;
+ 	}
+-
++/*
+ 	ret = pwrdm_for_each(pwrdms_setup);
+ 	if (ret) {
+ 		printk(KERN_ERR "Failed to setup powerdomains\n");
+ 		goto err2;
+ 	}
+-
++*/
+ 	mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
+ 	if (mpu_pwrdm == NULL) {
+ 		printk(KERN_ERR "Failed to get mpu_pwrdm\n");
============================================================
--- packages/linux/linux-omap2_git.bb	26c924f048ec4a31e03284f8a09a9fcebcd5c6f6
+++ packages/linux/linux-omap2_git.bb	4daa78d5a50833c7b86ab2ab05dee181fb3ba85e
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCRE
 SRCREV = "7786cd7a00ae0b18923185789380a88052f4eee7"
 
 PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r43"
+PR = "r44"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -29,6 +29,7 @@ SRC_URI_append_beagleboard = " file://no
            file://06-ensure-fclk.diff;patch=1 \
            file://07-set-burst-size.diff;patch=1 \
            file://cache-display-fix.patch;patch=1 \
+           file://serialfix.diff;patch=1 \
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \


#
# mt diff -rfa252fa4613643090cf4875e44edac9246d3fcd0 -r2d3caee9e1e9ea33c5c7e40e574742c2c7cefc64
#
#
#
# rename "packages/pidgin/pidgin_2.4.2.bb"
#     to "packages/pidgin/pidgin_2.4.3.bb"
# 
# add_file "packages/pidgin/pidgin/pidgin-cross-python.patch"
#  content [f442a9d0892c0437e53ea5fe1ebb25ca4f08f29d]
# 
# patch "packages/pidgin/pidgin_2.4.3.bb"
#  from [3f2390a31461f3a1825dcbab4911c2a1f2d67061]
#    to [b23d77d5165ec006f9ac378b17cba948b42599b2]
#
============================================================
--- packages/pidgin/pidgin/pidgin-cross-python.patch	f442a9d0892c0437e53ea5fe1ebb25ca4f08f29d
+++ packages/pidgin/pidgin/pidgin-cross-python.patch	f442a9d0892c0437e53ea5fe1ebb25ca4f08f29d
@@ -0,0 +1,16 @@
+Index: pidgin-2.4.3/configure.ac
+===================================================================
+--- pidgin-2.4.3.orig/configure.ac	2008-07-14 13:13:16.000000000 +0000
++++ pidgin-2.4.3/configure.ac	2008-07-14 13:34:12.000000000 +0000
+@@ -1350,8 +1350,9 @@
+ 		AC_CHECK_LIB(pthread, pthread_create, )
+ 		AC_CHECK_LIB(util, openpty, )
+ 		AC_CHECK_LIB(db, dbopen, )
+-		PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+-		PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
++		m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++		PY_LIBS="-lpython$PY_VERSION -L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config"
++		PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION"
+ 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
+ 		AC_MSG_RESULT(ok)
+ 	else
============================================================
--- packages/pidgin/pidgin_2.4.2.bb	3f2390a31461f3a1825dcbab4911c2a1f2d67061
+++ packages/pidgin/pidgin_2.4.3.bb	b23d77d5165ec006f9ac378b17cba948b42599b2
@@ -7,6 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/
            file://gconf-no-errors.patch;patch=1 \
 	   file://pidgin.desktop-set-icon.patch;patch=1 \
 	   file://purple-OE-branding.patch;patch=1 \
+	   file://pidgin-cross-python.patch;patch=1 \
 	  " 
 
 EXTRA_OECONF += " --disable-gtkspell \