[oe-commits] org.oe.dev merge of '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'

[mickeyl commit]

merge of '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
     and '79e634145baa64265863342297f7b440e08d7d22'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 30b1decf31b37e6643b28149e04182c911b9a226
ViewMTN: http://monotone.openembedded.org/revision/info/30b1decf31b37e6643b28149e04182c911b9a226
Files:
1
packages/linux/linux_2.6.24.bb
packages/python/python-pygtk/nodocs.patch
packages/python/python-pygtk_2.10.4.bb
Diffs:

#
# mt diff -r3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9 -r30b1decf31b37e6643b28149e04182c911b9a226
#
# 
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [a75375b7ca7ed76615cb9278e38774e06c4104cc]
#    to [7f921d9c61b4d5bec81b3d36d7e23a98063b25ef]
# 
============================================================
--- packages/linux/linux_2.6.24.bb	a75375b7ca7ed76615cb9278e38774e06c4104cc
+++ packages/linux/linux_2.6.24.bb	7f921d9c61b4d5bec81b3d36d7e23a98063b25ef
@@ -13,13 +13,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
-           file://powerpc-clockres.patch;patch=1 \
-           file://leds-cpu-activity.patch;patch=1 \
-           file://leds-cpu-activity-powerpc.patch;patch=1 \
            file://defconfig"
 
-# Real-time preemption. This is experimental and requires a different defconfig.
-#SRC_URI += " http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1"
+# Moved away temporarely until committed properly (work in progress).
+#           file://powerpc-clockres.patch;patch=1 \
+#           file://leds-cpu-activity.patch;patch=1 \
+#           file://leds-cpu-activity-powerpc.patch;patch=1 \
 
 SRC_URI_append_simpad = "\
            file://linux-2.6.24-SIMpad-GPIO-MMC-mod.patch;patch=1 \


#
# mt diff -r79e634145baa64265863342297f7b440e08d7d22 -r30b1decf31b37e6643b28149e04182c911b9a226
#
# 
# 
# add_file "packages/python/python-pygtk/nodocs.patch"
#  content [50abf04fa1f14dd2f24ef8908651dcb30227d518]
# 
# patch "packages/python/python-pygtk_2.10.4.bb"
#  from [97365313b90449385ae4470aba6254d39ecdd2ab]
#    to [fea6fa33b56f90fb6590ac797faea3276a26a642]
# 
============================================================
--- packages/python/python-pygtk/nodocs.patch	50abf04fa1f14dd2f24ef8908651dcb30227d518
+++ packages/python/python-pygtk/nodocs.patch	50abf04fa1f14dd2f24ef8908651dcb30227d518
@@ -0,0 +1,13 @@
+Index: pygtk-2.10.4/Makefile.am
+===================================================================
+--- pygtk-2.10.4.orig/Makefile.am
++++ pygtk-2.10.4/Makefile.am
+@@ -4,7 +4,7 @@ if BUILD_GTK
+   GTK_SUBDIR = gtk
+ endif
+ 
+-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
+ 
+ PLATFORM_VERSION = 2.0
+ 
============================================================
--- packages/python/python-pygtk_2.10.4.bb	97365313b90449385ae4470aba6254d39ecdd2ab
+++ packages/python/python-pygtk_2.10.4.bb	fea6fa33b56f90fb6590ac797faea3276a26a642
@@ -6,10 +6,11 @@ LICENSE = "LGPL"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml5"
+PR = "ml6"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
+           file://nodocs.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"