From 3fbb365c826659525fbb5fb5b89e3c6e9276a1b0 Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Sun, 20 Jul 2008 22:02:01 +0000 Subject: Added machine file for Olimex AT91SAM development board linux_2.6.25, r3 Added support for Olimex AT91SAM development board --- conf/machine/at91-l9260.conf | 24 ++++++++++++++++++++++++ packages/linux/linux_2.6.25.bb | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 conf/machine/at91-l9260.conf diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf new file mode 100644 index 0000000000..16d0705a24 --- /dev/null +++ b/conf/machine/at91-l9260.conf @@ -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 diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index e228860a49..62c0b14fb9 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r2" +PR = "r3" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -32,6 +32,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 = "" -- cgit v1.2.3 From 0f3931ecb1c0a1987bb417da4201d72757efb048 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 08:59:52 +0000 Subject: generate-manifest-2.5.py: not in sync with manifest.inc * python-compression with tarfile is not in generate-manifest --- contrib/python/generate-manifest-2.5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 8f1ee88937..0eab961d43 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -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" ) -- cgit v1.2.3 From f0e7c6dbe2141e8e7ce189f3b2e6011cc441e569 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:00:30 +0000 Subject: generate-manifest-2.5.py: pdb requires pprint --- contrib/python/generate-manifest-2.5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 0eab961d43..1a30b7865a 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -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", -- cgit v1.2.3 From 4f39c69d732f72bef35affd07866728380cf9916 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:02:00 +0000 Subject: generate-manifest-2.5.py: add python-difflib --- contrib/python/generate-manifest-2.5.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 1a30b7865a..049fc32553 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -330,4 +330,7 @@ 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.make() -- cgit v1.2.3 From 784f75ef1337630304dad3c69d31f700a7f5618d Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:02:41 +0000 Subject: generate-manifest-2.5.py: add python-doctest --- contrib/python/generate-manifest-2.5.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 049fc32553..291251b87d 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -333,4 +333,7 @@ if __name__ == "__main__": 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() -- cgit v1.2.3 From 8a70396a87b461003d0a0bdd1f43ed77d1dad196 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:05:24 +0000 Subject: python-2.5-manifest.inc: update by generate-manifest-2.5.py * bump python_2.5.2.bb PR --- packages/python/python-2.5-manifest.inc | 20 +++++++++++++++----- packages/python/python_2.5.2.bb | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 06c187fe91..95a7bd8e0b 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Thu May 1 12:24:55 2008 +### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] 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 @@ PR_python-image="ml0" 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 @@ PR_python-devel="ml0" 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 @@ RDEPENDS_python-compile="python-core" 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" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 9617871fff..b47ed0b7cf 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" 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" -- cgit v1.2.3 From 7c3ab51907d9e974a12bf43e73c7d7070101da3f Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Mon, 21 Jul 2008 11:03:58 +0000 Subject: Added at91-l9260 to supported machines for the linux-2.6.25 kernel --- packages/linux/linux_2.6.25.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 62c0b14fb9..dc9a35e3bb 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_sequoia = "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" -- cgit v1.2.3 From 4f512b95406a1e0354cb64ce4e679c6ed1437b17 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 21 Jul 2008 11:23:18 +0000 Subject: libusb1 0.9.0: Added patch to allow compilation with gcc 3.4 libusb-compat 0.0.9+0.1.0-beta1: Added patch to allow compilation with gcc 3.4 --- .../libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty | 0 .../0.1.0-beta1-gcc3.4-fix.patch | 13 +++++++++++++ packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb | 2 ++ packages/libusb/libusb1-0.9.0/.mtn2git_empty | 0 packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch | 13 +++++++++++++ packages/libusb/libusb1_0.9.0.bb | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty create mode 100644 packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch create mode 100644 packages/libusb/libusb1-0.9.0/.mtn2git_empty create mode 100644 packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch new file mode 100644 index 0000000000..501ba3fb29 --- /dev/null +++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch @@ -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]) diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb index b42e572196..fec42b1df7 100644 --- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb +++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb @@ -5,10 +5,12 @@ SECTION = "libs" 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" diff --git a/packages/libusb/libusb1-0.9.0/.mtn2git_empty b/packages/libusb/libusb1-0.9.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch b/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch new file mode 100644 index 0000000000..1b06945d1a --- /dev/null +++ b/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch @@ -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]) diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.0.bb index 784d9b523b..ce102c0cfc 100644 --- a/packages/libusb/libusb1_0.9.0.bb +++ b/packages/libusb/libusb1_0.9.0.bb @@ -4,8 +4,11 @@ HOMEPAGE = "http://libusb.sf.net" 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}" -- cgit v1.2.3