[oe-commits] org.oe.dev merge of '03a19fcf3032ced8b3ff0f64a5777d254080a9f1'
oe commit
openembedded-commits at lists.openembedded.org
Thu Dec 13 13:38:22 UTC 2007
merge of '03a19fcf3032ced8b3ff0f64a5777d254080a9f1'
and '49d28932b8c420c0aebcd31ae9c387517ea1c6c0'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d72c64644be54ac05950d6f4b33d72196e8b3a9f
ViewMTN: http://monotone.openembedded.org/revision/info/d72c64644be54ac05950d6f4b33d72196e8b3a9f
Files:
1
classes/scons.bbclass
packages/gnome/gconf-dbus_svn.bb
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
packages/python/python-sip_4.7.1.bb
packages/python/python-sip_4.7.3.bb
packages/sip/sip-native_4.7.1.bb
packages/sip/sip-native_4.7.3.bb
Diffs:
#
# mt diff -r03a19fcf3032ced8b3ff0f64a5777d254080a9f1 -rd72c64644be54ac05950d6f4b33d72196e8b3a9f
#
#
#
# patch "classes/scons.bbclass"
# from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
# to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
# to [17c69da4bd130d92af8af24b002ef34409149a33]
#
# 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]
#
============================================================
--- 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."
}
============================================================
--- packages/gnome/gconf-dbus_svn.bb cfb0cd440b4736752691aef4cc9761eb15e6a9e4
+++ packages/gnome/gconf-dbus_svn.bb 17c69da4bd130d92af8af24b002ef34409149a33
@@ -7,7 +7,7 @@ PV = "2.16.0+svnr${SRCREV}"
RPROVIDES_${PN}-dev = "gconf-dev"
PV = "2.16.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
@@ -19,6 +19,7 @@ FILES_${PN}-dbg += " ${libdir}/GConf-dbu
FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
============================================================
--- 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 %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r49d28932b8c420c0aebcd31ae9c387517ea1c6c0 -rd72c64644be54ac05950d6f4b33d72196e8b3a9f
#
#
#
# rename "packages/python/python-sip_4.7.1.bb"
# to "packages/python/python-sip_4.7.3.bb"
#
# rename "packages/sip/sip-native_4.7.1.bb"
# to "packages/sip/sip-native_4.7.3.bb"
#
More information about the Openembedded-commits
mailing list