diff options
Diffstat (limited to 'conf/distro')
41 files changed, 1080 insertions, 952 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0e1f39a7a6..85d6f3f48a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -23,7 +23,7 @@ #DISTRO_VERSION = "2009.X" DISTRO_VERSION = "2009.X-test-${DATE}" DISTRO_REVISION = "3" -DISTRO_PR = ".4" +DISTRO_PR = ".5" OLDEST_KERNEL ?= "2.6.16" @@ -84,23 +84,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31" #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.9" PREFERRED_VERSION_glibc-initial ?= "2.9" -PREFERRED_VERSION_uclibc ?= "0.9.30" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30" - -# Preferred provider for virtual/psplash -# This enforces a specific brand to be used, in our case the angstrom -# one. In case you want to change the logo or something like that we -# suggest you to create another recipe (e.g: psplash-<brand>) for that -# and add that into your image. -# You can also opt to change or override this line, but that isn't -# needed because psplash is using update-alternatives. -PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" - -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" - -PREFERRED_PROVIDER_libfribidi = "fribidi" +PREFERRED_VERSION_uclibc ?= "0.9.30.1" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" @@ -111,15 +96,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" ANGSTROM_GCC_VERSION_bfin = "4.1.2" # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) -#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" +#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53" +KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53" #avr32 only has support for gcc 4.2.2 ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" +#armv4 needs at least gcc 4.4.2 for eabi +ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2" + #Everybody else can just use this: ANGSTROM_GCC_VERSION ?= "4.3.3" ANGSTROM_BINUTILS_VERSION ?= "2.18" +ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20" ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" @@ -140,76 +130,26 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" # Toolchain virtuals: require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" - -# Others: PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" -PREFERRED_PROVIDER_libxss = "libxss" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_util-linux = "util-linux-ng" -# The default is too old for linux-libc-headers-2.6.31: -PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789" +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - -# QT stuff: -# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone -PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free" - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - +ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" +require conf/distro/include/angstrom.inc # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}" +# we need the same provider for opkg and u-a +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl" + # 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" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_xserver ?= "xserver-xorg" # do some task-base stuff here diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index e7d7a99413..448931b8bf 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -135,6 +135,7 @@ PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" PREFERRED_VERSION_libxrandr = "1.2.1" PREFERRED_VERSION_xrandr = "1.2.0" PREFERRED_VERSION_randrproto = "1.2.1" +PREFERRED_VERSION_libx11 = "1.1.5" PREFERRED_VERSION_libgnomeui = "2.18.1" diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf new file mode 100644 index 0000000000..39ca74a170 --- /dev/null +++ b/conf/distro/corecdp.conf @@ -0,0 +1,43 @@ +#@TYPE: Distribution +#@NAME: CoreCDP <http://www.multitech.net> +#@DESCRIPTION: CoreCDP Linux Distribution for the MTCDP Cellular Development Platform +#@MAINTAINER: Multi-Tech Systems <oe-devel@multitech.net> + +# Angstrom-based distribution by Multi-Tech Systems, Inc. +require conf/distro/angstrom-2008.1.conf + +# allow use of amend.inc files in FILESPATH to add to existing recipes +require conf/amend-recipes.inc + +DISTRO_NAME = "CoreCDP" +DISTRO = "corecdp" +DISTRO_VERSION = "1.1.1" +DISTRO_TYPE = "release" +TARGET_VENDOR = "-corecdp" +BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" + +# Add Multi-Tech mirror for source download as a backup +INHERIT += "corecdp-mirrors" + +IPKG_VARIANT = "opkg-nogpg-nocurl corecdp-version" + +# use busybox instead of tinylogin +IMAGE_LOGIN_MANAGER = "busybox" + +DEFAULT_TIMEZONE = "America/Chicago" + +# Java versions that work together +# initial verions +PREFERRED_VERSION_jamvm-initial ?= "1.4.5" +PREFERRED_VERSION_classpath-initial ?= "0.93" + +# native versions +PREFERRED_VERSION_jamvm-native ?= "1.5.3" +PREFERRED_VERSION_classpath-native ?= "0.98" + +# target device +PREFERRED_VERSION_jamvm ?= "1.5.2" +PREFERRED_VERSION_classpath ?= "0.98" + +# don't build bluez4 and the large amount of deps just for libpcap +PREFERRED_PROVIDER_libpcap = "libpcap-nobluetooth" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 3098101d7f..18df733fa1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,3 +1,5 @@ +ANGSTROM_QT_VERSION ?= "4.6.0" + PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" PREFERRED_VERSION_automake-native = "1.10.2" @@ -9,26 +11,34 @@ PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.1" PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" -PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libsdl-x11 = "1.2.11" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" PREFERRED_VERSION_libtool = "2.2.6a" PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" -PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.4" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" + PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" @@ -36,11 +46,8 @@ PREFERRED_VERSION_udev = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" -PREFERRED_VERSION_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 69a5b23111..6a1f93bfb6 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,7 +5,7 @@ ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" TARGET_OS = "linux" -TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" #TARGET_OS = "linux-gnuspe" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 25ba8510a2..298e250362 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -4,7 +4,7 @@ require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" TARGET_OS = "linux" -TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index 3dbb175f93..e060bb1ccf 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1,4 +1,4 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg} diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 004d90434c..4ca68389f7 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -9,7 +9,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index ad499f7b67..92b8d8ba7e 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -6,7 +6,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 6e65285e99..8bbd28ee93 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}" TARGET_VENDOR = "-angstrom" -# Add FEED_ARCH to overrides -OVERRIDES .= ":${FEED_ARCH}" +SOC_FAMILY ?= "Unknown" + +# Add FEED_ARCH and SOC_FAMILY to overrides +OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant INHERIT += "src_distribute_local" @@ -139,15 +141,6 @@ FEED_ARCH ?= "${BASE_PACKAGE_ARCH}" #blackfin machines FEED_ARCH_bfin = "blackfin" -#Tweak packaging for strongarm machines since they can't use EABI - -PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" -PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" -PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" -PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi" -PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" - - #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" @@ -204,3 +197,6 @@ OESTATS_SERVER ?= "tinderbox.openembedded.org" # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam" + +# Use-like features +DISTRO_FEATURES += "tk" diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc deleted file mode 100644 index 81ffed71f8..0000000000 --- a/conf/distro/include/angstromoabi.inc +++ /dev/null @@ -1,4 +0,0 @@ -require conf/distro/include/angstrom.inc - -PACKAGE_ARCH = "arm-oabi" -BASE_PACKAGE_ARCH = "arm-oabi" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index ba8cdac1f5..f5c7974d5b 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -2,9 +2,11 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" +SRCREV_pn-fsodatad = "${AUTOREV}" SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fsogsmd = "${AUTOREV}" -SRCREV_pn-fsogpsd = "${AUTOREV}" +SRCREV_pn-fsotdld = "${AUTOREV}" +SRCREV_pn-fsomusicd = "${AUTOREV}" SRCREV_pn-fsonetworkd = "${AUTOREV}" SRCREV_pn-fsotimed = "${AUTOREV}" SRCREV_pn-fsousaged = "${AUTOREV}" @@ -35,6 +37,7 @@ SRCREV_pn-libpersistence = "${AUTOREV}" SRCREV_pn-mickeydbus = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" SRCREV_pn-misc-vapi = "${AUTOREV}" +SRCREV_pn-msmcommd = "${AUTOREV}" SRCREV_pn-python-pytrc = "${AUTOREV}" SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}" SRCREV_pn-vala-native = "${AUTOREV}" diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index 34f0386772..8b120f2eb2 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 21-10-2009 +#@VERSION: 11-01-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -14,7 +14,7 @@ PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_busybox = "1.13.2" -PREFERRED_VERSION_cairo = "1.8.0" +PREFERRED_VERSION_cairo = "1.8.8" PREFERRED_VERSION_dbus = "1.2.3" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" @@ -23,36 +23,49 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.18.0" +PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libsdl-x11 = "1.2.11" +PREFERRED_VERSION_libsdl-x11 = "1.2.14" PREFERRED_VERSION_libtool = "2.2.6a" PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" -PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.4" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" PREFERRED_VERSION_pango = "1.24.4" -PREFERRED_VERSION_pixman = "0.13.2" +PREFERRED_VERSION_pixman = "0.16.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.1" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +KAEILOS_QT_VERSION ?= "4.6.0" +PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}" + PREFERRED_VERSION_udev = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" -PREFERRED_VERSION_util-macros-native = "1.2.1" -PREFERRED_VERSION_util-macros = "1.2.1" PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" -PREFERRED_VERSION_xserver-xorg = "1.6.1" + +# Use latest version available +#PREFERRED_VERSION_util-macros-native = "1.4.1" +#PREFERRED_VERSION_util-macros = "1.4.1" +#PREFERRED_VERSION_xserver-xorg = "1.7.3" +#PREFERRED_VERSION_xf86-video-xgi = "1.5.1" # # meta-moblin package SRCREVs diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 7cc923cc60..d881202b09 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02" PREFERRED_VERSION_confuse ?= "2.5" PREFERRED_VERSION_confuse-native ?= "2.5" PREFERRED_VERSION_connect ?= "0.1" -PREFERRED_VERSION_connman ?= "0.10" +PREFERRED_VERSION_connman ?= "0.15" PREFERRED_VERSION_conserver ?= "8.1.14" PREFERRED_VERSION_console-tools ?= "0.3.2" PREFERRED_VERSION_contacts ?= "0.7" @@ -1963,7 +1963,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7" PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7" PREFERRED_VERSION_wmctrl ?= "1.07" PREFERRED_VERSION_wpa-gui ?= "0.4.8" -PREFERRED_VERSION_wpa-supplicant ?= "0.6.3" +PREFERRED_VERSION_wpa-supplicant ?= "0.6.9" PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6" PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6" PREFERRED_VERSION_wrt-imagetools-native ?= "1.0" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index d4a787235e..39b1f0764e 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1,18 +1,28 @@ # Upgraded # use newer version then preferred by default -PREFERRED_VERSION_boost ?= "1.40.0" -PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_boost = "1.40.0" +PREFERRED_VERSION_dbus = "1.3.0" PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" -PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" -PREFERRED_VERSION_strace ?= "4.5.15" +PREFERRED_VERSION_libmikmod = "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native = "1.2.0+git" +PREFERRED_VERSION_strace = "4.5.15" + +# We need this for jamvm +PREFERRED_VERSION_classpath = "0.98" +PREFERRED_VERSION_classpath-native = "0.98" # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" -PREFERRED_VERSION_linux-libc-headers = "2.6.29" +# and 2.6.31 for fsodeviced +PREFERRED_VERSION_linux-libc-headers = "2.6.31" # override EFL_SRCREV from sane-srcrevs.inc -EFL_SRCREV ?= "43898" +# EFL_SRCREV ?= "44424" + +# specifically set an openssh version +# NOTE: whenever changing the version here make sure +# to check we won't loose our specific config !!! +PREFERRED_VERSION_openssh = "5.2p1" # upgrades used in Angstrom PREFERRED_VERSION_gtk+ = "2.18.3" @@ -26,6 +36,15 @@ PREFERRED_VERSION_usbutils = "0.82" PREFERRED_VERSION_wpa-supplicant = "0.6.9" UDEV_GE_141 = "1" +ANGSTROM_QT_VERSION ?= "4.6.0" +PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}" + + # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py -PREFERRED_VERSION_python-pygtk ?= "2.10.4" +PREFERRED_VERSION_python-pygtk = "2.10.4" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 5ec80ffeb1..204047fd63 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" PREFERRED_VERSION_busybox ?= "1.13.2" -PREFERRED_VERSION_dbus ?= "1.2.1" +PREFERRED_VERSION_dbus ?= "1.2.3" PREFERRED_VERSION_gcc ?= "4.2.4" PREFERRED_VERSION_gcc-cross ?= "4.2.4" PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4" PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4" PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4" -PREFERRED_VERSION_glib-2.0 ?= "2.18.3" -PREFERRED_VERSION_glib-2.0-native ?= "2.18.0" +PREFERRED_VERSION_glib-2.0 ?= "2.22.1" +PREFERRED_VERSION_glib-2.0-native ?= "2.22.1" PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_ipkg ?= "0.99.163" PREFERRED_VERSION_ipkg-native ?= "0.99.163" |