diff options
26 files changed, 34 insertions, 31 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6a872e28ba..3182fa7d77 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "13" +DISTRO_REVISION = "15" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -66,7 +66,7 @@ FEED_URIS += " \ #SRCDATE = "20061029" PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" -PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2" +PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" SRCDATE_gconf-dbus = "20060719" @@ -85,7 +85,7 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_VERSION_fontconfig = "2.3.95" +PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" #fix screen corruption issues PREFERRED_VERSION_cairo = "1.3.4" @@ -172,6 +172,8 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5" # Busybox <1.1.0 doesn't have EABI support PREFERRED_VERSION_busybox = "1.2.1" +PCMCIA_MANAGER = "pcmciautils" + PREFERRED_VERSION_dbus ?= "1.0.1" PREFERRED_VERSION_dbus-glib ?= "0.71" @@ -211,7 +213,7 @@ EXTRA_STUFF ?= "" DISTRO_EXTRA_RDEPENDS = "\ update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ - psplash \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ netbase dropbear \ angstrom-version \ ipkg ipkg-collateral \ diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index a62fafbc39..a369eab0a3 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -18,7 +18,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" ROOT_FLASH_SIZE = "24" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 67efb585c1..5e9917ffaf 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost" +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen" # used by sysvinit_2 SERIAL_CONSOLE = "57600 ttyAM0" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 8cdf37f6c0..11dbadacb8 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -14,7 +14,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen" #require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index c8b2fad2fd..0f18728087 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # # Software/packages selection diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 91c733b191..da8a58329a 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" #Set features for task-base -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" # # Software/packages selection diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 60f2583db7..eb0b6d40e6 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16" # h3630 have 32Mb only VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # # Software/packages selection diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf index abc3655a1e..173f2a5c8f 100644 --- a/conf/machine/h3800.conf +++ b/conf/machine/h3800.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices #this machine will be primarily focussed on the 2.6 port -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" require conf/machine/h3600.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 4eef599aaf..3eaa96b327 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # # Software/packages selection diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index ffc1328f50..c0c9b2fefe 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" # # Software/packages selection diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index f793b49c70..ecc658982b 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -13,7 +13,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" require conf/machine/include/tune-arm9tdmi.conf GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # # Software/packages selection diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index efb92518a5..0eb733bfb5 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" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen" # # Software/packages selection diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 25f093e1b8..15f3258526 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" PCMCIA_MANAGER = "pcmciautils" BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 3a94220968..53903f7982 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" # # Software/packages selection diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf index 83ddf24b87..b314fa9bea 100644 --- a/conf/machine/include/qemu.conf +++ b/conf/machine/include/qemu.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" IMAGE_FSTYPES ?= "tar.bz2 ext2" diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.conf index f843f5e6ea..b2d0e703db 100644 --- a/conf/machine/include/tune-athlonmp.conf +++ b/conf/machine/include/tune-athlonmp.conf @@ -1,3 +1,3 @@ -TARGET_CC_ARCH = "-march=athlon-mp " +TARGET_CC_ARCH = "-march=i686" PACKAGE_ARCH = "i686" diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index ce9b44c9fe..d76174bde5 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -6,7 +6,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" MACHINE_FEATURES_append_tosa = " usbhost usbwlanng " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost ext2 " diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 680836ee14..aa6631a524 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -9,5 +9,5 @@ include conf/machine/include/tune-sh3.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index f74f41c6ef..811ea6a3e8 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -8,6 +8,6 @@ include conf/machine/include/tune-strongarm.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen" MACHINE_EXTRA_RDEPENDS = "kernel-modules" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e5138be1c8..e16a46c619 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen" # # Software/packages selection diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf index c5fbdf2e97..5f035c33fa 100644 --- a/conf/machine/navman-icn330.conf +++ b/conf/machine/navman-icn330.conf @@ -16,10 +16,11 @@ require conf/machine/include/tune-xscale.conf #Set some hints for metadata VOLATILE_STORAGE_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" +UBOOT_MACHINE = "" #Set features for task-base # touchscreen is not confirmed -MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen" # # Software/packages selection diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 1048cb1d6c..f83de23786 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,7 +15,7 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" -MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 6bde574d02..de53f3c3bc 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -30,7 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index ef8f4ca57b..ec7336fe06 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget screen" ROOT_FLASH_SIZE = "100" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 5957439f06..37974cb0ad 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -12,6 +12,6 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi screen" IMAGE_FSTYPES = "tar.gz" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index c054cf6195..6a8deb9176 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -14,6 +14,6 @@ SERIAL_CONSOLE = "115200 ttySAC0" IMAGE_FSTYPES = "tar.gz" MACHINE_TASK_PROVIDER = "task-base" -MACHINE_FEATURES = "kernel26 apm" +MACHINE_FEATURES = "kernel26 apm screen" include conf/machine/include/tune-arm920t.conf |