[oe-commits] org.oe.dev merge of '3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 06:50:07 UTC 2008
merge of '3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea'
and '452752a8a35efe6e789ae2bdef83478bdb218f00'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 328e55791e71db3003684a8030a9577de72e294a
ViewMTN: http://monotone.openembedded.org/revision/info/328e55791e71db3003684a8030a9577de72e294a
Files:
1
packages/maemo4/hildon-thumbnail_0.14.bb
packages/maemo4/libhildonmime_1.10.0.bb
packages/maemo4/libosso.inc
packages/python/python-dbus
packages/python/python-dbus/allow-older-autotools.patch
packages/python/python-dbus/python-path.patch
packages/xorg-lib/diet-x11
packages/xorg-lib/diet-x11/autofoo.patch
packages/xorg-lib/diet-x11/makekeys.diff
packages/xorg-lib/files
packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
packages/xorg-lib/files/fix-utf8-wrong-define.patch
packages/xorg-lib/libice
packages/xorg-lib/libice/autofoo.patch
packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
packages/xorg-lib/libsm
packages/xorg-lib/libsm/autofoo.patch
packages/xorg-lib/libx11/autofoo.patch
packages/xorg-lib/libxau
packages/xorg-lib/libxau/autofoo.patch
packages/xorg-lib/libxaw
packages/xorg-lib/libxaw/auxdir.patch
packages/xorg-lib/libxcalibrate
packages/xorg-lib/libxcalibrate/coords.patch
packages/xorg-lib/libxcomposite-1.0.1
packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
packages/xorg-lib/libxcursor
packages/xorg-lib/libxcursor/autofoo.patch
packages/xorg-lib/libxcursor-1.1.2
packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
packages/xorg-lib/libxdamage
packages/xorg-lib/libxdamage/m4.patch
packages/xorg-lib/libxdamage-1.0.1
packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
packages/xorg-lib/libxdmcp
packages/xorg-lib/libxdmcp/autofoo.patch
packages/xorg-lib/libxext
packages/xorg-lib/libxext/autofoo.patch
packages/xorg-lib/libxfixes
packages/xorg-lib/libxfixes/autofoo.patch
packages/xorg-lib/libxfont/autofoo.patch
packages/xorg-lib/libxfont/scalable.patch
packages/xorg-lib/libxft
packages/xorg-lib/libxft/autofoo.patch
packages/xorg-lib/libxi
packages/xorg-lib/libxi/autofoo.patch
packages/xorg-lib/libxpm
packages/xorg-lib/libxpm/autofoo.patch
packages/xorg-lib/libxrandr
packages/xorg-lib/libxrandr/autofoo.patch
packages/xorg-lib/libxrandr-1.0.2
packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
packages/xorg-lib/libxrender
packages/xorg-lib/libxrender/autofoo.patch
packages/xorg-lib/libxt
packages/xorg-lib/libxt/autofoo.patch
packages/xorg-proto/calibrateproto
packages/xorg-proto/calibrateproto/coords.patch
packages/python/python-dbus_0.81.1.bb
packages/python/python-dbus_0.82.4.bb
packages/xorg-lib/diet-x11/X18NCMSstubs.diff
packages/xorg-lib/libx11/X18NCMSstubs.diff
packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
packages/xorg-lib/libx11/fix-disable-xlocale.diff
packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
packages/xorg-lib/diet-x11/xchar2b.patch
packages/xorg-lib/libx11/xchar2b.patch
packages/xorg-lib/diet-x11/xim.patch
packages/xorg-lib/libx11/xim.patch
packages/xorg-lib/files/ruutf8.patch
packages/xorg-lib/libx11/ruutf8.patch
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
packages/xorg-xserver/files/fix-picturestr-include-order.patch
packages/amule
packages/amule/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/ipkg/files/update_version_comparision.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/preferred-xorg-versions-X11R7.0.inc
conf/distro/include/preferred-xorg-versions-X11R7.1.inc
conf/distro/include/preferred-xorg-versions-X11R7.2.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
conf/distro/include/preferred-xorg-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/nokia770.conf
packages/gtk-webcore/osb-nrcore.inc
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/psplash/files/logo-math.patch
packages/xorg-lib/diet-x11_1.1.1.bb
packages/xorg-lib/diet-x11_1.1.2.bb
packages/xorg-lib/diet-x11_1.1.3.bb
packages/xorg-lib/libxcalibrate_git.bb
packages/xorg-proto/calibrateproto_git.bb
packages/xorg-proto/renderproto_0.9.3.bb
packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
Diffs:
#
# mt diff -r3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea -r328e55791e71db3003684a8030a9577de72e294a
#
#
#
# patch "packages/maemo4/hildon-thumbnail_0.14.bb"
# from [b965c3b2137d65d559b6e2fc3a5d1b06f42af721]
# to [b9572a53fa61f91c39714ccab1af3eb56c039fa1]
#
# patch "packages/maemo4/libhildonmime_1.10.0.bb"
# from [25951b1409cc178b5fb12b25009d3b44aa028546]
# to [c24b3bf5acb08c0cb5512eb3be8cd1c2bfa1f51d]
#
# patch "packages/maemo4/libosso.inc"
# from [304467b6e4fd87052f5fe7daf6f379f4a96c86ad]
# to [aab03cbd418b8b2b547d82d33a2bff10c76ac7fb]
#
============================================================
--- packages/maemo4/hildon-thumbnail_0.14.bb b965c3b2137d65d559b6e2fc3a5d1b06f42af721
+++ packages/maemo4/hildon-thumbnail_0.14.bb b9572a53fa61f91c39714ccab1af3eb56c039fa1
@@ -1,6 +1,6 @@ require hildon-thumbnail.inc
require hildon-thumbnail.inc
-DEPENDS = "libhildon libosso"
+DEPENDS = "libhildon libosso osso-gnome-vfs2"
PR = "r0"
============================================================
--- packages/maemo4/libhildonmime_1.10.0.bb 25951b1409cc178b5fb12b25009d3b44aa028546
+++ packages/maemo4/libhildonmime_1.10.0.bb c24b3bf5acb08c0cb5512eb3be8cd1c2bfa1f51d
@@ -5,3 +5,5 @@ SRC_URI = "http://repository.maemo.org/p
PR = "r0"
SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
+
+EXTRA_OECONF += "--with-compile-warnings=no"
============================================================
--- packages/maemo4/libosso.inc 304467b6e4fd87052f5fe7daf6f379f4a96c86ad
+++ packages/maemo4/libosso.inc aab03cbd418b8b2b547d82d33a2bff10c76ac7fb
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
LICENSE = "LGPL"
-DESCRIPTION = "Nokia osso library"
+DESCRIPTION = "Nokia OSSO IPC library"
-DEPENDS = "dbus-glib glib-2.0"
+DEPENDS = "dbus-glib glib-2.0 mce-dev"
inherit autotools pkgconfig lib_package
#
# mt diff -r452752a8a35efe6e789ae2bdef83478bdb218f00 -r328e55791e71db3003684a8030a9577de72e294a
#
#
#
# delete "packages/python/python-dbus"
#
# delete "packages/python/python-dbus/allow-older-autotools.patch"
#
# delete "packages/python/python-dbus/python-path.patch"
#
# delete "packages/xorg-lib/diet-x11"
#
# delete "packages/xorg-lib/diet-x11/autofoo.patch"
#
# delete "packages/xorg-lib/diet-x11/makekeys.diff"
#
# delete "packages/xorg-lib/files"
#
# delete "packages/xorg-lib/files/errordb-keysymdb-path-fix.patch"
#
# delete "packages/xorg-lib/files/fix-utf8-wrong-define.patch"
#
# delete "packages/xorg-lib/libice"
#
# delete "packages/xorg-lib/libice/autofoo.patch"
#
# delete "packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch"
#
# delete "packages/xorg-lib/libsm"
#
# delete "packages/xorg-lib/libsm/autofoo.patch"
#
# delete "packages/xorg-lib/libx11/autofoo.patch"
#
# delete "packages/xorg-lib/libxau"
#
# delete "packages/xorg-lib/libxau/autofoo.patch"
#
# delete "packages/xorg-lib/libxaw"
#
# delete "packages/xorg-lib/libxaw/auxdir.patch"
#
# delete "packages/xorg-lib/libxcalibrate"
#
# delete "packages/xorg-lib/libxcalibrate/coords.patch"
#
# delete "packages/xorg-lib/libxcomposite-1.0.1"
#
# delete "packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch"
#
# delete "packages/xorg-lib/libxcursor"
#
# delete "packages/xorg-lib/libxcursor/autofoo.patch"
#
# delete "packages/xorg-lib/libxcursor-1.1.2"
#
# delete "packages/xorg-lib/libxcursor-1.1.2/autofoo.patch"
#
# delete "packages/xorg-lib/libxdamage"
#
# delete "packages/xorg-lib/libxdamage/m4.patch"
#
# delete "packages/xorg-lib/libxdamage-1.0.1"
#
# delete "packages/xorg-lib/libxdamage-1.0.1/autofoo.patch"
#
# delete "packages/xorg-lib/libxdmcp"
#
# delete "packages/xorg-lib/libxdmcp/autofoo.patch"
#
# delete "packages/xorg-lib/libxext"
#
# delete "packages/xorg-lib/libxext/autofoo.patch"
#
# delete "packages/xorg-lib/libxfixes"
#
# delete "packages/xorg-lib/libxfixes/autofoo.patch"
#
# delete "packages/xorg-lib/libxfont/autofoo.patch"
#
# delete "packages/xorg-lib/libxfont/scalable.patch"
#
# delete "packages/xorg-lib/libxft"
#
# delete "packages/xorg-lib/libxft/autofoo.patch"
#
# delete "packages/xorg-lib/libxi"
#
# delete "packages/xorg-lib/libxi/autofoo.patch"
#
# delete "packages/xorg-lib/libxpm"
#
# delete "packages/xorg-lib/libxpm/autofoo.patch"
#
# delete "packages/xorg-lib/libxrandr"
#
# delete "packages/xorg-lib/libxrandr/autofoo.patch"
#
# delete "packages/xorg-lib/libxrandr-1.0.2"
#
# delete "packages/xorg-lib/libxrandr-1.0.2/autofoo.patch"
#
# delete "packages/xorg-lib/libxrender"
#
# delete "packages/xorg-lib/libxrender/autofoo.patch"
#
# delete "packages/xorg-lib/libxt"
#
# delete "packages/xorg-lib/libxt/autofoo.patch"
#
# delete "packages/xorg-proto/calibrateproto"
#
# delete "packages/xorg-proto/calibrateproto/coords.patch"
#
# rename "packages/python/python-dbus_0.81.1.bb"
# to "packages/python/python-dbus_0.82.4.bb"
#
# rename "packages/xorg-lib/diet-x11/X18NCMSstubs.diff"
# to "packages/xorg-lib/libx11/X18NCMSstubs.diff"
#
# rename "packages/xorg-lib/diet-x11/fix-disable-xlocale.diff"
# to "packages/xorg-lib/libx11/fix-disable-xlocale.diff"
#
# rename "packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch"
# to "packages/xorg-lib/libx11/fix-utf8-wrong-define.patch"
#
# rename "packages/xorg-lib/diet-x11/xchar2b.patch"
# to "packages/xorg-lib/libx11/xchar2b.patch"
#
# rename "packages/xorg-lib/diet-x11/xim.patch"
# to "packages/xorg-lib/libx11/xim.patch"
#
# rename "packages/xorg-lib/files/ruutf8.patch"
# to "packages/xorg-lib/libx11/ruutf8.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
# to "packages/xorg-xserver/files/fix-picturestr-include-order.patch"
#
# add_dir "packages/amule"
#
# add_dir "packages/amule/files"
#
# add_file "packages/amule/amule_2.1.3.bb"
# content [e94b17ff6a0526951854c033da5fe53b89be7198]
#
# add_file "packages/amule/files/parser.patch"
# content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
#
# add_file "packages/ipkg/files/update_version_comparision.patch"
# content [b940420d7d71ccae026536ddf7f2c5c503485a9d]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch"
# content [84ca7646072efff95ac1ba21996214de0887506e]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# to [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.0.inc"
# from [e17d1ac473c7551aa878a4025a0c72d1299ddee1]
# to [0414701d17a1c2f342d391ce49ccd43dbdf2f92d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.1.inc"
# from [22d02a23b97d863397deca71f6cf47ac842a3041]
# to [be10d29bb8807639b7ec4fff641a33f48a5d33fb]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.2.inc"
# from [e56e290af0c2177e02d83403e1a8719853127dba]
# to [554e0995c7ce93e7c76bf2affe531b1e77fd7e1d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
# to [5f058c2bfda8331944c60e4241fb698a16acae65]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# from [2bd8404a566895df3ee956c8fec2fb169386ffc9]
# to [1c80460587c91260a4733ef34bf4747aef7fc19b]
#
# patch "conf/distro/include/preferred-xorg-versions.inc"
# from [defa236a54b9b69361fb032b1fe6ec8b63cdc8e4]
# to [20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d864a60f9ae785c0ec3e27ce5ea71dacd656d7de]
# to [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
#
# patch "conf/distro/openmoko.conf"
# from [32e366a34046342c394581a28fe3f1af2a0a1a4c]
# to [4512da55b21499913ae1534988c81c3c26b99c64]
#
# patch "conf/machine/nokia770.conf"
# from [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
# to [166593848b21599e1958aa05bef25162b9e867e4]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
# to [a81dab6970cf3f620379e415339da87027c19963]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [f62a84dc0cdc3962fb9564cd48a0fd07dd475723]
# to [a204f18c290c5da4e91d8300e8461c07ebc1795e]
#
# patch "packages/ipkg/ipkg.inc"
# from [fc113df6d214da7a33273c7512dac5215da76f90]
# to [24a763cc5bb1e3e620137a13ec1a20d94c5f06a8]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [3a58f561fcf234def5a100e624f4c721f8694641]
# to [3bd38599bcc9677fbd8d3f25e54fb498786d46f2]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [31fbac69083a743610a7b45b209c1eedf231ea8f]
# to [226e96adfe6504d2b1c198a787fe70f46c3a0b67]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [f9f0f5550a035d11532343bcf6adeddd9141aacb]
# to [ec0ab967eff58b5d646241e714a9e0f0ee02b8fa]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
# from [71c60d4143f978557ba0717399bc7cc3c0c139b4]
# to [b1d251def3d0ffe97b8aa186ac96c852061db329]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
# to [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [d0076453dce6a15a60ac441aaedca4b4d35b86da]
# to [a9d28d2fb58ab00bc0024eb2dc819228bbe6d7ea]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [ac7980a3cabecb85ffc82d86da685f56c1aa8d23]
# to [90c088b9a606dde51c1eb8148602236bd47b8e9f]
#
# patch "packages/psplash/files/logo-math.patch"
# from [3863c6539054b0633895cdd79f7940fde4987c4f]
# to [383aad8b8836d830f9245957a98edb65d5d51079]
#
# patch "packages/python/python-dbus_0.82.4.bb"
# from [c5e18d63589267e732b6a661f4047e5c7e9d1fa0]
# to [265ecdc8752ede90876f5c5e513aa9a60ff60100]
#
# patch "packages/xorg-lib/diet-x11_1.1.1.bb"
# from [54e6aee1f75e962c08a6e50ff72f283effa50e97]
# to [e1a7c7618aa6c12e6f57bc70c8741fe59f234313]
#
# patch "packages/xorg-lib/diet-x11_1.1.2.bb"
# from [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
# to [2486dd5dcd1de860deda3dffcd0759e0b071b8dd]
#
# patch "packages/xorg-lib/diet-x11_1.1.3.bb"
# from [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
# to [2486dd5dcd1de860deda3dffcd0759e0b071b8dd]
#
# patch "packages/xorg-lib/libxcalibrate_git.bb"
# from [0c3313cd068d23c4d45e05f4b6f53a709eafce09]
# to [df9536d5608ab607d9b6bda50bf32fd193a87a41]
#
# patch "packages/xorg-proto/calibrateproto_git.bb"
# from [98eeef1d63972f77c5d646db9e0db9e5b0ebdf7e]
# to [ed72aebe4fa009216a6b40e35b228cd1d2fd61bb]
#
# patch "packages/xorg-proto/renderproto_0.9.3.bb"
# from [941a64141dc39736fe734344c9ecc6cbbb9620f4]
# to [1bb8221a34173072ea7c764733f75f2a635ff066]
#
# patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
# from [fff9bb7a58826586a6abaa9ab7e87b9661eef224]
# to [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
#
============================================================
--- packages/amule/amule_2.1.3.bb e94b17ff6a0526951854c033da5fe53b89be7198
+++ packages/amule/amule_2.1.3.bb e94b17ff6a0526951854c033da5fe53b89be7198
@@ -0,0 +1,25 @@
+DESCRIPTION = "aMule is an eMule-like client for the eD2k \
+and Kademlia networks, supporting multiple platforms."
+HOMEPAGE = "http://www.amule.org"
+LICENSE = "GPL"
+SECTION = "web"
+PRIORITY = "optional"
+DEPENDS = "wxbase"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
+ file://parser.patch;patch=1"
+
+S = "${WORKDIR}/aMule-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-amulecmd \
+ --enable-webserver \
+ --disable-monolithic \
+ --enable-amule-daemon \
+ --disable-nls"
+# --enable-optimize"
+
+FILES_${PN} += " \
+ ${libdir}/xchat"
============================================================
--- packages/amule/files/parser.patch aa35fa9621c341aaf36abdc4f0a42887e4e6e384
+++ packages/amule/files/parser.patch aa35fa9621c341aaf36abdc4f0a42887e4e6e384
@@ -0,0 +1,20 @@
+diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp
+--- aMule-2.1.0_orig/src/Parser.cpp 2005-12-20 05:13:25.000000000 +0100
++++ aMule-2.1.0/src/Parser.cpp 2006-01-29 15:16:45.000000000 +0100
+@@ -203,14 +203,14 @@
+ # define YYMALLOC malloc
+ # if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+ # ifndef YYFREE
+ # define YYFREE free
+ # if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+-void free (void *); /* INFRINGES ON USER NAME SPACE */
++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */
+ # endif
+ # endif
+ # ifdef __cplusplus
============================================================
--- packages/ipkg/files/update_version_comparision.patch b940420d7d71ccae026536ddf7f2c5c503485a9d
+++ packages/ipkg/files/update_version_comparision.patch b940420d7d71ccae026536ddf7f2c5c503485a9d
@@ -0,0 +1,82 @@
+Update the version comparision to a more recent one from dpkg. This
+means it now recognises 0.0-foo > 0.0+foo as it should.
+
+Index: ipkg-0.99.163/pkg.c
+===================================================================
+--- ipkg-0.99.163.orig/pkg.c 2008-02-18 11:24:45.000000000 +0000
++++ ipkg-0.99.163/pkg.c 2008-02-19 00:24:50.000000000 +0000
+@@ -1128,43 +1130,37 @@
+ return r;
+ }
+
+-int verrevcmp(const char *val, const char *ref)
+-{
+- int vc, rc;
+- long vl, rl;
+- const char *vp, *rp;
+- const char *vsep, *rsep;
+-
+- if (!val) val= "";
+- if (!ref) ref= "";
+- for (;;) {
+- vp= val; while (*vp && !isdigit(*vp)) vp++;
+- rp= ref; while (*rp && !isdigit(*rp)) rp++;
+- for (;;) {
+- vc= (val == vp) ? 0 : *val++;
+- rc= (ref == rp) ? 0 : *ref++;
+- if (!rc && !vc) break;
+- if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
+- if (rc && !isalpha(rc)) rc += 256;
+- if (vc != rc) return vc - rc;
+- }
+- val= vp;
+- ref= rp;
+- vl=0; if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
+- rl=0; if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
+- if (vl != rl) return vl - rl;
+-
+- vc = *val;
+- rc = *ref;
+- vsep = strchr(".-", vc);
+- rsep = strchr(".-", rc);
+- if (vsep && !rsep) return -1;
+- if (!vsep && rsep) return +1;
+-
+- if (!*val && !*ref) return 0;
+- if (!*val) return -1;
+- if (!*ref) return +1;
+- }
++/* assume ascii; warning: evaluates x multiple times! */
++#define order(x) ((x) == '~' ? -1 \
++ : isdigit((x)) ? 0 \
++ : !(x) ? 0 \
++ : isalpha((x)) ? (x) \
++ : (x) + 256)
++
++static int verrevcmp(const char *val, const char *ref) {
++ if (!val) val= "";
++ if (!ref) ref= "";
++
++ while (*val || *ref) {
++ int first_diff= 0;
++
++ while ( (*val && !isdigit(*val)) || (*ref && !isdigit(*ref)) ) {
++ int vc= order(*val), rc= order(*ref);
++ if (vc != rc) return vc - rc;
++ val++; ref++;
++ }
++
++ while ( *val == '0' ) val++;
++ while ( *ref == '0' ) ref++;
++ while (isdigit(*val) && isdigit(*ref)) {
++ if (!first_diff) first_diff= *val - *ref;
++ val++; ref++;
++ }
++ if (isdigit(*val)) return 1;
++ if (isdigit(*ref)) return -1;
++ if (first_diff) return first_diff;
++ }
++ return 0;
+ }
+
+ int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op)
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch 84ca7646072efff95ac1ba21996214de0887506e
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch 84ca7646072efff95ac1ba21996214de0887506e
@@ -0,0 +1,1807 @@
+diff -urN linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-02-18 16:39:43.000000000 +0100
+@@ -36,6 +36,12 @@
+ device_type = "memory";
+ reg = <00000000 08000000>; // 128MB at 0
+ };
++
++ nand0 {
++ device_type = "nand";
++ compatible = "fsl-nand";
++ reg = <e2800000 00000200>;
++ };
+
+ soc8313 at e0000000 {
+ #address-cells = <1>;
+@@ -177,6 +183,16 @@
+ reg = <700 100>;
+ device_type = "ipic";
+ };
++
++ elbc at 5000 {
++ device_type = "elbc";
++ compatible = "fsl-elbc";
++ reg = <5000 1000>;
++ interrupts = <4d 8>;
++ interrupt-parent = < &ipic >;
++ allow-direct-device-sleep;
++ };
++
+ };
+
+ pci at e0008500 {
+diff -urN linux-2.6.24.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c
+--- linux-2.6.24.orig/arch/powerpc/sysdev/fsl_soc.c 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c 2008-02-18 17:07:57.000000000 +0100
+@@ -6,6 +6,12 @@
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug at ru.mvista.com>
+ *
++ * Change log:
++ * Copyright (C) 2006 Freescale Semiconductor, Inc.
++ * 2006: Lo Wilson (r43300 at freescale.com)
++ * Added support for Enhanced Local Bus Controller
++ * Added support for USB UTMI mode on-chip PHY
++ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+@@ -28,6 +34,8 @@
+ #include <linux/fsl_devices.h>
+ #include <linux/fs_enet_pd.h>
+ #include <linux/fs_uart_pd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/fsl_elbc.h>
+
+ #include <asm/system.h>
+ #include <asm/atomic.h>
+@@ -671,6 +679,75 @@
+
+ arch_initcall(fsl_usb_of_init);
+
++static int __init fsl_elbc_of_init(void)
++{
++ struct device_node *np;
++ unsigned int i;
++ struct platform_device *elbc_dev = NULL;
++ struct platform_device *nand_dev = NULL;
++ int ret;
++
++ /* find and register the enhanced local bus controller */
++ for (np = NULL, i = 0;
++ (np = of_find_compatible_node(np, "elbc", "fsl-elbc")) != NULL;
++ i++) {
++ struct resource r[2];
++
++ memset(&r, 0, sizeof(r));
++
++ ret = of_address_to_resource(np, 0, &r[0]);
++ if (ret)
++ goto err;
++
++ r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
++ r[1].flag%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list