From 3da854f9883482e3f7ffcb179b4fdcb4e9a2acea Mon Sep 17 00:00:00 2001 From: Francisco Alecrim Date: Mon, 1 Feb 2010 14:44:28 -0400 Subject: [PATCH 048/118] mamona.conf: set preferred version and providers Set preferred version and providers: * QT version 4.6 * Mplayer-maemo with nokiait * linux-omap kernel version 2.6.29 with nokiait Signed-off-by: Francisco Alecrim --- conf/distro/include/mamona-preferred-versions.inc | 18 ++++++++++++++---- conf/distro/mamona.conf | 17 ++++++++++------- conf/machine/nokia770.conf | 2 +- conf/machine/nokia800.conf | 2 +- conf/machine/nokia810.conf | 2 +- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/conf/distro/include/mamona-preferred-versions.inc b/conf/distro/include/mamona-preferred-versions.inc index 28b653d..dbe63ed 100644 --- a/conf/distro/include/mamona-preferred-versions.inc +++ b/conf/distro/include/mamona-preferred-versions.inc @@ -28,9 +28,7 @@ PREFERRED_VERSION_alsa-plugins_nokiait ?= "1.0.15" # Mplayer PREFERRED_VERSION_mplayer ?= "0.0+1.0rc2+svnr29934" -PREFERRED_VERSION_mplayer_nokia770 ?= "1.0maemo0" -PREFERRED_VERSION_mplayer_nokia800 ?= "1.0maemo0" -PREFERRED_VERSION_mplayer_nokia810 ?= "1.0maemo0" +PREFERRED_VERSION_mplayer-maemo_nokiait ?= "0.0+1.0rc1+svn342" # Network PREFERRED_VERSION_wpa-supplicant = "0.6.9" @@ -43,5 +41,17 @@ PREFERRED_VERSION_gettext-native = "0.17" PREFERRED_VERSION_avahi = "0.6.22" PREFERRED_VERSION_pango = "1.24.4" PREFERRED_VERSION_pixman = "0.17.3" -PREFERRED_VERSION_mesa_beagleboard = "7.4" +PREFERRED_VERSION_mesa = "7.4" +PREFERRED_VERSION_mesa-dri = "7.4" PREFERRED_VERSION_ffmpeg ?= "0.5.0+r0+svnr20551" +PREFERRED_VERSION_xineramaproto ?= "1.1.2" +PREFERRED_VERSION_libxinerama_nokiait ?= "1.0.3" + +# Qt +MAMONA_QT_VERSION ?= "4.6.0" +PREFERRED_VERSION_qt4-tools-native = "${MAMONA_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${MAMONA_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${MAMONA_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${MAMONA_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${MAMONA_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${MAMONA_QT_VERSION}" diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf index 2cda35e..5b9f2fc 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -34,6 +34,8 @@ CXXFLAGS += "-fvisibility-inlines-hidden" DISTRO_FEATURES = " \ 3gmodem \ bluetooth \ + color16 \ + color32 \ kernel26 \ keyboard \ mmc \ @@ -43,8 +45,10 @@ DISTRO_FEATURES = " \ touchscreen \ usbgadget \ usbhost \ + videoplay \ virtualkbd \ wifi \ + x11 \ " # Glibc Locale @@ -60,16 +64,12 @@ LOCALE_UTF8_ONLY = "1" KERNEL = "kernel26" MACHINE_KERNEL_VERSION = "2.6" -OLDEST_KERNEL ?= "2.6.24" +OLDEST_KERNEL_linux-gnueabi ?= "2.6.24" PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1" PREFERRED_VERSION_linux-omap1_omap3430sdp ?= "2.6.22-omap1-ti" -PREFERRED_VERSION_linux-nokia800_nokia810 ?= "2.6.21-200823maemo6" -PREFERRED_VERSION_linux-nokia800_nokia800 ?= "2.6.21-200823maemo6" -PREFERRED_VERSION_linux-nokia800-kprobes_nokia810 ?= "2.6.21-200823maemo6" -PREFERRED_VERSION_linux-nokia800-kprobes_nokia800 ?= "2.6.21-200823maemo6" -PREFERRED_VERSION_linux-nokia800_nokia770 ?= "2.6.18-osso40" +PREFERRED_VERSION_linux-omap_nokia8xx ?= "2.6.29-rc7" +PREFERRED_VERSION_linux-omap_nokia770 ?= "2.6.30-rc7" PREFERRED_VERSION_linux-libc-headers = "2.6.31" -PREFERRED_VERSION_linux-libc-headers_nokia770 = "2.6.22" # Toolchain # ========= @@ -159,6 +159,8 @@ PREFERRED_VERSION_libtool-native ?= "${MAMONA_LIBTOOL_VERSION}" # ============== DISTRO_SSH_DAEMON = "dropbear" +MPLAYER = "mplayer" +MPLAYER_nokiait = "mplayer-maemo" # Select xserver-xorg as default, since kdrive has been EOL'ed XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" @@ -185,6 +187,7 @@ PREFERRED_PROVIDER_util-linux = "util-linux-ng" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" PREFERRED_PROVIDER_libfribidi = "fribidi" +PREFERRED_PROVIDER_qt4x11_nokiait = "qt4-x11-free" # Mozilla PREFERRED_PROVIDER_gtk+ = "gtk+" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index d704402..b68864a 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -31,7 +31,7 @@ IMAGE_FSTYPES ?= "jffs2" # serial console port on devboard rev. B3 SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Last udev fully compatible with kernel >= 2.6.16 PREFERRED_VERSION_udev = "118" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 31b06da..99aa643 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -29,7 +29,7 @@ IMAGE_FSTYPES ?= "tar.bz2 jffs2" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " diff --git a/conf/machine/nokia810.conf b/conf/machine/nokia810.conf index d1f2bc0..53dd2b0 100644 --- a/conf/machine/nokia810.conf +++ b/conf/machine/nokia810.conf @@ -29,7 +29,7 @@ IMAGE_FSTYPES ?= "tar.bz2 jffs2" SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -- 1.6.3.3