From 5d810964202ef8d2c197965ec8eb66082c62d492 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 14 Dec 2006 11:24:58 +0000 Subject: angstrom: prefer dbus 1.0.2 --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 630fbc6bbf..52e89c7637 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 = "23" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -177,7 +177,7 @@ 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" -- cgit v1.2.3 From b9d891817f88568799b8aab4bf66de2b541c45c9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 14 Dec 2006 14:51:30 +0000 Subject: c7x0/akita/spitz: fix order or zaurus includes --- conf/machine/akita.conf | 2 +- conf/machine/c7x0.conf | 2 +- conf/machine/spitz.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') 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/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}" -- cgit v1.2.3 From f60a824a4cfc3d554c4c325f65c586081aa03020 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 14 Dec 2006 16:03:21 +0000 Subject: ipaq-pxa270: drop as indicated before. This machine has been split into hx4700 and hx2000 --- conf/machine/ipaq-pxa270.conf | 68 ------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 conf/machine/ipaq-pxa270.conf (limited to 'conf') 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" -- cgit v1.2.3 From 0ddd91ecc9a968556d18adf7f89d2580bc056420 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 15 Dec 2006 11:04:50 +0000 Subject: angstrom 2007.1: prefer cairo 1.3.8 --- conf/distro/angstrom-2007.1.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 52e89c7637..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 = "23" +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" @@ -180,7 +180,7 @@ PCMCIA_MANAGER = "pcmciautils" 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" -- cgit v1.2.3 From 0729b190f2a0e92b6a66f958803350e738cc376c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 16 Dec 2006 12:20:58 +0000 Subject: htcuniversal: added wifi, bluetooth into machine features - requested by goxboxlive --- conf/machine/htcuniversal.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 0eb733bfb5..0f8ed6ed82 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ require conf/machine/include/tune-xscale.conf #require conf/machine/include/tune-iwmmxt.conf GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth" # # Software/packages selection -- cgit v1.2.3 From b54f9af2030891f28312ea21869168df52dae9ce Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 Dec 2006 14:55:04 +0000 Subject: edb-dbus: updates * sync with poky * add missing DEPENDS on intltool * still a bug in the dbus-bindings-tool invocation --- conf/distro/include/sane-srcdates.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index c75241f8a0..f73fa22e34 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" SRCDATE_fstests ?= "20061122" -SRCDATE_eds-dbus ?= "20060707" +SRCDATE_eds-dbus ?= "20061215" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" -- cgit v1.2.3 From c8545c69872167d0d0aaae2fc13d1dabef9436e4 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 16 Dec 2006 16:41:18 +0000 Subject: ixp4xx*: fix endianness of PACKAGE_ARCHS --- conf/machine/ixp4xxbe.conf | 2 +- conf/machine/ixp4xxle.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index 5108623750..700f7995fb 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "be" include conf/machine/include/ixp4xx.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" +PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 --faketime -n" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index ac62d669e5..347c7ba3fb 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "le" include conf/machine/include/ixp4xx.conf -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n" -- cgit v1.2.3 From a21e5fa214ce5aa30d474d4039a1ed2a333fa32f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 16 Dec 2006 17:48:50 +0000 Subject: Unslung - lock linux-libc-headers back to the previous version. Fixes the problem with missing linux/modules.h when building busybox. --- conf/distro/unslung.conf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'conf') diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 892c589389..25ac84d270 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -75,3 +75,10 @@ INHERIT += "nslu2-mirrors" PREFERRED_VERSION_ipkg ?= "0.99.154" PREFERRED_VERSION_ipkg-native ?= "0.99.154" +#------------------------------------------------------------------- +# FIXME! +# This is clearly wrong, the headers should match the 2.4.22 kernel, +# but locking this to 2.6.11.1 at least gets Unslung building again. +# - mwester 16 Dec 2006 +# +PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" -- cgit v1.2.3 From f7fe5fdfa4a8687b8e6f12d345f10514b301c05d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 19 Dec 2006 14:14:28 +0000 Subject: a780: unbreak kernel selection --- conf/machine/a780.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index a369eab0a3..fe3cdbc481 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -2,12 +2,12 @@ #@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i #@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i -require conf/machine/include/motorola-ezx.conf TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -- cgit v1.2.3 From 26024dc18133d13431a15d1fc3c8a8e7cf8539b6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 19 Dec 2006 18:48:45 +0000 Subject: angstrom-2007.1: Upgrade linux-handhelds-2.6 to 2.6.16-hh8. * Prerequisite, xserver-common 1.13, was made a default version in previous commit. (-hh8 standardizes an makes consistent application buttons keycodes used by different HH.org ports). --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index a6f50c1842..eff7a14e42 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 = "24" +DISTRO_REVISION = "25" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -69,7 +69,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20061029" -PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" -- cgit v1.2.3