[oe-commits] org.oe.dev merge of '14a147908792e6213800ab92d6cfc1d77dbe07b4'

pfalcon commit openembedded-commits at lists.openembedded.org
Thu Dec 13 12:53:56 UTC 2007


merge of '14a147908792e6213800ab92d6cfc1d77dbe07b4'
     and 'bd9716558226c1049f7159d28c7f245818a2471f'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 49d28932b8c420c0aebcd31ae9c387517ea1c6c0
ViewMTN: http://monotone.openembedded.org/revision/info/49d28932b8c420c0aebcd31ae9c387517ea1c6c0
Files:
1
packages/mono/mono-1.2.5.1+1.2.6pre4
packages/gtk-webcore/midori_0.0.13.bb
packages/meta/meta-angstrom-2007.bb
packages/mono/files/mono-libgc-configure.patch
packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch
packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb
packages/mono/mono_1.2.5.1+1.2.6pre4.bb
packages/mono/mono_1.2.6.inc
classes/scons.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/enca/enca_1.9.bb
packages/fbreader/fbreader_0.7.3d.bb
packages/fbreader/fbreader_0.7.4q.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
packages/gnome/gconf-dbus_svn.bb
packages/gpephone/gpe-applauncher_0.11.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
packages/lua/lua-gtk2_0.3.bb
packages/webkit/files/WebKit.pri
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
packages/webkit/webkit.inc
packages/linux/linux-handhelds-2.6/asus620/defconfig
packages/linux/linux-handhelds-2.6/asus730/defconfig
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcalpine/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/looxc550/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
Diffs:

#
# mt diff -r14a147908792e6213800ab92d6cfc1d77dbe07b4 -r49d28932b8c420c0aebcd31ae9c387517ea1c6c0
#
# 
# 
# add_dir "packages/mono/mono-1.2.5.1+1.2.6pre4"
# 
# add_file "packages/gtk-webcore/midori_0.0.13.bb"
#  content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
# 
# add_file "packages/meta/meta-angstrom-2007.bb"
#  content [4bfd1a85218210707ef5559a74494f4a8159a2e6]
# 
# add_file "packages/mono/files/mono-libgc-configure.patch"
#  content [6d03f707ee635c13461bda9c2c2e9ed7c10e9638]
# 
# add_file "packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch"
#  content [f237d79597fc99f43d5667bdd4037483059be4ce]
# 
# add_file "packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb"
#  content [deef347df360a53f2881906e3b02eff6c10d718b]
# 
# add_file "packages/mono/mono_1.2.5.1+1.2.6pre4.bb"
#  content [216093941cee4967f4f56a2bc1549128a6d7d30e]
# 
# add_file "packages/mono/mono_1.2.6.inc"
#  content [122a38765ac62d06ad578e74a78979b8bbb87185]
# 
# patch "classes/scons.bbclass"
#  from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
#    to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
# 
# patch "conf/checksums.ini"
#  from [24dba11be6365114a3bc231951dfb98c4a566f08]
#    to [04b4283b58de2ba2856f6def18df3e268135b9bc]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [666f9821fd13c25a57a85d18bede92a2a755d104]
#    to [546f0b7cd75e89ebad52b4d7396bcc3642be4dd2]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [8cad7fba1595a9a46320eb14f7b63799769241ec]
#    to [07b627e17e9ef591c5ada94c502a4e67b77e885c]
# 
# patch "packages/enca/enca_1.9.bb"
#  from [7815a20c38ea4d3a4b163268f1afc426eb36fbbe]
#    to [12cf67dc83f652c02eab5abef8445e1d981b41ab]
# 
# patch "packages/fbreader/fbreader_0.7.3d.bb"
#  from [aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c]
#    to [34b11aba6a01b2904f78acd8ce7ad7c3befa6385]
# 
# patch "packages/fbreader/fbreader_0.7.4q.bb"
#  from [3071750398f41c84ca376433b0dd88d50e80577c]
#    to [44451b9b9caf082b52726f201197b9f344126ada]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [d21eeca9a1bb496e84541d55957587838aaa33e9]
#    to [44fe07852ed8432ebe5f55988cb384231d8b214a]
# 
# patch "packages/glibc/eglibc-package.bbclass"
#  from [f2443f95a6774f6041c3f94cbf9583fb4644b260]
#    to [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [f37cb5c2f3c0bbc766306cbd58bd7aaf336de265]
#    to [e0e53388d3e2f7fb82da6c0800429fb089aaa667]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
#    to [17c69da4bd130d92af8af24b002ef34409149a33]
# 
# patch "packages/gpephone/gpe-applauncher_0.11.bb"
#  from [4cd8ca9197d759daf399a1817a800a2ca56b18de]
#    to [b55f599b04b5149092913c0a2b83bc4350cdba59]
# 
# patch "packages/gpephone/gpe-applauncher_svn.bb"
#  from [3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a]
#    to [4d20c813ad46630580e0ffc689c3794f8154fff7]
# 
# patch "packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb"
#  from [9781b60290a0df053d4514a522caa2b65fba46e7]
#    to [837a617f042a71fda1b806d153ad3ddf07156a19]
# 
# patch "packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb"
#  from [a29d8bc3586b86df7583d9ab0091bfff380bd07d]
#    to [d18fee8247c479d929f51640542c12d4827b584c]
# 
# patch "packages/lua/lua-gtk2_0.3.bb"
#  from [c9dfa04bfadacb293d77536191d5d47951a938fa]
#    to [ce285cb56e4d70c5f08d7a58733d767cc735e58e]
# 
# patch "packages/webkit/files/WebKit.pri"
#  from [076f1c82b227a8d1472f9fa12e2fee65bd0c833c]
#    to [0e5c15ab2a6b4b986f311f4e0c55573ebf80191e]
# 
# patch "packages/webkit/files/WebKit.pro"
#  from [dd444c86e92aeb8c404efbd945a61ec54293c346]
#    to [ecf886ef5178fc86bdf74101c5bb563cb326002b]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [cda8f2a66ffa21e54d42abd299bfb7e2162a58a5]
#    to [2b24d6f59232655003cc23519603a66cec5aca93]
# 
# patch "packages/webkit/webkit.inc"
#  from [a9b135977d33b8fecb08b3e6b9ca8bae313ed7e2]
#    to [1b435431285f60a2f3bb6f118ed12807b76bee80]
# 
============================================================
--- packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
============================================================
--- packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
+++ packages/meta/meta-angstrom-2007.bb	4bfd1a85218210707ef5559a74494f4a8159a2e6
@@ -0,0 +1,32 @@
+# Meta file to inform the autobuilder which packages to build for the feeds
+# Any changes should be discussed first on the angstrom-distro-devel mailinglist
+
+# Try to keep it alphabetically sorted please
+ 
+inherit meta
+
+RDEPENDS = ""
+
+# Basic tools
+RDEPENDS += " \
+         task-proper-tools \
+	 screen \
+	 "
+
+# Browsers know to work on all archs
+RDEPENDS += " \
+         gpe-mini-browser \
+         midori \
+	 minimo \
+         openmoko-browser2 \
+	 webkit-gtklauncher \
+         "
+
+# Webservers
+RDEPENDS += " \
+        apache2 \
+        boa \
+	cherokee \
+	lighttpd \
+	thttpd \
+	"
============================================================
--- packages/mono/files/mono-libgc-configure.patch	6d03f707ee635c13461bda9c2c2e9ed7c10e9638
+++ packages/mono/files/mono-libgc-configure.patch	6d03f707ee635c13461bda9c2c2e9ed7c10e9638
@@ -0,0 +1,20 @@
+Index: mono-1.2.6/libgc/configure.in
+===================================================================
+--- mono-1.2.6.orig/libgc/configure.in	2007-12-12 15:02:31.000000000 -0500
++++ mono-1.2.6/libgc/configure.in	2007-12-12 15:05:10.000000000 -0500
+@@ -17,6 +17,15 @@
+ AC_PREREQ(2.53)
+ AC_INIT(libgc-mono, 6.6, Hans_Boehm at hp.com)
+ 
++# the following is a very strange bug.  CPPFLAGS does not get set correctly
++# if CPPFLAGS is set in the environment.  The top level configure script
++# appends to the CPPFLAGS variable, and then exports it.  This change should
++# be picked up by this configure script, but it is not.  The original 
++# env variable is still used for some reason.  If CPPFLAGS is not set in the
++# environment, everything works fine.
++# Someone more experienced with autoconf will have to come up with a better fix.
++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP  -DUSE_COMPILER_TLS"
++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS"
+ AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define)
+ 
+ AC_CONFIG_SRCDIR(gcj_mlc.c)
============================================================
--- packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch	f237d79597fc99f43d5667bdd4037483059be4ce
+++ packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch	f237d79597fc99f43d5667bdd4037483059be4ce
@@ -0,0 +1,23 @@
+Index: mono-1.2.6/configure.in
+===================================================================
+--- mono-1.2.6.orig/configure.in	2007-11-08 17:07:57.000000000 -0500
++++ mono-1.2.6/configure.in	2007-12-12 15:27:52.000000000 -0500
+@@ -1150,6 +1150,8 @@
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1252,6 +1254,9 @@
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
============================================================
--- packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb	deef347df360a53f2881906e3b02eff6c10d718b
+++ packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb	deef347df360a53f2881906e3b02eff6c10d718b
@@ -0,0 +1,12 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.2.6.inc
+require mono-mcs-intermediate.inc
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/mono/mono_1.2.5.1+1.2.6pre4.bb	216093941cee4967f4f56a2bc1549128a6d7d30e
+++ packages/mono/mono_1.2.5.1+1.2.6pre4.bb	216093941cee4967f4f56a2bc1549128a6d7d30e
@@ -0,0 +1,80 @@
+require mono_1.2.6.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+
+# Import file definitions from Debian
+require mono_1.2.5.1-files.inc
+
+# Add some packages
+PACKAGES_append = " mono-doc mono mono-runtime"
+
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = ""
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+# Packages not included in Debian
+PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
+	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
+	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
+
+FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
+FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
+FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
+
+FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
+FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
+
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
+
+# Move .pc files
+FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
+PACKAGES =+ " libmono-cairo1.0-cil-dev "
============================================================
--- packages/mono/mono_1.2.6.inc	122a38765ac62d06ad578e74a78979b8bbb87185
+++ packages/mono/mono_1.2.6.inc	122a38765ac62d06ad578e74a78979b8bbb87185
@@ -0,0 +1,13 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2 \
+	   file://mono-libgc-configure.patch;patch=1"
+
+S = "${WORKDIR}/mono-1.2.6"
+
+inherit autotools
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
============================================================
--- classes/scons.bbclass	7daf072a8b69aecb7a353e129508b5e514b1b5f0
+++ classes/scons.bbclass	c546b54256dc44ccc4500ce748fb77c6d7efdcbd
@@ -6,6 +6,7 @@ scons_do_install() {
 }
 
 scons_do_install() {
+	install -d ${D}${prefix}
         ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
         oefatal "scons install execution failed."
 }
============================================================
--- conf/checksums.ini	24dba11be6365114a3bc231951dfb98c4a566f08
+++ conf/checksums.ini	04b4283b58de2ba2856f6def18df3e268135b9bc
@@ -7806,6 +7806,10 @@ sha256=d68f597c303678c3f325f552a0e2780b6
 md5=b67ef657b83ca26249d7b9e9c5e7da69
 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 
+[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2]
+md5=391f85b4f962269e044ceac2b5235310
+sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
+
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	666f9821fd13c25a57a85d18bede92a2a755d104
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	546f0b7cd75e89ebad52b4d7396bcc3642be4dd2
@@ -1236,7 +1236,7 @@ PREFERRED_VERSION_microwindows ?= "0.90"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.12"
+PREFERRED_VERSION_midori ?= "0.0.13"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
============================================================
--- conf/distro/include/sane-srcrevs.inc	8cad7fba1595a9a46320eb14f7b63799769241ec
+++ conf/distro/include/sane-srcrevs.inc	07b627e17e9ef591c5ada94c502a4e67b77e885c
@@ -62,7 +62,7 @@ SRCREV_pn-openmoko-appmanager2 ?= "3442"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3249"
+SRCREV_pn-openmoko-browser2 ?= "3646"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
 SRCREV_pn-openmoko-common ?= "397"
@@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dialer2 ?= "3522"
 SRCREV_pn-openmoko-dates2 ?= "661"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3522"
-SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
@@ -121,9 +121,9 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-webkit-gtk ?= "27222"
-SRCREV_pn-webkit-qt ?= "27222"
-SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-qt ?= "28656"
+SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
============================================================
--- packages/enca/enca_1.9.bb	7815a20c38ea4d3a4b163268f1afc426eb36fbbe
+++ packages/enca/enca_1.9.bb	12cf67dc83f652c02eab5abef8445e1d981b41ab
@@ -1,7 +1,7 @@ DESCRIPTION = "Enca is an Extremely Naiv
 DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
-LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
 PR = "r2"
 
============================================================
--- packages/fbreader/fbreader_0.7.3d.bb	aab2e6e0b1fd44ae8961388d9eb632ca132d9d9c
+++ packages/fbreader/fbreader_0.7.3d.bb	34b11aba6a01b2904f78acd8ce7ad7c3befa6385
@@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook read
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
============================================================
--- packages/fbreader/fbreader_0.7.4q.bb	3071750398f41c84ca376433b0dd88d50e80577c
+++ packages/fbreader/fbreader_0.7.4q.bb	44451b9b9caf082b52726f201197b9f344126ada
@@ -1,5 +1,5 @@ DESCRIPTION = "FBreader is an ebook read
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb	d21eeca9a1bb496e84%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rbd9716558226c1049f7159d28c7f245818a2471f -r49d28932b8c420c0aebcd31ae9c387517ea1c6c0
#
# 
# 
# patch "packages/linux/linux-handhelds-2.6/asus620/defconfig"
#  from [25e597b7b4d198e03d0d13da080b7b6770a91494]
#    to [1f28f885c5d38a58e7286ab2b6ac1002fdb25919]
# 
# patch "packages/linux/linux-handhelds-2.6/asus730/defconfig"
#  from [0e8d5cfdfde878a557606427897b95ca0ed89e05]
#    to [be44aaf3fb8180bec1b20f704ddcf5310f388c1a]
# 
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
#  from [c9f1e7f6d4d88ad1489c2bdefbf6c9c836997811]
#    to [5eb86eec70dcb5cd7849c55d2c30f3fa150c699d]
# 
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
#  from [48d4f15c17a3acca48375951fa650888b11328b0]
#    to [46081d5ce43fbed774749aa007f415e38a84c459]
# 
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
#  from [4edecb50b9ccde22ac6f11152eb079e4ddee7f59]
#    to [d4ecc27e27fe31f1162de33855d5f470a667f155]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [be9ab6709d2cbacb25194cc8c418ef362d23cc83]
#    to [08b3c80cfa2998d235449d22eebca4323d6fc861]
# 
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
#  from [062fd682e93b2be2952ce6cd369694e8b1ac98b4]
#    to [3371e00777176fc053ef6c639da693ff9bd8177f]
# 
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
#  from [53c0db328030e9c261b3c25335a476e0382bf159]
#    to [ccabe93146ef341f44e458dc87655fa5b6672b04]
# 
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
#  from [8968beac1464c9ac3f49cd96ca6d44fe7d1a8f44]
#    to [ffc92b049046023011e9edc3be646f0a7171412e]
# 
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
#  from [6679e336469fe518991a6713b58fcc6f01e283a6]
#    to [f8c89b6ee9fd85b9f73616125173acb08dcd876f]
# 
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
#  from [829a8026372e855cabb67aae687021a5ec4807bd]
#    to [a4b32acece2cb8b3cabcfdf0bfb966fbcc84f727]
# 
# patch "packages/linux/linux-handhelds-2.6/htcalpine/defconfig"
#  from [6d8cb5802383d1901b4757495e5d1a96a62ae90e]
#    to [28a648c7ed768cc6d1893808d60c138957994101]
# 
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  from [5a07e8000ae245a21252eef03de6d369324f1c26]
#    to [728952328872977446a2a1f5c5d517fd85b77fe6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcbeetles/defconfig"
#  from [90b63bec87cc48280fdcff164c76f901ee31a9a5]
#    to [d0b072fcacb3d1198cf6492b6a8d9f4842a8deb6]
# 
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
#  from [93877a6b119ac6ff9eac335f5209ace4526ebc26]
#    to [4298a8b960bf2bbbf29d0117be20cc2ddcc2dbfc]
# 
# patch "packages/linux/linux-handhelds-2.6/htchimalaya/defconfig"
#  from [15ed48296aeb843fb65397ab07c3c91b7f551329]
#    to [a0b1e58b136d82b046c1f9f09ea54fe319ef7b9e]
# 
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  from [25c38ecbeefb000df27167a7f64c71575d4e3fd5]
#    to [6be07a550a272c9438b89e3aa72f0077a228b33a]
# 
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
#  from [bad1578f36cf211ff37bf06ddd4814803093fde9]
#    to [4f4cc6cbb707682abc20f3d4f416354fb10ec460]
# 
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
#  from [150bbd7fb1efe62256c73d94c9f73c7d2a573c78]
#    to [69f3e1be12eb511255b730a73ceca46476781aa1]
# 
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
#  from [658007cf47d59e334d15c78614d0f579c9ee5186]
#    to [dcb72d61b8285f06ef5d4ffb05edddde96c8e41a]
# 
# patch "packages/linux/linux-handhelds-2.6/looxc550/defconfig"
#  from [9173c6f7100182781b44a1b9cfa96d780acd7f44]
#    to [e4fc3f28dfd712bf9f578ff39add76ad21b7a470]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [7eef8e486c42fc9ae1aedc28705d3194e7aa50b7]
#    to [1c3f28a4f54b40982eb1d7a668d725f8fc66b212]
# 
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
#  from [27c732122cbbae9384cbed08a597d68154115f8e]
#    to [2df0b2e984871d4e1a64dec9c4d294029b78f2ec]
# 
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
#  from [efa192ab9c34739127619f4ce566b48b0fb6ecd2]
#    to [a539effd5649afcb400b289746fa35d7cde586e8]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
#  from [2e774376b648af5299a532253bd79480809c5e54]
#    to [49685f54bf88b77f0c58a25c20ad416690435f97]
# 
============================================================
--- packages/linux/linux-handhelds-2.6/asus620/defconfig	25e597b7b4d198e03d0d13da080b7b6770a91494
+++ packages/linux/linux-handhelds-2.6/asus620/defconfig	1f28f885c5d38a58e7286ab2b6ac1002fdb25919
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:25 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:42 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1127,7 +1127,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1151,7 +1151,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/asus730/defconfig	0e8d5cfdfde878a557606427897b95ca0ed89e05
+++ packages/linux/linux-handhelds-2.6/asus730/defconfig	be44aaf3fb8180bec1b20f704ddcf5310f388c1a
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:26 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:43 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1248,7 +1248,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1272,7 +1272,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/aximx50/defconfig	c9f1e7f6d4d88ad1489c2bdefbf6c9c836997811
+++ packages/linux/linux-handhelds-2.6/aximx50/defconfig	5eb86eec70dcb5cd7849c55d2c30f3fa150c699d
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:26 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:43 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1112,7 +1112,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1136,7 +1136,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/eteng500/defconfig	48d4f15c17a3acca48375951fa650888b11328b0
+++ packages/linux/linux-handhelds-2.6/eteng500/defconfig	46081d5ce43fbed774749aa007f415e38a84c459
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:27 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:44 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1102,7 +1102,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1126,7 +1126,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h1910/defconfig	4edecb50b9ccde22ac6f11152eb079e4ddee7f59
+++ packages/linux/linux-handhelds-2.6/h1910/defconfig	d4ecc27e27fe31f1162de33855d5f470a667f155
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:27 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:44 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1182,7 +1182,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1206,7 +1206,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h2200/defconfig	be9ab6709d2cbacb25194cc8c418ef362d23cc83
+++ packages/linux/linux-handhelds-2.6/h2200/defconfig	08b3c80cfa2998d235449d22eebca4323d6fc861
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:28 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:45 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1583,7 +1583,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1607,7 +1607,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3600/defconfig	062fd682e93b2be2952ce6cd369694e8b1ac98b4
+++ packages/linux/linux-handhelds-2.6/h3600/defconfig	3371e00777176fc053ef6c639da693ff9bd8177f
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:28 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:45 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1101,7 +1101,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1125,7 +1125,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3800/defconfig	53c0db328030e9c261b3c25335a476e0382bf159
+++ packages/linux/linux-handhelds-2.6/h3800/defconfig	ccabe93146ef341f44e458dc87655fa5b6672b04
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:29 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:46 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -954,6 +954,7 @@ CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
+# CONFIG_MMC_ASIC1 is not set
 
 #
 # Real Time Clock
@@ -1098,7 +1099,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1122,7 +1123,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3900/defconfig	8968beac1464c9ac3f49cd96ca6d44fe7d1a8f44
+++ packages/linux/linux-handhelds-2.6/h3900/defconfig	ffc92b049046023011e9edc3be646f0a7171412e
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:29 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:46 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1066,6 +1066,7 @@ CONFIG_MMC_ASIC3=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
 CONFIG_MMC_ASIC3=y
+# CONFIG_MMC_ASIC1 is not set
 
 #
 # Real Time Clock
@@ -1216,7 +1217,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1240,7 +1241,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h4000/defconfig	6679e336469fe518991a6713b58fcc6f01e283a6
+++ packages/linux/linux-handhelds-2.6/h4000/defconfig	f8c89b6ee9fd85b9f73616125173acb08dcd876f
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:30 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:47 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -158,12 +158,9 @@ CONFIG_MACH_H4300=y
 # CONFIG_MACH_H3900 is not set
 CONFIG_MACH_H4000=y
 CONFIG_MACH_H4300=y
-CONFIG_IPAQ_H4000_IRDA=m
 CONFIG_IPAQ_H4000_LCD=y
 CONFIG_IPAQ_H4000_BACKLIGHT=y
 CONFIG_IPAQ_H4000_PCMCIA=y
-# CONFIG_IPAQ_H4000_BUTTONS is not set
-CONFIG_IPAQ_H4000_LEDS=y
 CONFIG_IPAQ_H4000_BT=m
 CONFIG_IPAQ_H4300_KBD=y
 # CONFIG_MACH_H4700 is not set
@@ -1340,7 +1337,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1364,7 +1361,7 @@ CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h5000/defconfig	829a8026372e855cabb67aae687021a5ec4807bd
+++ packages/linux/linux-handhelds-2.6/h5000/defconfig	a4b32acece2cb8b3cabcfdf0bfb966fbcc84f727
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:30 2007
+# Linux kernel version: 2.6.21-hh19
+# Thu Dec 13 13:04:47 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1218,7 +1218,7 @@ CONFIG_NLS_DEFAULT="utf8"
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list