diff options
102 files changed, 4316 insertions, 1874 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 630fbc6bbf..a6f50c1842 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 = "22" +DISTRO_REVISION = "24" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -92,7 +92,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues -PREFERRED_VERSION_cairo = "1.3.6" +PREFERRED_VERSION_cairo = "1.3.8" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -177,10 +177,10 @@ PREFERRED_VERSION_busybox = "1.2.1" PCMCIA_MANAGER = "pcmciautils" -PREFERRED_VERSION_dbus ?= "1.0.1" +PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.71" -PREFERRED_VERSION_gstreamer ?= "0.10.6" +PREFERRED_VERSION_gstreamer ?= "0.10.11" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index ea408ff221..8274148823 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4" INHERIT += "sanity" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 10f00b7604..476249478d 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -51,14 +51,18 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_VERSION_binutils-cross-sdk = "2.16" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" PREFERRED_VERSION_gcc = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-sdk = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_wpa-supplicant = "0.5.5" + # # Opie # @@ -71,7 +75,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 5685c3d0f3..2682fb300f 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.conf PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 047e44707c..d1afb882e3 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf deleted file mode 100644 index edd68c08f8..0000000000 --- a/conf/machine/ipaq-pxa270.conf +++ /dev/null @@ -1,68 +0,0 @@ -#@TYPE: Machine -#@NAME: iPAQ hx47xx hx2xxx -#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices - -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" -#use this for a hx47xx ipaq -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" - -#use this for a hx2xxx ipaq -#PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -PREFERRED_VERSION_orinoco-modules = "0.15rc1" - -ROOT_FLASH_SIZE = "80" - -EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 256KiB -p" - -IMAGE_FSTYPES ?= "jffs2" - -MODUTILS = "26" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" - -PCMCIA_MANAGER = "pcmciautils" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware" - -PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" - -SERIAL_CONSOLE = "115200 ttyS0" - - -GUI_MACHINE_CLASS = "bigscreen" - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf - -# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf - - -# These modules are now compiled into the kernel: -#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ -# hx4700_pcmcia hx4700_ts hx4700_power" - -HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio" - - -module_autoload_evdev = "evdev" -module_autoload_hx4700_power = "hx4700_power" -module_autoload_pcmcia = "pcmcia" -module_autoload_hx4700_pcmcia = "hx4700_pcmcia" -module_autoload_asic3_mmc = "asic3_mmc" -module_autoload_mmc_block = "mmc_block" -module_autoload_hx4700_ts = "hx4700_ts" -module_autoload_hx4700_navpt = "hx4700_navpt" -module_autoload_hx4700_bt = "hx4700_bt" -module_autoload_snd-hx4700_audio = "snd-hx4700_audio" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_pxa27x_udc = "pxa27x_udc" - -#FIXME: this should be controlled by a userspace utility later. -module_autoload_g_ether = "g_ether" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 9a54643b3f..455ae56677 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-2.6.conf +include conf/machine/include/zaurus-clamshell.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" diff --git a/contrib/site-conf/configure.ac b/contrib/site-conf/configure.ac index 283008a4a7..bd5ce4dfad 100644 --- a/contrib/site-conf/configure.ac +++ b/contrib/site-conf/configure.ac @@ -1,5 +1,5 @@ AC_INIT([zeckes-tests], [aleph-1], [noreply@::1]) -AC_PREREQ([2.60]) +AC_PREREQ([2.59]) # #AC_CONFIG_MACRO_DIR([m4]) diff --git a/packages/dbus/dbus-0.91/.mtn2git_empty b/packages/autoconf/autoconf-2.61/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-0.91/.mtn2git_empty +++ b/packages/autoconf/autoconf-2.61/.mtn2git_empty diff --git a/packages/autoconf/autoconf-2.61/autoconf-x.patch b/packages/autoconf/autoconf-2.61/autoconf-x.patch new file mode 100644 index 0000000000..596535b7d6 --- /dev/null +++ b/packages/autoconf/autoconf-2.61/autoconf-x.patch @@ -0,0 +1,36 @@ +Index: lib/autoconf/libs.m4 +=================================================================== +RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v +retrieving revision 1.13 +diff -p -u -r1.13 libs.m4 +--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 |