diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-01-22 00:50:27 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-01-22 00:50:27 +0300 |
| commit | 029e21c8111deafa850ad1724e48da29c321f2f8 (patch) | |
| tree | 00c9ad7db155d3f3fe471517d5d882b517f9ccfd /conf/distro | |
| parent | 8e099432e6b3687bc97f756aa7176b02cb1c7693 (diff) | |
| parent | b6f9a84fd99c89ac074aaed90cdd3d064c534492 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
40 files changed, 1161 insertions, 956 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 5f6ef768ad..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 angstrom-version ${ANGSTROM_FEED_CONFIGS}" +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/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..870ac04036 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: 20-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,52 @@ 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_WX_VERSION ?= "2.8.10" +PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}" + +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 ?= "1.1.1" +PREFERRED_VERSION_xcmsdb ?= "1.0.2" +PREFERRED_VERSION_xcursorgen ?= "1.0.3" +PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" +PREFERRED_VERSION_xdpyinfo ?= "1.1.0" +PREFERRED_VERSION_xdriinfo ?= "1.0.3" +PREFERRED_VERSION_xev ?= "1.0.4" +PREFERRED_VERSION_xgamma ?= "1.0.3" +PREFERRED_VERSION_xhost ?= "1.0.3" +PREFERRED_VERSION_xinput ?= "1.5.0" +PREFERRED_VERSION_xkbcomp ?= "1.1.1" +PREFERRED_VERSION_xkbcomp-native ?= "1.1.1" +PREFERRED_VERSION_xkbevd ?= "1.1.0" +PREFERRED_VERSION_xkbutils ?= "1.0.2" +PREFERRED_VERSION_xkill ?= "1.0.2" +PREFERRED_VERSION_xlsatoms ?= "1.0.2" +PREFERRED_VERSION_xlsclients ?= "1.0.2" +PREFERRED_VERSION_xmodmap ?= "1.0.4" +PREFERRED_VERSION_xpr ?= "1.0.3" +PREFERRED_VERSION_xprop ?= "1.1.0" +PREFERRED_VERSION_xrandr ?= "1.3.2" +PREFERRED_VERSION_xrdb ?= "1.0.6" +PREFERRED_VERSION_xrefresh ?= "1.0.3" +PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xsetroot ?= "1.0.3" +PREFERRED_VERSION_xvinfo ?= "1.1.0" +PREFERRED_VERSION_xwd ?= "1.0.3" +PREFERRED_VERSION_xwininfo ?= "1.0.5" +PREFERRED_VERSION_xwud ?= "1.0.2" # data -PREFERRED_VERSION_xbitmaps ?= "1.0.1" -PREFERRED_VERSION_xcursor-themes ?= "1.0.1" +PREFERRED_VERSION_xbitmaps ?= "1.1.0" +PREFERRED_VERSION_xcursor-themes ?= "1.0.2" # doc -PREFERRED_VERSION_xorg-docs ?= "1.4" -PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" +PREFERRED_VERSION_xorg-docs ?= "1.5" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3" # driver -PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2" -PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1" -PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" -PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2" -PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1" -PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" -PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1" -PREFERRED_VERSION_xf86-input-void ?= "1.1.1" -PREFERRED_VERSION_xf86-video-apm ?= "1.2.0" -PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" -PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" -PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" -PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" +PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.5.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" +PREFERRED_VERSION_xf86-input-void ?= "1.3.0" +PREFERRED_VERSION_xf86-video-apm ?= "1.2.2" +PREFERRED_VERSION_xf86-video-ark ?= "0.7.2" +PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ati ?= "6.12.4" +PREFERRED_VERSION_xf86-video-chips ?= "1.2.2" PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" -PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" -PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" -PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1" -PREFERRED_VERSION_xf86-video-glide ?= "1.0.1" -PREFERRED_VERSION_xf86-video-glint ?= "1.2.1" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1" -PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0" -PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.6.3" -PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0" -PREFERRED_VERSION_xf86-video-mga ?= "1.4.9" -PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1" -PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.12" -PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903" -PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0" -PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0" -PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0" -PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1" -PREFERRED_VERSION_xf86-video-savage ?= "2.2.1" -PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0" -PREFERRED_VERSION_xf86-video-sis ?= "0.10.0" -PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0" -PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" -PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.3.2" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.6" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" +PREFERRED_VERSION_xf86-video-intel ?= "2.9.1" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.11" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.15" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4" +PREFERRED_VERSION_xf86-video-savage ?= "2.3.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3" +PREFERRED_VERSION_xf86-video-sis ?= "0.10.2" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1" PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" -PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" -PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0" -PREFERRED_VERSION_xf86-video-tga ?= "1.2.0" -PREFERRED_VERSION_xf86-video-trident ?= "1.3.0" -PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.1" +PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" -PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" -PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5" -PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0" -PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1" -PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0" -PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3" +PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" # font -PREFERRED_VERSION_encodings ?= "1.0.2" -PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" -PREFERRED_VERSION_font-util-native ?= "1.0.1" -PREFERRED_VERSION_font-util ?= "1.0.1" -PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1" +PREFERRED_VERSION_encodings ?= "1.0.3" +PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2" +PREFERRED_VERSION_font-alias ?= "1.0.2" +PREFERRED_VERSION_font-arabic-misc ?= "1.0.1" +PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-ttf ?= "1.0.1" +PREFERRED_VERSION_font-bh-type1 ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1" +PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-cursor-misc ?= "1.0.1" +PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1" +PREFERRED_VERSION_font-dec-misc ?= "1.0.1" +PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1" +PREFERRED_VERSION_font-isas-misc ?= "1.0.1" +PREFERRED_VERSION_font-jis-misc ?= "1.0.1" +PREFERRED_VERSION_font-micro-misc ?= "1.0.1" +PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1" +PREFERRED_VERSION_font-misc-meltho ?= "1.0.1" +PREFERRED_VERSION_font-misc-misc ?= "1.1.0" +PREFERRED_VERSION_font-mutt-misc ?= "1.0.1" +PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2" +PREFERRED_VERSION_font-sony-misc ?= "1.0.1" +PREFERRED_VERSION_font-sun-misc ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.1.1" +PREFERRED_VERSION_font-util-native ?= "1.1.1" +PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2" # lib -PREFERRED_VERSION_diet-x11 ?= "1.1.5" -PREFERRED_VERSION_libapplewm ?= "1.0.0" -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_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_libxaw ?= "1.0.4" -PREFERRED_VERSION_libxcomposite ?= "0.4.0" -PREFERRED_VERSION_libxcursor ?= "1.1.9" -PREFERRED_VERSION_libxdamage ?= "1.1.1" -PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" -PREFERRED_VERSION_libxdmcp ?= "1.0.2" -PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.4" -PREFERRED_VERSION_libxfixes ?= "4.0.3" -PREFERRED_VERSION_libxfont ?= "1.3.3" -PREFERRED_VERSION_libxfontcache ?= "1.0.4" -PREFERRED_VERSION_libxft ?= "2.1.13" -PREFERRED_VERSION_libxi ?= "1.2.0" -PREFERRED_VERSION_libxinerama ?= "1.0.3" -PREFERRED_VERSION_libxkbfile ?= "1.0.5" -PREFERRED_VERSION_libxmu ?= "1.0.4" -PREFERRED_VERSION_libxpm ?= "3.5.7" -PREFERRED_VERSION_libxrandr ?= "1.2.3" -PREFERRED_VERSION_libxrender ?= "0.9.4" -PREFERRED_VERSION_libxres ?= "1.0.3" -PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" -PREFERRED_VERSION_libxt ?= "1.0.5" -PREFERRED_VERSION_libxtst ?= "1.0.3" -PREFERRED_VERSION_libxv ?= "1.0.4" -PREFERRED_VERSION_libxvmc ?= "1.0.4" -PREFERRED_VERSION_libxxf86dga ?= "1.0.2" -PREFERRED_VERSION_libxxf86misc ?= "1.0.1" -PREFERRED_VERSION_libxxf86vm ?= "1.0.2" -PREFERRED_VERSION_xtrans ?= "1.2.1" - -# This should be here but is needed until bitbake can do -# versioned depends -PREFERRED_VERSION_mesa ?= "7.4" +PREFERRED_VERSION_libapplewm ?= "1.4.0" +PREFERRED_VERSION_libfs ?= "1.0.2" +PREFERRED_VERSION_libice ?= "1.0.6" +PREFERRED_VERSION_libice-native ?= "1.0.6" +PREFERRED_VERSION_libsm ?= "1.1.1" +PREFERRED_VERSION_libsm-native ?= "1.1.1" +PREFERRED_VERSION_libwindowswm ?= "1.0.1" +PREFERRED_VERSION_libx11 ?= "1.3.2" +PREFERRED_VERSION_libx11-native ?= "1.3.2" +PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" +PREFERRED_VERSION_libxau ?= "1.0.5" +PREFERRED_VERSION_libxau-native ?= "1.0.5" +PREFERRED_VERSION_libxaw ?= "1.0.7" +PREFERRED_VERSION_libxcomposite ?= "0.4.1" +PREFERRED_VERSION_libxcursor ?= "1.1.10" +PREFERRED_VERSION_libxcursor-native ?= "1.1.10" +PREFERRED_VERSION_libxdamage ?= "1.1.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.3" +PREFERRED_VERSION_libxext ?= "1.1.1" +PREFERRED_VERSION_libxext-native ?= "1.1.1" +PREFERRED_VERSION_libxfixes ?= "4.0.4" +PREFERRED_VERSION_libxfixes-native ?= "4.0.4" +PREFERRED_VERSION_libxfont ?= "1.4.1" +PREFERRED_VERSION_libxfont-native ?= "1.4.1" +PREFERRED_VERSION_libxft ?= "2.1.14" +PREFERRED_VERSION_libxi ?= "1.3" +PREFERRED_VERSION_libxinerama ?= "1.1" +PREFERRED_VERSION_libxmu ?= "1.0.5" +PREFERRED_VERSION_libxpm ?= "3.5.8" +PREFERRED_VERSION_libxrandr ?= "1.3.0" +PREFERRED_VERSION_libxrender ?= "0.9.5" +PREFERRED_VERSION_libxrender-native ?= "0.9.5" +PREFERRED_VERSION_libxres ?= "1.0.4" +PREFERRED_VERSION_libxt ?= "1.0.7" +PREFERRED_VERSION_libxt-native ?= "1.0.7" +PREFERRED_VERSION_libxtst ?= "1.1.0" +PREFERRED_VERSION_libxv ?= "1.0.5" +PREFERRED_VERSION_libxvmc ?= "1.0.5" +PREFERRED_VERSION_libxxf86dga ?= "1.1.1" +PREFERRED_VERSION_libxxf86vm ?= "1.1.0" +PREFERRED_VERSION_libdmx ?= "1.1.0" +PREFERRED_VERSION_libfontenc ?= "1.0.5" +PREFERRED_VERSION_libfontenc-native ?= "1.0.5" +PREFERRED_VERSION_libpciaccess ?= "0.10.9" +PREFERRED_VERSION_libxkbfile ?= "1.0.6" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" +PREFERRED_VERSION_mesa ?= "7.2" +PREFERRED_VERSION_mesa-dri ?= "7.2" +PREFERRED_VERSION_mesa-xlib ?= "7.2" +PREFERRED_VERSION_xtrans ?= "1.2.5" +PREFERRED_VERSION_xtrans-native ?= "1.2.5" # proto -PREFERRED_VERSION_applewmproto ?= "1.0.3" -PREFERRED_VERSION_bigreqsproto ?= "1.0.2" -PREFERRED_VERSION_compositeproto ?= "0.4" -PREFERRED_VERSION_damageproto ?= "1.1.0" -PREFERRED_VERSION_dmxproto ?= "2.2.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.5.0" -PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_VERSION_recordproto ?= "1.13.2" -PREFERRED_VERSION_renderproto ?= "0.9.3" -PREFERRED_VERSION_resourceproto ?= "1.0.2" -PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" -PREFERRED_VERSION_dri2proto ?= "2.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_xextproto ?= "7.0.3" -PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xf86driproto ?= "2.0.4" -PREFERRED_VERSION_xf86miscproto ?= "0.9.2" -PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" -PREFERRED_VERSION_xinemaroproto ?= "1.1.2" -PREFERRED_VERSION_xproto-native ?= "7.0.13" -PREFERRED_VERSION_xproto ?= "7.0.13" +PREFERRED_VERSION_applewmproto ?= "1.4.1" +PREFERRED_VERSION_bigreqsproto ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" +PREFERRED_VERSION_compositeproto ?= "0.4.1" +PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_dmxproto ?= "2.3" +PREFERRED_VERSION_dri2proto ?= "2.1" +PREFERRED_VERSION_fixesproto ?= "4.1.1" +PREFERRED_VERSION_fixesproto-native ?= "4.1.1" +PREFERRED_VERSION_fontsproto ?= "2.1.0" +PREFERRED_VERSION_fontsproto-native ?= "2.1.0" +PREFERRED_VERSION_glproto ?= "1.4.10" +PREFERRED_VERSION_inputproto ?= "2.0" +PREFERRED_VERSION_inputproto-native ?= "2.0" +PREFERRED_VERSION_kbproto ?= "1.0.4" +PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_randrproto ?= "1.3.1" +PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_renderproto ?= "0.11" +PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" +PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_windowswmproto ?= "1.0.4" +PREFERRED_VERSION_xcmiscproto ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xextproto ?= "7.1.1" +PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.1" +PREFERRED_VERSION_xf86driproto ?= "2.1.0" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" +PREFERRED_VERSION_xineramaproto ?= "1.2" +PREFERRED_VERSION_xproto ?= "7.0.16" +PREFERRED_VERSION_xproto-native ?= "7.0.16" # util -PREFERRED_VERSION_gccmakedep ?= "1.0.2" -PREFERRED_VERSION_imake ?= "1.0.2" -PREFERRED_VERSION_makedepend ?= "1.0.1" -PREFERRED_VERSION_util-macros-native ?= "1.2.1" -PREFERRED_VERSION_util-macros ?= "1.2.1" -PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" +PREFERRED_VERSION_makedepend ?= "1.0.2" +PREFERRED_VERSION_makedepend-native ?= "1.0.2" +PREFERRED_VERSION_util-macros ?= "1.3.0" +PREFERRED_VERSION_util-macros-native ?= "1.3.0" # xserver -PREFERRED_VERSION_xserver-kdrive ?= "1.4" -PREFERRED_VERSION_xserver-xorg ?= "1.5.3" +PREFERRED_VERSION_xserver-xorg ?= "1.7.1" # Unreleased packages SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" + +require conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc new file mode 100644 index 0000000000..65e94fac5c --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -0,0 +1,354 @@ +#Mon Jan 18 14:00:56 CET 2010 +#app +PREFERRED_VERSION_appres ?= "1.0.2" +PREFERRED_VERSION_bdftopcf ?= "1.0.2" +PREFERRED_VERSION_bdftopcf-native ?= "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_iceauth ?= "1.0.3" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.2" +PREFERRED_VERSION_listres ?= "1.0.2" +PREFERRED_VERSION_luit ?= "1.0.4" +PREFERRED_VERSION_mkcfm ?= "1.0.1" +PREFERRED_VERSION_mkcomposecache ?= "1.2.1" +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_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_sessreg ?= "1.0.5" +PREFERRED_VERSION_setxkbmap ?= "1.1.0" +PREFERRED_VERSION_showfont ?= "1.0.2" +PREFERRED_VERSION_smproxy ?= "1.0.3" +PREFERRED_VERSION_twm ?= "1.0.4" +PREFERRED_VERSION_viewres ?= "1.0.2" +PREFERRED_VERSION_x11perf ?= "1.5.1" +PREFERRED_VERSION_xauth ?= "1.0.4" +PREFERRED_VERSION_xbacklight ?= "1.1.1" +PREFERRED_VERSION_xbiff ?= "1.0.2" +PREFERRED_VERSION_xcalc ?= "1.0.3" +PREFERRED_VERSION_xclipboard ?= "1.1.0" +PREFERRED_VERSION_xclock ?= "1.0.4" +PREFERRED_VERSION_xcmsdb ?= "1.0.2" +PREFERRED_VERSION_xcompmgr ?= "1.1.5" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xcursorgen ?= "1.0.3" +PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.9" +PREFERRED_VERSION_xdpyinfo ?= "1.1.0" +PREFERRED_VERSION_xdriinfo ?= "1.0.3" +PREFERRED_VERSION_xedit ?= "1.1.2" +PREFERRED_VERSION_xev ?= "1.0.4" +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_xgamma ?= "1.0.3" +PREFERRED_VERSION_xgc ?= "1.0.2" +PREFERRED_VERSION_xhost ?= "1.0.3" +PREFERRED_VERSION_xinit ?= "1.2.0" +PREFERRED_VERSION_xinput ?= "1.5.0" +PREFERRED_VERSION_xkbcomp ?= "1.1.1" +PREFERRED_VERSION_xkbcomp-native ?= "1.1.1" +PREFERRED_VERSION_xkbevd ?= "1.1.0" +PREFERRED_VERSION_xkbprint ?= "1.0.2" +PREFERRED_VERSION_xkbutils ?= "1.0.2" +PREFERRED_VERSION_xkill ?= "1.0.2" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.2" +PREFERRED_VERSION_xlsatoms ?= "1.0.2" +PREFERRED_VERSION_xlsclients ?= "1.0.2" +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_xmodmap ?= "1.0.4" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xpr ?= "1.0.3" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xprop ?= "1.1.0" +PREFERRED_VERSION_xrandr ?= "1.3.2" +PREFERRED_VERSION_xrdb ?= "1.0.6" +PREFERRED_VERSION_xrefresh ?= "1.0.3" +PREFERRED_VERSION_xrx ?= "1.0.3" +PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsetroot ?= "1.0.3" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.2" +PREFERRED_VERSION_xvinfo ?= "1.1.0" +PREFERRED_VERSION_xwd ?= "1.0.3" +PREFERRED_VERSION_xwininfo ?= "1.0.5" +PREFERRED_VERSION_xwud ?= "1.0.2" +#data +PREFERRED_VERSION_xbitmaps ?= "1.1.0" +PREFERRED_VERSION_xcursor-themes ?= "1.0.2" +PREFERRED_VERSION_xkbdata ?= "1.0.1" +#doc +PREFERRED_VERSION_xorg-docs ?= "1.5" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.3" +#driver +PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +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-evdev ?= "2.3.2" +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-joystick ?= "1.5.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.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-mouse ?= "1.5.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-synaptics ?= "1.2.1" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" +PREFERRED_VERSION_xf86-input-void ?= "1.3.0" +PREFERRED_VERSION_xf86-video-apm ?= "1.2.2" +PREFERRED_VERSION_xf86-video-ark ?= "0.7.2" +PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ati ?= "6.12.4" +PREFERRED_VERSION_xf86-video-chips ?= "1.2.2" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.6" +PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" +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-intel ?= "2.10.0" +PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" +PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.16" +PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" +PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" +PREFERRED_VERSION_xf86-video-rendition ?= "4.2.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.6.3" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.4" +PREFERRED_VERSION_xf86-video-savage ?= "2.3.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.7.3" +PREFERRED_VERSION_xf86-video-sis ?= "0.10.2" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.3" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.1" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.1" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.1" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.3" +PREFERRED_VERSION_xf86-video-tga ?= "1.2.1" +PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" +PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" +PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" +PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" +#font +PREFERRED_VERSION_encodings ?= "1.0.3" +PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-adobe-utopia-100dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-75dpi ?= "1.0.2" +PREFERRED_VERSION_font-adobe-utopia-type1 ?= "1.0.2" +PREFERRED_VERSION_font-alias ?= "1.0.2" +PREFERRED_VERSION_font-arabic-misc ?= "1.0.1" +PREFERRED_VERSION_font-bh-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bh-ttf ?= "1.0.1" +PREFERRED_VERSION_font-bh-type1 ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-100dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-75dpi ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-speedo ?= "1.0.1" +PREFERRED_VERSION_font-bitstream-type1 ?= "1.0.1" +PREFERRED_VERSION_font-cronyx-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-cursor-misc ?= "1.0.1" +PREFERRED_VERSION_font-daewoo-misc ?= "1.0.1" +PREFERRED_VERSION_font-dec-misc ?= "1.0.1" +PREFERRED_VERSION_font-ibm-type1 ?= "1.0.1" +PREFERRED_VERSION_font-isas-misc ?= "1.0.1" +PREFERRED_VERSION_font-jis-misc ?= "1.0.1" +PREFERRED_VERSION_font-micro-misc ?= "1.0.1" +PREFERRED_VERSION_font-misc-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-misc-ethiopic ?= "1.0.1" +PREFERRED_VERSION_font-misc-meltho ?= "1.0.1" +PREFERRED_VERSION_font-misc-misc ?= "1.1.0" +PREFERRED_VERSION_font-mutt-misc ?= "1.0.1" +PREFERRED_VERSION_font-schumacher-misc ?= "1.1.0" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.2" +PREFERRED_VERSION_font-sony-misc ?= "1.0.1" +PREFERRED_VERSION_font-sun-misc ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.1.1" +PREFERRED_VERSION_font-util-native ?= "1.1.1" +PREFERRED_VERSION_font-winitzki-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.2" +#lib +PREFERRED_VERSION_libapplewm ?= "1.4.0" +PREFERRED_VERSION_libfs ?= "1.0.2" +PREFERRED_VERSION_libice ?= "1.0.6" +PREFERRED_VERSION_libice-native ?= "1.0.6" +PREFERRED_VERSION_libsm ?= "1.1.1" +PREFERRED_VERSION_libsm-native ?= "1.1.1" +PREFERRED_VERSION_libwindowswm ?= "1.0.1" +PREFERRED_VERSION_libx11 ?= "1.3.3" +PREFERRED_VERSION_libx11-native ?= "1.3.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" +PREFERRED_VERSION_libxtrap ?= "1.0.0" +PREFERRED_VERSION_libxau ?= "1.0.5" +PREFERRED_VERSION_libxau-native ?= "1.0.5" +PREFERRED_VERSION_libxaw ?= "1.0.7" +PREFERRED_VERSION_libxcomposite ?= "0.4.1" +PREFERRED_VERSION_libxcursor ?= "1.1.10" +PREFERRED_VERSION_libxcursor-native ?= "1.1.10" +PREFERRED_VERSION_libxdamage ?= "1.1.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.3" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.1.1" +PREFERRED_VERSION_libxext-native ?= "1.1.1" +PREFERRED_VERSION_libxfixes ?= "4.0.4" +PREFERRED_VERSION_libxfixes-native ?= "4.0.4" +PREFERRED_VERSION_libxfont ?= "1.4.1" +PREFERRED_VERSION_libxfont-native ?= "1.4.1" +PREFERRED_VERSION_libxfontcache ?= "1.0.5" +PREFERRED_VERSION_libxft ?= "2.1.14" +PREFERRED_VERSION_libxi ?= "1.3" +PREFERRED_VERSION_libxinerama ?= "1.1" +PREFERRED_VERSION_libxmu ?= "1.0.5" +PREFERRED_VERSION_libxp ?= "1.0.0" +PREFERRED_VERSION_libxpm ?= "3.5.8" +PREFERRED_VERSION_libxprintapputil ?= "1.0.1" +PREFERRED_VERSION_libxprintutil ?= "1.0.1" +PREFERRED_VERSION_libxrandr ?= "1.3.0" +PREFERRED_VERSION_libxrender ?= "0.9.5" +PREFERRED_VERSION_libxrender-native ?= "0.9.5" +PREFERRED_VERSION_libxres ?= "1.0.4" +PREFERRED_VERSION_libxt ?= "1.0.7" +PREFERRED_VERSION_libxt-native ?= "1.0.7" +PREFERRED_VERSION_libxtst ?= "1.1.0" +PREFERRED_VERSION_libxv ?= "1.0.5" +PREFERRED_VERSION_libxvmc ?= "1.0.5" +PREFERRED_VERSION_libxxf86dga ?= "1.1.1" +PREFERRED_VERSION_libxxf86misc ?= "1.0.2" +PREFERRED_VERSION_libxxf86vm ?= "1.1.0" +PREFERRED_VERSION_libdmx ?= "1.1.0" +PREFERRED_VERSION_libfontenc ?= "1.0.5" +PREFERRED_VERSION_libfontenc-native ?= "1.0.5" +PREFERRED_VERSION_liblbxutil ?= "1.1.0" +PREFERRED_VERSION_liboldx ?= "1.0.1" +PREFERRED_VERSION_libpciaccess ?= "0.11.0" +PREFERRED_VERSION_libxkbfile ?= "1.0.6" +PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_pixman ?= "0.17.4" +PREFERRED_VERSION_xtrans ?= "1.2.5" +PREFERRED_VERSION_xtrans-native ?= "1.2.5" +#proto +PREFERRED_VERSION_applewmproto ?= "1.4.1" +PREFERRED_VERSION_bigreqsproto ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" +PREFERRED_VERSION_compositeproto ?= "0.4.1" +PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_dmxproto ?= "2.3" +PREFERRED_VERSION_dri2proto ?= "2.2" +PREFERRED_VERSION_evieext ?= "1.1.0" +PREFERRED_VERSION_fixesproto ?= "4.1.1" +PREFERRED_VERSION_fixesproto-native ?= "4.1.1" +PREFERRED_VERSION_fontcacheproto ?= "0.1.3" +PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" +PREFERRED_VERSION_fontsproto ?= "2.1.0" +PREFERRED_VERSION_fontsproto-native ?= "2.1.0" +PREFERRED_VERSION_glproto ?= "1.4.11" +PREFERRED_VERSION_inputproto ?= "2.0" +PREFERRED_VERSION_inputproto-native ?= "2.0" +PREFERRED_VERSION_kbproto ?= "1.0.4" +PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_printproto ?= "1.0.4" +PREFERRED_VERSION_randrproto ?= "1.3.1" +PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_renderproto ?= "0.11" +PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" +PREFERRED_VERSION_trapproto ?= "3.4.3" +PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_windowswmproto ?= "1.0.4" +PREFERRED_VERSION_xcmiscproto ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xextproto ?= "7.1.1" +PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.1" +PREFERRED_VERSION_xf86driproto ?= "2.1.0" +PREFERRED_VERSION_xf86miscproto ?= "0.9.3" +PREFERRED_VERSION_xf86rushproto ?= "1.1.2" +PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" +PREFERRED_VERSION_xineramaproto ?= "1.2" +PREFERRED_VERSION_xproto ?= "7.0.16" +PREFERRED_VERSION_xproto-native ?= "7.0.16" +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_makedepend ?= "1.0.2" +PREFERRED_VERSION_makedepend-native ?= "1.0.2" +PREFERRED_VERSION_util-macros ?= "1.5.0" +PREFERRED_VERSION_util-macros-native ?= "1.5.0" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" +#xserver +#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2" +PREFERRED_VERSION_xserver-xorg ?= "1.7.4" diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc index 4f38b8f936..d953d6ebe0 100644 --- a/conf/distro/include/sane-feed-deb.inc +++ b/conf/distro/include/sane-feed-deb.inc @@ -2,5 +2,5 @@ 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/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/sane-feed-ipk.inc +++ b/conf/distro/include/sane-feed-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/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 8e960d0d66..06e3f1c8e0 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,44 +1,49 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226" +FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "f7ef257660227403dc352423066deeeabaf1fa73" +SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d" -SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14" -SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" -SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819" -SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} -SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30" +SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5" +SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} +SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc" SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "60eaf17a53d410c564417b226db1e6ea8ca9a2a3" +SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e" -SRCREV_pn-libfso-glib ?= "3630315a498f91106b4187e41608613520d63090" -SRCREV_pn-libframeworkd-glib ?= "f7ea17bc2a33d6f0989a71f86ccc6ed3e8051e77" +SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb" +SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3" +SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d" SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" -SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693" -SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a" +SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9" +SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}" +SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d" +SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f" SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad" -SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0" +SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f" SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7b11e1dda6..f4d79268a2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,18 +14,19 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-alsa-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-alsa-scenarii-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" +SRCREV_pn-babiloo-efl ?= "296" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654" SRCREV_pn-bootchart-lite ?= "4" SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc" SRCREV_pn-bubble-keyboard ?= "194" -SRCREV_pn-calc ?= "3f4382138b71b0c31d6722604399e12a37bcebe8" +SRCREV_pn-calc ?= "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-cdparanoia ?= "16684" SRCREV_pn-clutter ?= "3240" @@ -45,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" -SRCREV_pn-e-tasks ?= "14" +SRCREV_pn-e-tasks ?= "22" SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -57,15 +58,15 @@ SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-ebrainy ?= "21" SRCREV_pn-eds-dbus ?= "736" -SRCREV_pn-elementary-theme-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" +SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" +SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" +SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-elmdentica ?= "171" SRCREV_pn-enlazar ?= "37" SRCREV_pn-enotes ?= "19" -SRCREV_pn-epdfview ?= "345" +SRCREV_pn-epdfview ?= "346" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-essential-dialer ?= "194" SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -77,20 +78,14 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-fltk2 ?= "6671" -SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" -SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} +SRCREV_pn-fltk2 ?= "6916" +SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373" +SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" -GCCREV ?= "145550" -SRCREV_pn-gcc ?= ${GCCREV} -SRCREV_pn-gcc-cross ?= ${GCCREV} -SRCREV_pn-gcc-cross-initial ?= ${GCCREV} -SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} -SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-glamo-dri-tests ?= "080b8db3d9dbfae38ebb00439887b5535ab1d380" SRCREV_pn-gnet ?= "495" @@ -103,25 +98,15 @@ SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gridpad ?= "194" SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gtkhtml2 ?= "1158" +SRCREV_pn-guitartune ?= "11" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14" SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" -SRCREV_pn-intone ?= "66" -SRCREV_pn-intone-video ?= "9" +SRCREV_pn-intone ?= "75" +SRCREV_pn-intone-video ?= "12" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -145,11 +130,11 @@ SRCREV_pn-libmokogsmd2 ?= "4334" SRCREV_pn-libmokojournal2 ?= "3473" SRCREV_pn-libmokopanelui2 ?= "4568" SRCREV_pn-libmokoui2 ?= "4695" -SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17" +SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a" SRCREV_pn-libowl ?= "277" -SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159" -SRCREV_pn-libphone-ui-shr ?= "29363d678d77182bde8c617ab7c56114150d6ff9" -SRCREV_pn-libphone-utils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b" +SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c" +SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a" +SRCREV_pn-libphone-utils ?= "665f27d6c3af092ae56f652c9fe6b5631b4d10db" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libsnmp-perl ?= "17367" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" @@ -161,11 +146,12 @@ SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" -SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" -SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" -SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" -SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" -SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967" +SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" +SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244" +SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e" +SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" +SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" +SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40" SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -189,16 +175,19 @@ SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" -SRCREV_pn-mokonnect ?= "111" +SRCREV_pn-mokonnect ?= "113" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "1096" +SRCREV_pn-navit ?= "2902" +SRCREV_pn-navit-icons ?= "2871" SRCREV_pn-neod ?= "4617" +SRCREV_pn-neomis ?= "6" SRCREV_pn-net-snmp ?= "17367" SRCREV_pn-netsurf ?= "3859" +SRCREV_pn-numberx ?= "4" SRCREV_pn-numptyphysics ?= "109" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e" @@ -210,7 +199,8 @@ SRCREV_pn-omgps ?= "109" SRCREV_pn-omoney ?= "29" SRCREV_pn-ompower ?= "4727" SRCREV_pn-omview ?= "34" -SRCREV_pn-openbsc ?= "d46299da00f923b24043aa37fa2bae17ffcc1ff7" +SRCREV_pn-openbsc ?= "5e68183a201ab92f29cd2467df5209f7b351a66d" +SRCREV_pn-openbsc-onwaves ?= "0d9ed87d5c7d5b6e21dc3bbb282e215068742566" SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526" SRCREV_pn-openmoko-agpsui ?= "7" SRCREV_pn-openmoko-alsa-scenarios ?= "4732" @@ -254,10 +244,10 @@ SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e" -SRCREV_pn-opkg ?= "240" -SRCREV_pn-opkg-native ?= "240" -SRCREV_pn-opkg-sdk ?= "240" +SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420" +SRCREV_pn-opkg ?= "446" +SRCREV_pn-opkg-native ?= "446" +SRCREV_pn-opkg-sdk ?= "446" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" @@ -267,12 +257,12 @@ SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d" -SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01" +SRCREV_pn-phonefsod ?= "76d8cc085946e77e3fc27ef12a9d18411324747b" SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6" -SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c" +SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" -SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" +SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b" SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda" @@ -288,21 +278,24 @@ QEMUSRCREV ?= "4242" SRCREV_pn-qemu ?= "${QEMUSRCREV}" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" -SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359" +SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" +SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" +SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5" +SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5" SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" SRCREV_pn-s3c24xx-gpio ?= "4949" SRCREV_pn-s3c64xx-gpio ?= "4949" -SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" +SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde" -SRCREV_pn-shr-launcher ?= "87" +SRCREV_pn-shr-launcher ?= "102" SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" -SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763" -SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d" +SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7" +SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca" SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -310,14 +303,16 @@ SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb" SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" +SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-socketcan-utils-test ?= "917" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" +SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2" SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" @@ -340,7 +335,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "43437" +EFL_SRCREV ?= "45060" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" @@ -374,6 +369,7 @@ SRCREV_pn-evolve-native ?= "${EFL_SRCREV}" SRCREV_pn-evolve ?= "${EFL_SRCREV}" SRCREV_pn-gevas2 ?= "${EFL_SRCREV}" SRCREV_pn-imlib2 ?= "${EFL_SRCREV}" +SRCREV_pn-libeweather ?= "${EFL_SRCREV}" # Enlightenment Bindings SRCREV_pn-eflpp ?= "${EFL_SRCREV}" @@ -412,6 +408,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}" SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-waker ?= "${EFL_SRCREV}" +#illume default keyboards +SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}" + #exalt SRCREV_pn-exalt ?= "${EFL_SRCREV}" SRCREV_pn-exalt-client ?= "${EFL_SRCREV}" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index c98234fb9a..04fde21b25 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -25,8 +25,8 @@ PREFERRED_GCC_VERSION_ppc405 ?= "4.4.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" -# This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" +# This is unrelated to the kernel version, but glibc and some userspaceapps require a recent version to build against +PREFERRED_VERSION_linux-libc-headers ?= "2.6.31" # 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" diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc index 78735fddce..75f389cf83 100644 --- a/conf/distro/include/shr-autorev.inc +++ b/conf/distro/include/shr-autorev.inc @@ -12,3 +12,7 @@ SRCREV_pn-phonefsod = "${AUTOREV}" SRCREV_pn-libphone-ui = "${AUTOREV}" SRCREV_pn-libphone-ui-shr = "${AUTOREV}" SRCREV_pn-libphone-utils = "${AUTOREV}" +SRCREV_pn-opimd-utils = "${AUTOREV}" +SRCREV_pn-shr-installer = "${AUTOREV}" +SRCREV_pn-shr-wizard = "${AUTOREV}" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8a331ae7f2..10a2bc4a02 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_gconf ?= "gconf" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" +# we use bluez4 instead of the older bluez3 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" + # Include any package preferred versions and srcrevs: require conf/distro/include/preferred-slugos-versions.inc diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2010.1.conf index 9d84d1b8c8..c60d65ddb8 100644 --- a/conf/distro/jlime-2009.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -1,20 +1,25 @@ #----------------------------------------------------------------------------- #@TYPE: Distribution -#@NAME: Jlime 2009.1 <http://jlime.com> +#@NAME: Jlime 2010.1 <http://www.jlime.com> #@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the # HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c, # Ben Nanonote. +# Unofficial support for Netbook pro, Bsquare Maui. #@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> +#@MAINTAINER: Alex Ferguson <thoughtmonster@gmail.com> +#@MAINTAINER: Filip Zyzniewski <filip.zyzniewski@gmail.com> #----------------------------------------------------------------------------- # # Header # DISTRO_NAME = "Jlime" -DISTRO_VERSION = "2009.1" +DISTRO_VERSION = "2010.1" DISTRO_TYPE = "release" export FEED_URLS_jlime = "http://repository.jlime.com/" +OVERRIDES .= ":jlime" + #<>------------------------------------------------------------------> #<>What we want on the bootstrap image (extra) #<> @@ -26,13 +31,16 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ #<>Our Image files should look abit better. #<> #<>------------------------------------------------------------------< -IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}" +IMAGE_NAME = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}" +SPLASH = "psplash" # # Naming schemes + packages # -INHERIT += "debian package_tar package_ipk src_distribute_local src_distribute" +INHERIT += "debian package_tar package_ipk src_distribute_local" +SRC_DIST_LOCAL ?= "symlink" IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2" +PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl" # # Kernel @@ -56,11 +64,13 @@ PREFERRED_PROVIDER_virtual/gtk+ = "gtk+" PREFERRED_PROVIDER_gconf = "gconf" PREFERRED_PROVIDER_avahi = "avahi" PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static" +PREFERRED_PROVIDER_bluez-libs = "bluez-libs" -PREFERRED_VERSION_gcc = "4.2.2" -PREFERRED_VERSION_gcc-cross = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial = "4.2.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2" +PREFERRED_VERSION_gcc = "4.4.2" +PREFERRED_VERSION_gcc-cross = "4.4.2" +PREFERRED_VERSION_gcc-cross-initial = "4.4.2" +PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2" PREFERRED_VERSION_binutils = "2.18" PREFERRED_VERSION_binutils-cross = "2.18" PREFERRED_VERSION_coreutils-native = "6.0" @@ -78,9 +88,9 @@ TARGET_FPU_mips = "soft" LIBC = "glibc" require conf/distro/include/${LIBC}.inc -PREFERRED_VERSION_linux-libc-headers = "2.6.25" -PREFERRED_VERSION_glibc-initial = "2.6.1" -PREFERRED_VERSION_glibc = "2.6.1" +PREFERRED_VERSION_linux-libc-headers = "2.6.31" +PREFERRED_VERSION_glibc-initial = "2.9" +PREFERRED_VERSION_glibc = "2.9" # # Bootstrap & Init @@ -92,9 +102,17 @@ require conf/distro/include/sane-srcrevs.inc # # Framebuffer & X # -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +require conf/distro/include/preferred-xorg-versions-X11R7.5.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.4.inc +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +PREFERRED_PROVIDER_tslib = "tslib" +PREFERRED_VERSION_mesa = "7.6" +PREFERRED_VERSION_mesa-dri = "7.6" +PREFERRED_VERSION_mesa-xlib = "7.6" +# +# General Userspace +# +require conf/distro/include/preferred-opie-versions-1.2.4.inc +PREFERRED_VERSION_cdparanoia = "10.2" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf deleted file mode 100644 index db964f00bc..0000000000 --- a/conf/distro/jlime-donkey.conf +++ /dev/null @@ -1,139 +0,0 @@ -#@TYPE: Distribution -#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com> -#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series) -#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com> - -DISTRO_NAME = "jlime" -DISTRO_VERSION = "donkey" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" - -#<>-----------------------------------------------------------------> -#<> No uniroot -#<>-----------------------------------------------------------------< -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#<>-----------------------------------------------------------------> -#<> We will set CVS DATE when things are known to work. -#<>-----------------------------------------------------------------< -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc - -#<>-----------------------------------------------------------------> -#<> We want this so we can crosscompile the kernel using gcc 3.4.3 -#<> Also, select version of modules (and kernel) -#<>-----------------------------------------------------------------< -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel" -PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" - - -#<>-----------------------------------------------------------------> -#<>We want kdrive as our default X-Server. -#<>-----------------------------------------------------------------< -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -require conf/distro/include/preferred-xorg-versions-X11R7.3.inc - - -#<>-----------------------------------------------------------------> -#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers -#<>-----------------------------------------------------------------< -PREFERRED_VERSION_binutils = "2.18" -PREFERRED_VERSION_binutils-cross = "2.18" -PREFERRED_VERSION_binutils-cross-sdk = "2.18" -PREFERRED_VERSION_gcc = "4.2.2" -PREFERRED_VERSION_gcc-cross = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial = "4.2.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2" -PREFERRED_VERSION_linux-libc-headers = "2.6.23" -PREFERRED_VERSION_glibc = "2.6.1" -PREFERRED_VERSION_glibc-initial = "2.6.1" - -#<>------------------------------------------------------------------> -#<> -#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. -#<>------------------------------------------------------------------< -#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" - -#<>------------------------------------------------------------------> -#<> -#<>System-critical software with known working versions. -#<>------------------------------------------------------------------< -PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24" -PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_busybox = "1.9.1" - -#<>------------------------------------------------------------------> -#<>Other Specific stuff. -#<> -#<> -#<>We want to be able to build this for all jornadas so -#<>to not mess up the folders we need to make them dynamic. -#<>It will use different folders depending on Arch (set in local.conf) -#<>------------------------------------------------------------------< -SRC_DIST_LOCAL = "copy" -INHERIT += "package_ipk package_tar src_distribute_local" -BBINCLUDELOGS = "yes" -IMAGE_FSTYPES = "tar.bz2" -TARGET_OS = "linux" - - -#<>------------------------------------------------------------------> -#<>What we want on the bootstrap image (extra) -#<> -#<>------------------------------------------------------------------< -DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \ - parted dialog" - - -#<>------------------------------------------------------------------> -#<>What Qte, libqte.. versions should we use. -#<>------------------------------------------------------------------< -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QT = "yes" -OPIE_VERSION = "1.2.3" -require conf/distro/include/preferred-opie-versions-1.2.3.inc - - -#<>------------------------------------------------------------------> -#<> We want pcmciautils, not pcmcia-cs -#<>------------------------------------------------------------------< -PCMCIA_MANAGER = "pcmciautils" - - -#<>------------------------------------------------------------------> -#<> We are using gcc 4.1.1 so lets keep optimizations low -#<>------------------------------------------------------------------< -FULL_OPTIMIZATION = "-O2" - - -#<>------------------------------------------------------------------> -#<>Our Image files should look abit better. -#<> -#<>------------------------------------------------------------------< -IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" - - -#<>------------------------------------------------------------------> -#<> -#<> -#<> General non-essential programs with known working versions -#<> -#<>------------------------------------------------------------------< -PREFERRED_VERSION_tightvnc = "1.3.9" -PREFERRED_VERSION_xmonobut = "0.4" -PREFERRED_VERSION_konqueror-embedded = "20070212" -#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0" -PREFERRED_VERSION_icewm = "1.2.34" -PREFERRED_VERSION_xchat = "1.8.11" -PREFERRED_VERSION_rxvt = "2.6.4" diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf deleted file mode 100644 index 14ea57d18c..0000000000 --- a/conf/distro/jlime-henchman.conf +++ /dev/null @@ -1,104 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Jlime Henchman <jlime.com> -#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the -# NEC Mobile Pro 900/900c handheld pc. -#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com> -#----------------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "Jlime" -DISTRO_VERSION = "Henchman" -#DISTRO_TYPE = "release" -#DISTRO_TYPE = "debug" - -#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed" - -#<>------------------------------------------------------------------> -#<>What we want on the bootstrap image (extra) -#<> -#<>------------------------------------------------------------------< -DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ - console-tools tslib-tests parted dialog" - -#<>------------------------------------------------------------------> -#<>Our Image files should look abit better. -#<> -#<>------------------------------------------------------------------< -IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}" - -# -# Naming schemes -# -INHERIT += "debian" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.bz2" - -# -# Kernel -# -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" - -# -# Binutils & Compiler -# -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_VERSION_gcc = "4.2.2" -PREFERRED_VERSION_gcc-cross = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial = "4.2.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2" -PREFERRED_VERSION_binutils = "2.18" -PREFERRED_VERSION_binutils-cross = "2.18" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "fixed" -TARGET_FPU_armeb = "fixed" - -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc - -PREFERRED_VERSION_linux-libc-headers = "2.6.23" -PREFERRED_VERSION_glibc = "2.5" - -# -# Bootstrap & Init -# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.4.inc - -# -# GPE -# -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -OPIE_VERSION = "1.2.3" -require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf deleted file mode 100644 index 2e6c43462e..0000000000 --- a/conf/distro/jlime-mongo.conf +++ /dev/null @@ -1,105 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Jlime Mongo <jlime.com> -#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the -# HP Jornada 720/728 handheld pc. -#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com> -#----------------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "Jlime" -DISTRO_VERSION = "Mongo" -#DISTRO_TYPE = "release" -#DISTRO_TYPE = "debug" - -export FEED_URLS_jlime = "http://mongo.jlime.com/feed" - -#<>------------------------------------------------------------------> -#<>What we want on the bootstrap image (extra) -#<> -#<>------------------------------------------------------------------< -DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ - console-tools tslib-tests parted dialog" - -#<>------------------------------------------------------------------> -#<>Our Image files should look abit better. -#<> -#<>------------------------------------------------------------------< -IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}" - -# -# Naming schemes -# -INHERIT += "debian" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -INHERIT += "package_tar" -IMAGE_FSTYPES = "tar.bz2" - -# -# Kernel -# -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" - -# -# Binutils & Compiler -# -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_VERSION_gcc = "4.2.2" -PREFERRED_VERSION_gcc-cross = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial = "4.2.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2" -PREFERRED_VERSION_binutils = "2.18" -PREFERRED_VERSION_binutils-cross = "2.18" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" - -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" -PREFERRED_VERSION_glibc = "2.5" - -# -# Bootstrap & Init -# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.4.inc - -# -# GPE -# -require conf/distro/include/preferred-gpe-versions-2.8.inc - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -OPIE_VERSION = "1.2.3" -require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf deleted file mode 100644 index 98844d76a4..0000000000 --- a/conf/distro/jlime-shrek.conf +++ /dev/null @@ -1,54 +0,0 @@ -#@TYPE: Distribution -#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com> -#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series) -#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com> - -DISTRO_NAME = "JLime" -DISTRO_VERSION = "Shrek" -DISTRO_TYPE = "release" - -export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/" - -SRCDATE = "20050518" - -PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc -PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -PREFERRED_VERSION_binutils = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1" -PREFERRED_VERSION_gcc = "3.4.3" -PREFERRED_VERSION_gcc-cross = "3.4.3" -PREFERRED_VERSION_gcc-cross-initial = "3.4.3" -PREFERRED_VERSION_gcc-cross-intermediate = "3.4.3" -PREFERRED_VERSION_linux-libc-headers = "2.6.7.0" -PREFERRED_VERSION_glib-2.0-native = "2.6.2" -PREFERRED_VERSION_glib-2.0 = "2.6.2" -PREFERRED_VERSION_dpkg = "1.10.23" -PREFERRED_VERSION_xserver-kdrive = "20050207" - -INHERIT += "package_tar package_ipk" -BBINCLUDELOGS = "yes" -MODUTILS = "26" -IMAGE_FSTYPES = "tar.bz2" - -BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ -kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \ -kernel-module-airo-cs kernel-module-airo console-tools \ -kernel-module-arlan \ -kernel-module-atmel-cs kernel-module-atmel kernel-module-axnet-cs \ -kernel-module-hermes \ -kernel-module-wavelan kernel-module-wavelan-cs \ -kernel-module-xirc2ps-cs kernel-module-orinoco-cs kernel-module-orinoco \ -kernel-module-nmclan-cs kernel-module-pcnet-cs e2tools e2fsprogs" - -TARGET_OS = "linux" - -OPIE_VERSION = "1.2.1" -require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 4d790f4e1f..ee187ba0c9 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -3,7 +3,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 23-10-2009 +#@VERSION: 11-01-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -59,6 +59,7 @@ CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ " + #Make sure we use 2.6 on machines with a 2.4/2.6 selector KERNEL = "kernel26" MACHINE_KERNEL_VERSION = "2.6" @@ -72,29 +73,13 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers = "2.6.23" +PREFERRED_VERSION_linux-libc-headers = "2.6.31" # see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9 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-kaeilos" - -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" @@ -105,15 +90,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}" @@ -134,75 +124,29 @@ 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" +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" # see recipes/bluez/bluez4*.bb for further dependencies of this setting 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/kaeilos.inc - +ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" +require conf/distro/include/kaeilos.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 angstrom-version ${ANGSTROM_FEED_CONFIGS}" +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" +#PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +#PREFERRED_PROVIDER_xserver ?= "xserver-xorg" # do some task-base stuff here diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 25880dff9d..9885425979 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -62,6 +62,8 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# LIBC ?= "eglibc" PREFERRED_BINUTILS = "2.19.51" +PREFERRED_VERSION_glibc ?= "2.10.1" +PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" require conf/distro/include/sane-toolchain.inc @@ -72,12 +74,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 9594622bed..df727697e2 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -19,3 +19,23 @@ TARGET_FPU_armeb = "soft" LIBC = "uclibc" require conf/distro/minimal.conf + +# NOTE: +# +# We get the DISTRO_FEATURES defined in minimal.conf here but +# however there are some features like mips -mplt support which +# is not supported on uclibc yet so we need to disable that +# feature for uclibc based distributions, therefore we redefine +# the DISTRO_FEATURES for minimal-uclibc and notably leave mplt +# out. Make sure that if there is a new DISTRO_FEATURE thats added +# to minimal.conf will not get included in minimal-uclibc.conf +# it has to be added to the below selection if it should also be +# enabled for minimal-uclibc + +# FEATURE SELECTION +############################################################################# +# We want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" +# Following features are for ARM and E500 based machines +DISTRO_FEATURES += "eabi" + diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 33eceab456..8e0ae2eb34 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -28,6 +28,12 @@ DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pc # Following features are for ARM and E500 based machines DISTRO_FEATURES += "eabi" +# The following feature enables the MIPS ABI PLT extensions +# This feature needs GCC 4.4 binutils 2.19 or glibc/eglibc 2.9 +# or higher + +DISTRO_FEATURES += "mplt" + ############################################################################# # LIBRARY NAMES ############################################################################# @@ -46,10 +52,11 @@ INHERIT += "packaged-staging" # Chose the packaging system INHERIT += "package_ipk" IMAGE_FSTYPES ?= "tar.gz jffs2" - -require conf/distro/include/sane-feed.inc PREFERRED_PKG_FORMAT ?= "ipk" -require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +# Put links to sources in deploy/sources to make it easier for people to be GPL compliant +INHERIT += "src_distribute_local" +SRC_DIST_LOCAL ?= "symlink" # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run IPKG_VARIANT = "opkg-nogpg" @@ -62,6 +69,7 @@ IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-$ CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}" # increase inode/block ratio for ext2 filesystem EXTRA_IMAGECMD_ext2 = "-i 8192" @@ -84,28 +92,16 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gconf = "gconf-dbus" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" - -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-opie-versions-1.2.4.inc -require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc -require conf/distro/include/preferred-xorg-versions-X11R7.4.inc +require conf/distro/include/preferred-xorg-versions-X11R7.5.inc + +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg" ############################################################################# # CONTENTS diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 99cab2bcbb..7ab7b35d20 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -62,12 +62,11 @@ PREFERRED_VERSION_glibc = "2.3.3" PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "1.0.0+git" +PREFERRED_VERSION_mtd-utils = "1.1.0" PREFERRED_VERSION_kismet = "2005-01-R1" -PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_netperf = "2.3" -PREFERRED_PROVIDER_hotplug = "linux-hotplug" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -83,3 +82,8 @@ PREFERRED_VERSION_prism54-firmware = "1.0.3.0" PREFERRED_VERSION_udev = "100" PREFERRED_VERSION_madwifi-modules = "0.9.3" PREFERRED_VERSION_madwifi-tools = "0.9.3" +PREFERRED_VERSION_e2fsprogs-libs = "1.41.8" +PREFERRED_VERSION_dbus = "1.2.1" + +PREFERRED_PROVIDER_hotplug = "linux-hotplug" +PREFERRED_PROVIDER_opkg = "opkg-nogpg" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 2ef04872fb..0e8e272b11 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -54,6 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" +PREFERRED_VERSION_linux-libc-headers = "2.4.18" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" #INHIBIT_PACKAGE_STRIP = "1" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 731f194823..5417f5b06d 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -15,12 +15,9 @@ TOOLCHAIN_BRAND ?= "" #LIBC = "glibc" -require conf/distro/include/preferred-xorg-versions-X11R7.5.inc require conf/distro/include/preferred-shr-versions.inc require conf/distro/include/shr-autorev.inc -include conf/distro/minimal.conf - # # Header # @@ -28,12 +25,14 @@ DISTRO_NAME = "shr" DISTRO_VERSION = "-${DATE}" DISTRO_REVISION = "2" DISTRO_PR = ".4" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE = "release" +#DISTRO_TYPE = "debug" DISTRO = "shr" +DISTRO_SSH_DAEMON = "openssh" +DISTRO_APM = "fso-apm" + #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales @@ -47,6 +46,9 @@ INHERIT += "angstrom" 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" +ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" +ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script" +ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script" CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" @@ -74,25 +76,6 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" -PREFERRED_PROVIDER_gconf = "gconf" -PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" -PREFERRED_PROVIDER_gpsd = "fso-gpsd" -PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" -PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_libfribidi = "fribidi" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_PROVIDER_virtual/gail = "gtk+" -PREFERRED_PROVIDER_opkg = "opkg" -PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" -PREFERRED_PROVIDER_atd = "atd-over-fso" -PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" - # Helper to say what image we built SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;" @@ -107,3 +90,118 @@ EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu" #Illume settings ILLUME_CONFIG = "e-wm-config-illume-shr" ILLUME_THEME = "e-wm-theme-illume-gry" + +# From minimal.conf + +############################################################################# +# FEATURE SELECTION +############################################################################# +# Use bluetooth 4.0 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +# We want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" +# Following features are for ARM and E500 based machines +DISTRO_FEATURES += "eabi" + +############################################################################# +# LIBRARY NAMES +############################################################################# +# libfoo -> libfoo0-2 (etc) +INHERIT += "debian" + +############################################################################# +# STAGING AREA +############################################################################# +# Controlled by packaging system +INHERIT += "packaged-staging" + +############################################################################# +# PACKAGING & FEEDS +############################################################################# +# Chose the packaging system +INHERIT += "package_ipk" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +require conf/distro/include/sane-feed.inc +PREFERRED_PKG_FORMAT ?= "ipk" +require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + +# increase inode/block ratio for ext2 filesystem +EXTRA_IMAGECMD_ext2 = "-i 8192" + +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +############################################################################# +# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# +# TOOLCHAIN +############################################################################# +LIBC ?= "eglibc" +require conf/distro/include/sane-toolchain.inc + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_gpsd = "fso-gpsd" +PREFERRED_PROVIDER_atd = "atd-over-fso" +PREFERRED_PROVIDER_opkg = "opkg" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc +require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-opie-versions-1.2.4.inc +#Use newest available (X11R7.5 now) +#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc + +############################################################################# +# CONTENTS +############################################################################# + +# Ship extra debug utils in the rootfs when doing a debug build +DISTRO_EXTRA_APPS ?= "" +DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' + +# Additional content I (only valid if you include task-base) +# distro-feed-configs: configuration files for the online feeds +# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken +# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink +DISTRO_EXTRA_RDEPENDS += "\ + distro-feed-configs \ + util-linux-ng-mount util-linux-ng-umount \ + angstrom-libc-fixup-hack \ + ${DISTRO_EXTRA_APPS} \ +" + +# Additional content II (can be masked with BAD_RECOMMENDATIONS) +DISTRO_EXTRA_RRECOMMENDS += " \ + kernel-module-vfat \ + kernel-module-ext2 \ + kernel-module-ext3 \ + kernel-module-af-packet \ + openssh-sftp-server \ +" + +# avahi-daemon \ +# avahi-autoipd \ diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index d82be5d2b5..d9b00f41a8 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -12,7 +12,8 @@ DISTRO_TYPE = "alpha" TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-gnueabi" -IPKG_VARIANT ?= "opkg-nogpg-nocurl" +IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos" +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos" IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc |