diff options
77 files changed, 3999 insertions, 293 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index dcdc18c322..36e1287d03 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -422,7 +422,7 @@ require conf/sanity.conf IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" -MACHINE_TASK_PROVIDER ?= "task-bootstrap" +MACHINE_TASK_PROVIDER ?= "task-base" IMAGE_ROOTFS_SIZE_ext2 ?= "65536" IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 59ef9d3f4e..11c4ce7dca 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "26" +DISTRO_REVISION = "28" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -70,6 +70,7 @@ FEED_URIS += " \ #SRCDATE = "20061029" PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" @@ -94,6 +95,10 @@ PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues PREFERRED_VERSION_cairo = "1.3.10" +#work around a segfault in gcc for armv4t +PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" +PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" + #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 0bcdac1db5..2904db1108 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug" SLUGOS_IMAGESEX = "little-endian" # debianslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "nslu2" +SLUGOS_FLASH_IMAGE = "1" # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see debianslug-packages.conf in this diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dec16d8cd7..8634d091f0 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug" SLUGOS_IMAGESEX = "big-endian" # openslug builds a complete image (not just the parts) -SLUGOS_FLASH_IMAGE = "nslu2" +SLUGOS_FLASH_IMAGE = "1" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 08104624ca..37f61433c7 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -4,17 +4,21 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" -HANDHELD_MODULES = "" +# Set preferred providers +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +# Set features for task-base +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" -INHERIT += "linux-kernel-base" +# Empty modules list for now +HANDHELD_MODULES = "" +# Some extra configuration +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" +SERIAL_CONSOLE = "115200 ttySAC2 vt100" +USE_VT = "0" diff --git a/conf/machine/blueangel.conf b/conf/machine/htcblueangel.conf index dd079c244b..a61656ab5c 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -2,23 +2,39 @@ #@NAME: HTC Blueangel #@DESCRIPTION: Machine configuration for the HTC Blueangel device -KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" - +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6" -PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +require conf/machine/include/tune-xscale.conf + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "128" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" -BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_core g_ether blueangel_battery \ - pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp" -# pxa2xx_udc is built in to the kernel +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "acx-firmware" +MACHINE_EXTRA_RRECOMMENDS = "blueangel_pcmcia \ + blueangel_audio \ + blueangel_rom \ + blueangel_kp + blueangel_battery \ + blueangel_leds \ + " +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_g_ether = "g_ether" module_autoload_evdev = "evdev" module_autoload_himalaya_tsc2200 = "himalaya_tsc2200" module_autoload_himalaya_ts3 = "himalaya_ts3" @@ -30,14 +46,9 @@ module_autoload_blueangel_audio = "blueangel_audio" module_autoload_bluenagel_leds = "bleangel_leds" module_autoload_hci_uart = "hci_uart" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -SERIAL_CONSOLE = "115200 tts/2 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" -ROOT_FLASH_SIZE = "32" - -# optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility -include conf/machine/include/tune-xscale.conf +require conf/machine/include/LAB-settings.conf diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf deleted file mode 100644 index f3591b4b75..0000000000 --- a/conf/machine/include/tosa-2.6.conf +++ /dev/null @@ -1,6 +0,0 @@ -include conf/machine/include/zaurus-2.6.conf -# wlan-ng Modules -MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" - -# WM97xx Modules -#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 2a12443b3d..48003571f1 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -23,8 +23,8 @@ OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" # Compiler and linker options for application code and kernel code. These # options ensure that the compiler has the correct settings for the selected # instruction set and interworking. -ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" # TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 9810c7b1ae..ec65d221c3 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -8,12 +8,12 @@ import os import sys import time -VERSION = "2.4.3" +VERSION = "2.4.4" # increase when touching python-core BASEREV = 0 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -__version__ = "$Revision: 1.20 $" +__version__ = "$Revision: 1.21 $" class MakefileMaker: @@ -24,7 +24,7 @@ class MakefileMaker: self.targetPrefix = "${libdir}/python%s" % VERSION[:3] self.output = outfile self.out( "#" * 120 ) - self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) ) self.out( "###" ) self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) self.out( "###" ) @@ -158,7 +158,7 @@ if __name__ == "__main__": m.setPrefix( "/", "/usr/" ) - m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "", + m.addPackage( 0, "python-core", "Python Interpreter and core modules (needed!)", "", "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " + "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " + "lib/python2.4/os.* lib/python2.4/posixpath.* " + @@ -202,7 +202,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold", "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) - m.addPackage( 1, "python-curses", "Python Curses Support", "python-core", + m.addPackage( 0, "python-curses", "Python Curses Support", "python-core", "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs", @@ -236,7 +236,7 @@ if __name__ == "__main__": "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " "pipes.* socket.* tempfile.* StringIO.* " ) - m.addPackage( 1, "python-lang", "Python Low-Level Language Support", "python-core", + m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core", "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* " + @@ -263,14 +263,14 @@ if __name__ == "__main__": m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core", "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) - m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime", + m.addPackage( 0, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" ) m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient", "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) - m.addPackage( 1, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re", + m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-io, python-re", "pickle.* shelve.* lib-dynload/cPickle.so" ) m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core", @@ -306,7 +306,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-tests", "Python Tests", "python-core", "test" ) # package - m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", + m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", @@ -318,7 +318,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang", "xmlrpclib.* SimpleXMLRPCServer.*" ) - m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core", + m.addPackage( 0, "python-zlib", "Python zlib Support.", "python-core", "lib-dynload/zlib.so" ) m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime", diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 838ad249c0..d4ce272558 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,9 +1,14 @@ #Angstrom bootstrap image LICENSE = "MIT" -PR = "r2" +PR = "r3" + +ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default task-base" +RDEPENDS = "task-base-core-default \ + task-base \ + ${ANGSTROM_EXTRA_INSTALL} \ + " export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" diff --git a/packages/evince/evince_0.6.1.bb b/packages/evince/evince_0.6.1.bb index 2184d1c0f0..3b3c5984ab 100644 --- a/packages/evince/evince_0.6.1.bb +++ b/packages/evince/evince_0.6.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." LICENSE = "GPL" SECTION = "x11/office" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" PR = "r0" diff --git a/packages/python/python-2.4.3/.mtn2git_empty b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.3/.mtn2git_empty +++ b/packages/gnome/gnome-vfs-2.16.3/.mtn2git_empty diff --git a/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/packages/gnome/gnome-vfs-2.16.3/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 ++++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 +@@ -154,7 +154,7 @@ + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + + if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) ++ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) + fi + + AM_GCONF_SOURCE_2 diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb new file m |