[oe-commits] org.oe.dev merge of '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
mickeyl commit
oe at amethyst.openembedded.net
Mon Jul 21 14:17:20 UTC 2008
merge of '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
and 'ef5c7f64094e35acf78793dc2ff1cbcc408d2530'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 23eae27e35b67c5ca558dd374a9a6dc5e617c68b
ViewMTN: http://monotone.openembedded.org/revision/info/23eae27e35b67c5ca558dd374a9a6dc5e617c68b
Files:
1
packages/libusb/libusb-compat-0.0.9+0.1.0-beta1
packages/libusb/libusb1-0.9.0
conf/machine/at91-l9260.conf
packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch
packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch
contrib/python/generate-manifest-2.5.py
packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb
packages/libusb/libusb1_0.9.0.bb
packages/linux/linux_2.6.25.bb
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.2.bb
packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
Diffs:
#
# mt diff -r1f87c0f3663976dafd6caaabc1cf1397f48451e8 -r23eae27e35b67c5ca558dd374a9a6dc5e617c68b
#
#
#
# add_dir "packages/libusb/libusb-compat-0.0.9+0.1.0-beta1"
#
# add_dir "packages/libusb/libusb1-0.9.0"
#
# add_file "conf/machine/at91-l9260.conf"
# content [5d8275da70d5e45d8ffcc1ecabe4151c1cbee377]
#
# add_file "packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch"
# content [1ed2fd4118916b4b4a1997b3efe89c4519326b31]
#
# add_file "packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch"
# content [a2b8d646cf7d28af6542e845cfd2f4c93b3e25f1]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [ccd26c481e9a850b5cb869f898e0a08bc214b6e3]
# to [d25d1af104394a98b32f686bf43876267201ffd8]
#
# patch "packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb"
# from [14b3910dabaf1d2fae752ec1730d4742aec043c3]
# to [eca681d4a91dfb5cb7fa4e2d5326809890304bba]
#
# patch "packages/libusb/libusb1_0.9.0.bb"
# from [a977b91549cceea4f52b08ffa82e045f1f21e109]
# to [b413efeaadf36cc125444ba8f9db23c724492158]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [b363ee0b49f6ee2e1b5399434fb3b3ad388519fa]
# to [17408d418b583626e5de54e9ef049c0f271e98f5]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [e3df18f8f3a8373fd0bccb992c74a16321f20256]
# to [d612bb6f0de9ba3bcbdac5b9e4861a03d15b1591]
#
# patch "packages/python/python_2.5.2.bb"
# from [2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a]
# to [516db53267c818d6f5babfa4360cd7344247bf36]
#
============================================================
--- conf/machine/at91-l9260.conf 5d8275da70d5e45d8ffcc1ecabe4151c1cbee377
+++ conf/machine/at91-l9260.conf 5d8275da70d5e45d8ffcc1ecabe4151c1cbee377
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Olimex eval board for the AT91SAM9260
+#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.25"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
============================================================
--- packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch 1ed2fd4118916b4b4a1997b3efe89c4519326b31
+++ packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch 1ed2fd4118916b4b4a1997b3efe89c4519326b31
@@ -0,0 +1,13 @@
+Index: libusb-compat-0.1.0-beta1/configure.ac
+===================================================================
+--- libusb-compat-0.1.0-beta1.orig/configure.ac 2008-07-21 13:14:42.000000000 +0200
++++ libusb-compat-0.1.0-beta1/configure.ac 2008-07-21 13:15:03.000000000 +0200
+@@ -55,7 +55,7 @@
+ CFLAGS="$saved_cflags"
+
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+
+ AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile])
============================================================
--- packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch a2b8d646cf7d28af6542e845cfd2f4c93b3e25f1
+++ packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch a2b8d646cf7d28af6542e845cfd2f4c93b3e25f1
@@ -0,0 +1,13 @@
+Index: libusb-0.9.0/configure.ac
+===================================================================
+--- libusb-0.9.0.orig/configure.ac 2008-07-21 08:04:03.000000000 +0200
++++ libusb-0.9.0/configure.ac 2008-07-21 08:04:16.000000000 +0200
+@@ -62,7 +62,7 @@
+ CFLAGS="$saved_cflags"
+
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+
+ AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile])
============================================================
--- contrib/python/generate-manifest-2.5.py ccd26c481e9a850b5cb869f898e0a08bc214b6e3
+++ contrib/python/generate-manifest-2.5.py d25d1af104394a98b32f686bf43876267201ffd8
@@ -184,8 +184,8 @@ if __name__ == "__main__":
m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core",
"compiler" ) # package
- m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib",
- "gzip.* zipfile.*" )
+ m.addPackage( 1, "python-compression", "Python High Level Compression Support", "python-core python-zlib",
+ "gzip.* zipfile.* tarfile.*" )
m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
"hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" )
@@ -205,7 +205,7 @@ if __name__ == "__main__":
m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core",
"anydbm.* dumbdbm.* whichdb.* " )
- m.addPackage( 0, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell",
+ m.addPackage( 1, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint",
"bdb.* pdb.*" )
m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core",
@@ -330,4 +330,10 @@ if __name__ == "__main__":
m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core python-mime",
"mailbox.*" )
+ m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re",
+ "difflib.*" )
+
+ m.addPackage( 0, "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib",
+ "doctest.*" )
+
m.make()
============================================================
--- packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb 14b3910dabaf1d2fae752ec1730d4742aec043c3
+++ packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb eca681d4a91dfb5cb7fa4e2d5326809890304bba
@@ -5,10 +5,12 @@ PE = "1"
LICENSE = "LGPL"
PE = "1"
+PR = "r1"
DEPENDS = "libusb1"
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \
+ file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \
"
S = "${WORKDIR}/libusb-compat-0.1.0-beta1"
============================================================
--- packages/libusb/libusb1_0.9.0.bb a977b91549cceea4f52b08ffa82e045f1f21e109
+++ packages/libusb/libusb1_0.9.0.bb b413efeaadf36cc125444ba8f9db23c724492158
@@ -4,8 +4,11 @@ LICENSE = "LGPL"
SECTION = "libs"
LICENSE = "LGPL"
+PR = "r1"
+
SRC_URI = "\
${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
+ file://0.9.0-gcc3.4-compat-fix.patch;patch=1 \
"
S = "${WORKDIR}/libusb-${PV}"
============================================================
--- packages/linux/linux_2.6.25.bb b363ee0b49f6ee2e1b5399434fb3b3ad388519fa
+++ packages/linux/linux_2.6.25.bb 17408d418b583626e5de54e9ef049c0f271e98f5
@@ -1,6 +1,6 @@ require linux.inc
require linux.inc
-PR = "r2"
+PR = "r3"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
@@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
DEFAULT_PREFERENCE_cm-x270 = "1"
DEFAULT_PREFERENCE_alix = "1"
DEFAULT_PREFERENCE_at32stk1000 = "1"
+DEFAULT_PREFERENCE_at91-l9260 = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
file://defconfig"
@@ -32,6 +33,10 @@ SRC_URI_append_at32stk1000 = " \
http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1 \
"
+SRC_URI_append_at91-l9260 = " \
+ http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \
+"
+
CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
FILES_kernel-image_cm-x270 = ""
============================================================
--- packages/python/python-2.5-manifest.inc e3df18f8f3a8373fd0bccb992c74a16321f20256
+++ packages/python/python-2.5-manifest.inc d612bb6f0de9ba3bcbdac5b9e4861a03d15b1591
@@ -1,5 +1,5 @@
########################################################################################################################
-### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Thu May 1 12:24:55 2008
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Mon Jul 21 17:03:43 2008
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -8,9 +8,9 @@
########################################################################################################################
-PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
DESCRIPTION_python-profile="Python Basic Profiling Support"
PR_python-profile="ml0"
@@ -97,6 +97,11 @@ FILES_python-image="${libdir}/python2.5/
RDEPENDS_python-image="python-core"
FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
+DESCRIPTION_python-doctest="Python framework for running examples in docstrings."
+PR_python-doctest="ml0"
+RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib"
+FILES_python-doctest="${libdir}/python2.5/doctest.* "
+
DESCRIPTION_python-tests="Python Tests"
PR_python-tests="ml0"
RDEPENDS_python-tests="python-core"
@@ -117,6 +122,11 @@ FILES_python-devel="${includedir} ${libd
RDEPENDS_python-devel="python-core"
FILES_python-devel="${includedir} ${libdir}/python2.5/config "
+DESCRIPTION_python-difflib="Python helpers for computing deltas between objects."
+PR_python-difflib="ml0"
+RDEPENDS_python-difflib="python-lang python-re"
+FILES_python-difflib="${libdir}/python2.5/difflib.* "
+
DESCRIPTION_python-math="Python Math Support"
PR_python-math="ml0"
RDEPENDS_python-math="python-core"
@@ -253,8 +263,8 @@ DESCRIPTION_python-debugger="Python Debu
FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* "
DESCRIPTION_python-debugger="Python Debugger"
-PR_python-debugger="ml0"
-RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell"
+PR_python-debugger="ml1"
+RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint"
FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
DESCRIPTION_python-shell="Python Shell-Like Functionality"
============================================================
--- packages/python/python_2.5.2.bb 2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a
+++ packages/python/python_2.5.2.bb 516db53267c818d6f5babfa4360cd7344247bf36
@@ -6,7 +6,7 @@ DEPENDS_sharprom = "python-native readli
DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
# bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml6"
+PR = "ml7"
PYTHON_MAJMIN = "2.5"
#
# mt diff -ref5c7f64094e35acf78793dc2ff1cbcc408d2530 -r23eae27e35b67c5ca558dd374a9a6dc5e617c68b
#
#
#
# patch "packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb"
# from [14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34]
# to [e96d82a4675208c6a2303fb836bb92d6d8b58eb8]
#
============================================================
--- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb 14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34
+++ packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb e96d82a4675208c6a2303fb836bb92d6d8b58eb8
@@ -1,4 +1,4 @@
-require u-boot-openmoko_svn.bb
+require u-boot-openmoko_git.bb
inherit native
More information about the Openembedded-commits
mailing list