diff options
Diffstat (limited to 'conf/distro/include')
25 files changed, 919 insertions, 333 deletions
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 c8607c6001..298e250362 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -4,14 +4,14 @@ 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 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os -ggdb3" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" 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 669c8ada3c..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}" @@ -202,7 +195,8 @@ SEPPUKU_COMPONENT = "org.openembedded.dev" 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" +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 a2d1992706..39b1f0764e 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1,18 +1,30 @@ # 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 ?= "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_pixman = "0.17.1" PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libtool = "2.2.6a" @@ -24,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" -PREFERRED_VERSION_libtool ?= "2.2.4" -PREFERRED_VERSION_libtool-native ?= "2.2.4" -PREFERRED_VERSION_libtool-cross ?= "2.2.4" -PREFERRED_VERSION_libtool-sdk ?= "2.2.4" +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_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_m4 ?= "1.4.8" PREFERRED_VERSION_m4-native ?= "1.4.8" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 156653f18c..11640d5cdc 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -57,6 +57,7 @@ PREFERRED_VERSION_xgamma ?= "1.0.2" PREFERRED_VERSION_xhost ?= "1.0.2" PREFERRED_VERSION_xinput ?= "1.3.0" PREFERRED_VERSION_xkbcomp ?= "1.0.5" +PREFERRED_VERSION_xkbcomp-native ?= "1.0.5" PREFERRED_VERSION_xkbevd ?= "1.0.2" PREFERRED_VERSION_xkbutils ?= "1.0.1" PREFERRED_VERSION_xkill ?= "1.0.1" @@ -157,11 +158,13 @@ PREFERRED_VERSION_libdmx ?= "1.0.2" PREFERRED_VERSION_libfs ?= "1.0.1" PREFERRED_VERSION_libice ?= "1.0.4" PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libpciaccess ?= "0.10.3" PREFERRED_VERSION_libsm ?= "1.1.0" PREFERRED_VERSION_libwindowswm ?= "1.0.0" PREFERRED_VERSION_libx11 ?= "1.1.5" PREFERRED_VERSION_libx11-native ?= "1.1.1" PREFERRED_VERSION_libxau ?= "1.0.4" +PREFERRED_VERSION_libxau-native ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "1.0.4" PREFERRED_VERSION_libxcomposite ?= "0.4.0" PREFERRED_VERSION_libxcursor ?= "1.1.9" @@ -177,6 +180,8 @@ PREFERRED_VERSION_libxft ?= "2.1.13" PREFERRED_VERSION_libxi ?= "1.1.3" PREFERRED_VERSION_libxinerama ?= "1.0.3" PREFERRED_VERSION_libxkbfile ?= "1.0.5" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.5" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" PREFERRED_VERSION_libxmu ?= "1.0.4" PREFERRED_VERSION_libxpm ?= "3.5.7" PREFERRED_VERSION_libxrandr ?= "1.2.3" @@ -200,16 +205,20 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.1" # proto PREFERRED_VERSION_applewmproto ?= "1.0.3" PREFERRED_VERSION_bigreqsproto ?= "1.0.2" +PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2" PREFERRED_VERSION_compositeproto ?= "0.4" PREFERRED_VERSION_damageproto ?= "1.1.0" PREFERRED_VERSION_dmxproto ?= "2.2.2" PREFERRED_VERSION_dri2proto ?= "1.1" +PREFERRED_VERSION_evieext ?= "1.0.2" PREFERRED_VERSION_fixesproto ?= "4.0" PREFERRED_VERSION_fontcacheproto ?= "0.1.2" PREFERRED_VERSION_fontsproto ?= "2.0.2" PREFERRED_VERSION_glproto ?= "1.4.9" PREFERRED_VERSION_inputproto ?= "1.4.4" +PREFERRED_VERSION_inputproto-native ?= "1.4.2" PREFERRED_VERSION_kbproto ?= "1.0.3" +PREFERRED_VERSION_kbproto-native ?= "1.0.3" PREFERRED_VERSION_randrproto ?= "1.2.1" PREFERRED_VERSION_recordproto ?= "1.13.2" PREFERRED_VERSION_renderproto ?= "0.9.3" @@ -218,9 +227,13 @@ PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" PREFERRED_VERSION_trapproto ?= "3.4.3" PREFERRED_VERSION_videoproto ?= "2.2.2" PREFERRED_VERSION_windowswmproto ?= "1.0.3" -PREFERRED_VERSION_xmiscproto ?= "1.1.2" +PREFERRED_VERSION_xcmiscproto ?= "1.1.2" +PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" PREFERRED_VERSION_xextproto ?= "7.0.3" PREFERRED_VERSION_xextproto-native ?= "7.0.3" +PREFERRED_VERSION_xineramaproto ?= "1.1.2" +PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.4" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" @@ -233,6 +246,7 @@ PREFERRED_VERSION_xproto ?= "7.0.13" PREFERRED_VERSION_gccmakedep ?= "1.0.2" PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_makedepend ?= "1.0.1" +PREFERRED_VERSION_makedepend-native ?= "1.0.1" PREFERRED_VERSION_util-macros-native ?= "1.1.6" PREFERRED_VERSION_util-macros ?= "1.1.6" PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc new file mode 100644 index 0000000000..a8e0e49ce0 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc @@ -0,0 +1,126 @@ +#Fri Oct 30 10:44:28 CET 2009 +#app +PREFERRED_VERSION_appres ?= "1.0.2" +PREFERRED_VERSION_beforelight ?= "1.0.3" +PREFERRED_VERSION_bitmap ?= "1.0.4" +PREFERRED_VERSION_constype ?= "1.0.2" +PREFERRED_VERSION_editres ?= "1.0.4" +PREFERRED_VERSION_fonttosfnt ?= "1.0.4" +PREFERRED_VERSION_fslsfonts ?= "1.0.2" +PREFERRED_VERSION_fstobdf ?= "1.0.3" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.2" +PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_mkcfm ?= "1.0.1" +PREFERRED_VERSION_mkcomposecache ?= "1.2.1" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rendercheck ?= "1.3" +PREFERRED_VERSION_rgb ?= "1.0.3" +PREFERRED_VERSION_rstart ?= "1.0.3" +PREFERRED_VERSION_scripts ?= "1.0.1" +PREFERRED_VERSION_showfont ?= "1.0.2" +PREFERRED_VERSION_twm ?= "1.0.4" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" +PREFERRED_VERSION_xcalc ?= "1.0.2" +PREFERRED_VERSION_xclipboard ?= "1.1.0" +PREFERRED_VERSION_xclock ?= "1.0.4" +PREFERRED_VERSION_xcompmgr ?= "1.1.4" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.9" +PREFERRED_VERSION_xedit ?= "1.1.2" +PREFERRED_VERSION_xeyes ?= "1.1.0" +PREFERRED_VERSION_xf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.2" +PREFERRED_VERSION_xfs ?= "1.1.0" +PREFERRED_VERSION_xfsinfo ?= "1.0.2" +PREFERRED_VERSION_xfwp ?= "1.0.1" +PREFERRED_VERSION_xgc ?= "1.0.1" +PREFERRED_VERSION_xinit ?= "1.1.1" +PREFERRED_VERSION_xkbprint ?= "1.0.1" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsfonts ?= "1.0.2" +PREFERRED_VERSION_xmag ?= "1.0.3" +PREFERRED_VERSION_xman ?= "1.1.0" +PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmh ?= "1.0.1" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xrx ?= "1.0.3" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" +#data +PREFERRED_VERSION_xkbdata ?= "1.0.1" +#doc +#driver +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2" +PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3" +PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" +PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" +PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" +PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +#font +PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1" +#lib +PREFERRED_VERSION_libxtrap ?= "1.0.0" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxfontcache ?= "1.0.5" +PREFERRED_VERSION_libxp ?= "1.0.0" +PREFERRED_VERSION_libxprintapputil ?= "1.0.1" +PREFERRED_VERSION_libxprintutil ?= "1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "1.0.2" +PREFERRED_VERSION_liblbxutil ?= "1.1.0" +PREFERRED_VERSION_liboldx ?= "1.0.1" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_pixman ?= "0.16.2" +#proto +PREFERRED_VERSION_evieext ?= "1.1.0" +PREFERRED_VERSION_fontcacheproto ?= "0.1.3" +PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" +PREFERRED_VERSION_printproto ?= "1.0.4" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_xf86miscproto ?= "0.9.3" +PREFERRED_VERSION_xf86rushproto ?= "1.1.2" +PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" +#util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_lndir ?= "1.0.1" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" +#xserver diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index 6f891c47fd..368f766a5b 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -1,5 +1,5 @@ # see http://www.x.org/wiki/Releases/7.5 -# WORK IN PROGRESS, 7.5 will be released on 2009-XX-XX +# 7.5 was released on 2009-10-26 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" @@ -32,215 +32,260 @@ PREFERRED_PROVIDER_xrandr ?= "xrandr" PREFERRED_PROVIDER_xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" -PREFERRED_VERSION_task-xorg ?= "X11R7.4" +PREFERRED_VERSION_task-xorg ?= "X11R7.5" # app -PREFERRED_VERSION_appres ?= "1.0.1" -PREFERRED_VERSION_bitmap ?= "1.0.3" -PREFERRED_VERSION_iceauth ?= "1.0.2" -PREFERRED_VERSION_luit ?= "1.0.3" -PREFERRED_VERSION_mkfontdir-native ?= "1.0.4" -PREFERRED_VERSION_mkfontdir ?= "1.0.4" -PREFERRED_VERSION_mkfontscale ?= "1.0.5" -PREFERRED_VERSION_sessreg ?= "1.0.4" -PREFERRED_VERSION_setxkbmap ?= "1.0.4" -PREFERRED_VERSION_smproxy ?= "1.0.2" -PREFERRED_VERSION_x11perf ?= "1.5" -PREFERRED_VERSION_xauth ?= "1.0.3" -PREFERRED_VERSION_xbacklight ?= "1.1" -PREFERRED_VERSION_xcmsdb ?= "1.0.1" -PREFERRED_VERSION_xcursorgen ?= "1.0.2" -PREFERRED_VERSION_xdpyinfo ?= "1.0.3" -PREFERRED_VERSION_xdriinfo ?= "1.0.2" -PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xgamma ?= "1.0.2" -PREFERRED_VERSION_xhost ?= "1.0.2" -PREFERRED_VERSION_xinput ?= "1.3.0" -PREFERRED_VERSION_xkbcomp ?= "1.0.5" -PREFERRED_VERSION_xkbevd ?= "1.0.2" -PREFERRED_VERSION_xkbutils ?= "1.0.1" -PREFERRED_VERSION_xkill ?= "1.0.1" -PREFERRED_VERSION_xlsatoms ?= "1.0.1" -PREFERRED_VERSION_xlsclients ?= "1.0.1" -PREFERRED_VERSION_xmodmap ?= "1.0.3" -PREFERRED_VERSION_xpr ?= "1.0.2" -PREFERRED_VERSION_xprop ?= "1.0.4" -PREFERRED_VERSION_xrandr ?= "1.2.3" -PREFERRED_VERSION_xrdb ?= "1.0.5" -PREFERRED_VERSION_xrefresh ?= "1.0.2" -PREFERRED_VERSION_xset ?= "1.0.4" -PREFERRED_VERSION_xsetmode ?= "1.0.0" -PREFERRED_VERSION_xsetroot ?= "1.0.2" -PREFERRED_VERSION_xvinfo ?= "1.0.2" -PREFERRED_VERSION_xwd ?= "1.0.2" -PREFERRED_VERSION_xwininfo ?= "1.0.4" -PREFERRED_VERSION_xwud ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "1.0.2" +PREFERRED_VERSION_bdftopcf-native ?= "1.0.2" +PREFERRED_VERSION_iceauth ?= "1.0.3" +PREFERRED_VERSION_luit ?= "1.0.4" +PREFERRED_VERSION_mkfontdir ?= "1.0.5" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.5" +PREFERRED_VERSION_mkfontscale ?= "1.0.7" +PREFERRED_VERSION_mkfontscale-native ?= "1.0.7" +PREFERRED_VERSION_sessreg ?= "1.0.5" +PREFERRED_VERSION_setxkbmap ?= "1.1.0" +PREFERRED_VERSION_smproxy ?= "1.0.3" +PREFERRED_VERSION_x11perf ?= "1.5.1" +PREFERRED_VERSION_xauth ?= "1.0.4" +PREFERRED_VERSION_xbacklight ?= |