[oe-commits] org.oe.dev merge of '8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99'
cbrake commit
openembedded-commits at lists.openembedded.org
Thu Dec 13 20:16:48 UTC 2007
merge of '8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99'
and 'a3c2ca2c7bfaba0da5e3b8076463aa98d2cbc7ee'
Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43
ViewMTN: http://monotone.openembedded.org/revision/info/eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43
Files:
1
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
packages/meta/meta-angstrom-2007.bb
classes/scons.bbclass
conf/distro/include/angstrom-2007-preferred-versions.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/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/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/lua/lua-gtk2_0.3.bb
Diffs:
#
# mt diff -r8e43a244ea9fa6baf5febba95c6b7c0bf5ed1c99 -reeb3a83ad8d45d4069e1ae9170eb852a6bb31d43
#
#
#
# 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"
#
# add_file "packages/meta/meta-angstrom-2007.bb"
# content [4bfd1a85218210707ef5559a74494f4a8159a2e6]
#
# patch "classes/scons.bbclass"
# from [7daf072a8b69aecb7a353e129508b5e514b1b5f0]
# to [c546b54256dc44ccc4500ce748fb77c6d7efdcbd]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [1df58c146eb37f3348751095727aff4127bf116a]
# to [f3d89d1d37708d933d79f1a37dbef5925a80cf82]
#
# 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/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/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]
#
# patch "packages/lua/lua-gtk2_0.3.bb"
# from [c9dfa04bfadacb293d77536191d5d47951a938fa]
# to [ce285cb56e4d70c5f08d7a58733d767cc735e58e]
#
============================================================
--- 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 \
+ "
============================================================
--- 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/distro/include/angstrom-2007-preferred-versions.inc 1df58c146eb37f3348751095727aff4127bf116a
+++ conf/distro/include/angstrom-2007-preferred-versions.inc f3d89d1d37708d933d79f1a37dbef5925a80cf82
@@ -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"
============================================================
--- 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 d21eeca9a1bb496e84541d55957587838aaa33e9
+++ packages/fbreader/fbreader_0.8.2a.bb 44fe07852ed8432ebe5f55988cb384231d8b214a
@@ -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/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/gpephone/gpe-applauncher_0.11.bb 4cd8ca9197d759daf399a1817a800a2ca56b18de
+++ packages/gpephone/gpe-applauncher_0.11.bb b55f599b04b5149092913c0a2b83bc4350cdba59
@@ -1,8 +1,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
DESCRIPTION = "A cellphone application launcher."
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
@@ -18,7 +18,7 @@ SRC_URI += "file://hotkeys.conf \
SRC_URI += "file://hotkeys.conf \
file://softkeys.conf"
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
FILES_${PN} = '${datadir} ${bindir}'
FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
============================================================
--- packages/gpephone/gpe-applauncher_svn.bb 3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a
+++ packages/gpephone/gpe-applauncher_svn.bb 4d20c813ad46630580e0ffc689c3794f8154fff7
@@ -1,8 +1,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
DESCRIPTION = "A cellphone application launcher."
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
PV = "0.11+svn-${SRCREV}"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
@@ -24,7 +24,7 @@ SRC_URI += "file://hotkeys.conf \
SRC_URI += "file://hotkeys.conf \
file://softkeys.conf"
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
FILES_${PN} = '${datadir} ${bindir}'
FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
============================================================
--- packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb 9781b60290a0df053d4514a522caa2b65fba46e7
+++ packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb 837a617f042a71fda1b806d153ad3ddf07156a19
@@ -1,6 +1,6 @@ DESCRIPTION = "Clearlooks theme engine f
SECTION = "x11/base"
DESCRIPTION = "Clearlooks theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
DEPENDS = "gtk+"
PR = "r1"
============================================================
--- packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb a29d8bc3586b86df7583d9ab0091bfff380bd07d
+++ packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb d18fee8247c479d929f51640542c12d4827b584c
@@ -1,6 +1,6 @@ DESCRIPTION = "Industrial theme engine f
SECTION = "x11/base"
DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
DEPENDS = "gtk+"
SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
============================================================
--- 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_43%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra3c2ca2c7bfaba0da5e3b8076463aa98d2cbc7ee -reeb3a83ad8d45d4069e1ae9170eb852a6bb31d43
#
#
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [546f0b7cd75e89ebad52b4d7396bcc3642be4dd2]
# to [f3d89d1d37708d933d79f1a37dbef5925a80cf82]
#
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 546f0b7cd75e89ebad52b4d7396bcc3642be4dd2
+++ conf/distro/include/angstrom-2007-preferred-versions.inc f3d89d1d37708d933d79f1a37dbef5925a80cf82
@@ -1274,6 +1274,7 @@ PREFERRED_VERSION_mono ?= "1.2.5.1"
PREFERRED_VERSION_modutils-initscripts ?= "1.0"
PREFERRED_VERSION_moin ?= "1.5.8"
PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
PREFERRED_VERSION_mono-native ?= "1.2.5.1"
PREFERRED_VERSION_monotone-4 ?= "0.19"
PREFERRED_VERSION_monotone-5 ?= "0.25.2"
More information about the Openembedded-commits
mailing list