From 72906f5da46e7f53070fba999457b9affb76e696 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Aug 2006 16:13:31 +0000 Subject: conf/distro: Sync with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@652 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/angstrom-2006.9.conf | 126 ------------- meta/conf/distro/angstrom-2007.1.conf | 176 +++++++++++++++++ meta/conf/distro/angstrom.conf | 45 ----- meta/conf/distro/familiar-unstable.conf | 26 +-- meta/conf/distro/familiar.conf | 17 -- meta/conf/distro/include/angstrom.inc | 48 +++++ meta/conf/distro/include/familar.inc | 17 ++ meta/conf/distro/include/maemo-preferred.inc | 10 + meta/conf/distro/include/openzaurus.inc | 22 +++ meta/conf/distro/include/poky-eabi.inc | 23 +++ meta/conf/distro/include/poky-eabi2.inc | 20 ++ meta/conf/distro/include/poky-oabi.inc | 11 ++ meta/conf/distro/include/preferred-e-versions.inc | 33 ++++ .../distro/include/preferred-gpe-versions-2.7.inc | 98 ++++++++++ .../distro/include/preferred-opie-versions.inc | 209 +++++++++++++++++++++ meta/conf/distro/include/sane-srcdates.inc | 85 +++++++++ meta/conf/distro/maemo-1.0.conf | 12 +- meta/conf/distro/maemo-preferred.inc | 10 - meta/conf/distro/openzaurus-unstable.conf | 28 +-- meta/conf/distro/openzaurus.conf | 18 -- meta/conf/distro/poky-eabi.conf | 23 --- meta/conf/distro/poky-eabi2.conf | 20 -- meta/conf/distro/poky-oabi.conf | 11 -- meta/conf/distro/poky.conf | 2 +- meta/conf/distro/preferred-e-versions.inc | 33 ---- meta/conf/distro/preferred-gpe-versions-2.7.inc | 96 ---------- meta/conf/distro/preferred-opie-versions.inc | 206 -------------------- 27 files changed, 790 insertions(+), 635 deletions(-) delete mode 100644 meta/conf/distro/angstrom-2006.9.conf create mode 100644 meta/conf/distro/angstrom-2007.1.conf delete mode 100644 meta/conf/distro/angstrom.conf delete mode 100644 meta/conf/distro/familiar.conf create mode 100644 meta/conf/distro/include/angstrom.inc create mode 100644 meta/conf/distro/include/familar.inc create mode 100644 meta/conf/distro/include/maemo-preferred.inc create mode 100644 meta/conf/distro/include/openzaurus.inc create mode 100644 meta/conf/distro/include/poky-eabi.inc create mode 100644 meta/conf/distro/include/poky-eabi2.inc create mode 100644 meta/conf/distro/include/poky-oabi.inc create mode 100644 meta/conf/distro/include/preferred-e-versions.inc create mode 100644 meta/conf/distro/include/preferred-gpe-versions-2.7.inc create mode 100644 meta/conf/distro/include/preferred-opie-versions.inc create mode 100644 meta/conf/distro/include/sane-srcdates.inc delete mode 100644 meta/conf/distro/maemo-preferred.inc delete mode 100644 meta/conf/distro/openzaurus.conf delete mode 100644 meta/conf/distro/poky-eabi.conf delete mode 100644 meta/conf/distro/poky-eabi2.conf delete mode 100644 meta/conf/distro/poky-oabi.conf delete mode 100644 meta/conf/distro/preferred-e-versions.inc delete mode 100644 meta/conf/distro/preferred-gpe-versions-2.7.inc delete mode 100644 meta/conf/distro/preferred-opie-versions.inc (limited to 'meta/conf') diff --git a/meta/conf/distro/angstrom-2006.9.conf b/meta/conf/distro/angstrom-2006.9.conf deleted file mode 100644 index 5c1ed1296..000000000 --- a/meta/conf/distro/angstrom-2006.9.conf +++ /dev/null @@ -1,126 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi -#@MAINTAINER: Michael 'Mickey' Lauer -#@-------------------------------------------------------------------- - -#DISTRO_VERSION = "2006.9" -DISTRO_VERSION = "test-${DATE}" - -include conf/distro/angstrom.conf - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" -#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - - -FEED_URIS += " \ - base##${ANGSTROM_URI}/unstable/feed/base/" -# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ -# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ -# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" - -SRCDATE = "20060518" -#SRCDATE_handhelds-pxa-2.6 = "20060516" - -CVS_TARBALL_STASH = "\ -http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" - -# Opie -#use 1337 mt version of opie to have a webbrowser -PALMTOP_USE_MULTITHREADED_QT = "yes" -QTE_VERSION = "2.3.10" -OPIE_VERSION = "1.2.2" -include conf/distro/preferred-opie-versions.inc - -# GPE -include conf/distro/preferred-gpe-versions-2.8.inc - -#zap extra stuff taking place in $MACHINE.conf -GPE_EXTRA_INSTALL = "" - -# E -include conf/distro/preferred-e-versions.inc - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" - - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -ZKERNEL_VERSION = "2.6" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -#EABI stuff -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - - -#use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.16.91.0.7" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" - -# To use an EABI compatible version 3 series gcc, either uncomment -# the lines below or set them in local.conf: -# -# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" - - -PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" -PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.61" -PREFERRED_VERSION_gstreamer ?= "0.10.6" - -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" -PREFERRED_VERSION_hostap-modules ?= "0.4.7" - -#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad - -#### Bootstrap options #### - -PCMCIA_MANAGER_c7x0 = "pcmciautils" -PCMCIA_MANAGER_akita = "pcmciautils" -PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_nokia770 = "pcmciautils" -PCMCIA_MANAGER_h2200 = "pcmciautils" -PCMCIA_MANAGER_h6300 = "pcmciautils" -PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" - - - -#### GPE section ### - -#Install libgtkinput in devices without a keyboard -GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" -GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" -GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" - -#As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" - - diff --git a/meta/conf/distro/angstrom-2007.1.conf b/meta/conf/distro/angstrom-2007.1.conf new file mode 100644 index 000000000..327d4123c --- /dev/null +++ b/meta/conf/distro/angstrom-2007.1.conf @@ -0,0 +1,176 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi +#@MAINTAINER: Michael 'Mickey' Lauer +#@-------------------------------------------------------------------- + +#DISTRO_VERSION = "2006.9" +DISTRO_VERSION = "test-${DATE}" + +require conf/distro/include/angstrom.inc +require conf/distro/include/sane-srcdates.inc + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" +#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! + + +FEED_URIS += " \ + base##${ANGSTROM_URI}/unstable/feed/base \ + perl##${ANGSTROM_URI}/unstable/feed/perl \ + python##${ANGSTROM_URI}/unstable/feed/python \ + debug##${ANGSTROM_URI}/unstable/feed/debug \ + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" +# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ +# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ +# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + +#SRCDATE = "20060630" +#SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" +SRCDATE_gnome-vfs-dbus = "20060803" + +PREFERRED_VERSION_qemu-native = "0.8.2" + +CVS_TARBALL_STASH = "\ +http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ +http://www.oesources.org/source/current/" + +# Opie +#use 1337 mt version of opie to have a webbrowser +PALMTOP_USE_MULTITHREADED_QT = "yes" +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +require conf/distro/include/preferred-opie-versions.inc + +# GPE +require conf/distro/include/preferred-gpe-versions-2.8.inc + +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + +PREFERRED_VERSION_fontconfig = "2.3.95" +PREFERRED_VERSION_freetype = "2.2.1" + +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" + +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" + +#zap extra stuff taking place in $MACHINE.conf +GPE_EXTRA_INSTALL = "" + + +# E +require conf/distro/include/preferred-e-versions.inc + +#Make sure we use 2.6 on machines with a 2.4/2.6 selector +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Libc/uclibc: +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libiconv ?= glibc +PREFERRED_PROVIDER_virtual/libintl ?= glibc + +# Virtuals: +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive + +# Others: +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_gconf ?= gconf-dbus +PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs +PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp = "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" + +#EABI stuff +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + + +#use EABI toolchain +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.17" +PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" + +# To use an EABI compatible version 3 series gcc, either uncomment +# the lines below or set them in local.conf: +# +# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" +# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" + + +# Busybox <1.1.0 doesn't have EABI support +PREFERRED_VERSION_busybox = "1.2.1" + +PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" +PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" +PREFERRED_VERSION_dbus ?= "0.92" +PREFERRED_VERSION_gstreamer ?= "0.10.6" + +PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" +PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" +PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" +PREFERRED_VERSION_hostap-modules ?= "0.4.7" + +#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff +# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad + +#### Bootstrap options #### + +PCMCIA_MANAGER_c7x0 = "pcmciautils" +PCMCIA_MANAGER_akita = "pcmciautils" +PCMCIA_MANAGER_spitz = "pcmciautils" +PCMCIA_MANAGER_tosa = "pcmciautils" +PCMCIA_MANAGER_poodle = "pcmciautils" +PCMCIA_MANAGER_nokia770 = "pcmciautils" +PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" +PCMCIA_MANAGER_h6300 = "pcmciautils" +PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" + +# add altboot to compatible models, will be replaced with angstrom-bootmanager +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" + +### GPE section ### + +#Install libgtkinput in devices without a keyboard +GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" +GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" +GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" + +#As soon as a kill switch is in place we can add it to devices with a keyboard +#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" +#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" +#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" +#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" + + diff --git a/meta/conf/distro/angstrom.conf b/meta/conf/distro/angstrom.conf deleted file mode 100644 index 100017410..000000000 --- a/meta/conf/distro/angstrom.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: Distribution configuration for Angstrom - -DISTRO = "angstrom" -DISTRO_NAME = "Angstrom" - -#Use this variable in feeds and other parts that need a URI -ANGSTROM_URI = "http://www.angstrom-distribution.org/" - -#Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers " - -#use ipkg package format with debian style naming -#use multimachine buildrules -INHERIT += "package_ipk debian multimachine" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "" - - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" - -#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 -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" - -#ARM EABI is softfloat by default, but let's make sure :) -TARGET_FPU_arm = "soft" - -#Always ship these packages -BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit" -BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" - -#Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} - -# Angstrom *always* has some form of release config, so error out if someone thinks he knows better -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/meta/conf/distro/familiar-unstable.conf b/meta/conf/distro/familiar-unstable.conf index e42456672..6ae4e9ddc 100644 --- a/meta/conf/distro/familiar-unstable.conf +++ b/meta/conf/distro/familiar-unstable.conf @@ -1,15 +1,13 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" -# Do not touch this file before notifying familiar-dev@handhelds.org -include conf/distro/familiar.conf +require conf/distro/include/familiar.inc DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ @@ -25,8 +23,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libiconv=glibc -PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_VERSION_hostap-modules ?= "0.3.9" @@ -37,7 +35,6 @@ PREFERRED_VERSION_orinoco-modules ?= "0.13e" PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15" PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" - # The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault @@ -51,6 +48,14 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" + +# +# Base +# +PREFERRED_PROVIDER_hostap-conf = "hostap-conf" +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +require conf/distro/include/sane-srcdates.inc + # # Opie # @@ -58,7 +63,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1" OPIE_VERSION = "1.2.2" QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" -include conf/distro/preferred-opie-versions.inc +require conf/distro/include/preferred-opie-versions.inc # # GPE @@ -66,12 +71,11 @@ include conf/distro/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" - -include conf/distro/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +require conf/distro/include/preferred-gpe-versions-2.8.inc # # E # -include conf/distro/preferred-e-versions.inc +require conf/distro/include/preferred-e-versions.inc diff --git a/meta/conf/distro/familiar.conf b/meta/conf/distro/familiar.conf deleted file mode 100644 index 2646fe78a..000000000 --- a/meta/conf/distro/familiar.conf +++ /dev/null @@ -1,17 +0,0 @@ -#@TYPE: Distribution -#@NAME: Familiar Linux -#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) - -MAINTAINER ?= "Familiar Developers " - -INHERIT += "package_ipk debian multimachine" -TARGET_OS = "linux" - -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" - -ENABLE_BINARY_LOCALE_GENERATION ?= "1" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/meta/conf/distro/include/angstrom.inc b/meta/conf/distro/include/angstrom.inc new file mode 100644 index 000000000..7e765bd92 --- /dev/null +++ b/meta/conf/distro/include/angstrom.inc @@ -0,0 +1,48 @@ +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: Distribution configuration for Angstrom + +DISTRO = "angstrom" +DISTRO_NAME = "Angstrom" + +#Use this variable in feeds and other parts that need a URI +ANGSTROM_URI = "http://www.angstrom-distribution.org" + +#Set the default maintainer to angstrom-dev +MAINTAINER = "Angstrom Developers " + +#use ipkg package format with debian style naming +#use multimachine buildrules +INHERIT += "package_ipk debian multimachine" + +#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" + + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +#if you want to build using uclibc, specify "-uclibcgnueabi" +TARGET_VENDOR = "-angstrom" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +#uclibc (needs gcc 4.1.1 or newer) +#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" + +#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 +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" +CXXFLAGS += "-fvisibility-inlines-hidden" + +#ARM EABI is softfloat by default, but let's make sure :) +TARGET_FPU_arm = "soft" + +#Always ship these packages +BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" + +#Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" +DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} + +# Angstrom *always* has some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/meta/conf/distro/include/familar.inc b/meta/conf/distro/include/familar.inc new file mode 100644 index 000000000..2646fe78a --- /dev/null +++ b/meta/conf/distro/include/familar.inc @@ -0,0 +1,17 @@ +#@TYPE: Distribution +#@NAME: Familiar Linux +#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) + +MAINTAINER ?= "Familiar Developers " + +INHERIT += "package_ipk debian multimachine" +TARGET_OS = "linux" + +BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" + +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +PARALLEL_INSTALL_MODULES = "1" +UDEV_DEVFS_RULES = "1" + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/meta/conf/distro/include/maemo-preferred.inc b/meta/conf/distro/include/maemo-preferred.inc new file mode 100644 index 000000000..943f24432 --- /dev/null +++ b/meta/conf/distro/include/maemo-preferred.inc @@ -0,0 +1,10 @@ +PREFERRED_PROVIDER_gconf = "gconf-osso" +PREFERRED_PROVIDER_tslib = "tslib-maemo" +PREFERRED_VERSION_dbus = "0.23.1-osso5" +PREFERRED_VERSION_audiofile = "0.2.6-3osso4" +PREFERRED_PROVIDER_esd = "osso-esd" +PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7" +PREFERRED_VERSION_glib-2.0 = "2.6.4" +PREFERRED_VERSION_pango = "1.8.1" +PREFERRED_VERSION_atk = "1.9.0" +PREFERRED_VERSION_diet-x11 ?= "6.2.1" \ No newline at end of file diff --git a/meta/conf/distro/include/openzaurus.inc b/meta/conf/distro/include/openzaurus.inc new file mode 100644 index 000000000..264cceecf --- /dev/null +++ b/meta/conf/distro/include/openzaurus.inc @@ -0,0 +1,22 @@ +#@TYPE: Distribution +#@NAME: OpenZaurus +#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) + +DISTRO = "openzaurus" +DISTRO_NAME = "OpenZaurus" + +INHERIT += " package_ipk debian multimachine" +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +TARGET_OS = "linux" +TARGET_FPU = "soft" + +BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" + +PARALLEL_INSTALL_MODULES = "1" + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +# Set minimal version of BitBake needed +BB_MIN_VERSION = "1.4.4" +INHERIT += "sanity" diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc new file mode 100644 index 000000000..d35ec8e44 --- /dev/null +++ b/meta/conf/distro/include/poky-eabi.inc @@ -0,0 +1,23 @@ +# +# Poky configuration to use EABI +# + +PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3" +#PREFERRED_VERSION_gcc ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" +PREFERRED_VERSION_binutils ?= "2.16.91.0.7" +PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +TARGET_VENDOR = "${@['','-poky'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" \ No newline at end of file diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc new file mode 100644 index 000000000..2833f3090 --- /dev/null +++ b/meta/conf/distro/include/poky-eabi2.inc @@ -0,0 +1,20 @@ +# +# Poky configuration to use EABI +# + +PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.16.91.0.7" +PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +TARGET_VENDOR = "${@['','-poky'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" \ No newline at end of file diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc new file mode 100644 index 000000000..71d609201 --- /dev/null +++ b/meta/conf/distro/include/poky-oabi.inc @@ -0,0 +1,11 @@ +# +# Poky configuration to use its Original ABI +# +PREFERRED_VERSION_binutils ?= "2.16" +PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" +PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" \ No newline at end of file diff --git a/meta/conf/distro/include/preferred-e-versions.inc b/meta/conf/distro/include/preferred-e-versions.inc new file mode 100644 index 000000000..607acad85 --- /dev/null +++ b/meta/conf/distro/include/preferred-e-versions.inc @@ -0,0 +1,33 @@ +# +# Specify which versions of E-related libraries and applications to build +# + +#PREFERRED_VERSION_e = "0.16.999.025" +#PREFERRED_VERSION_ecore-x11 = "0.9.9.025" +#PREFERRED_VERSION_ecore-native = "0.9.9.025" +#PREFERRED_VERSION_edb = "1.0.5.006" +#PREFERRED_VERSION_edb-native = "1.0.5.006" +#PREFERRED_VERSION_edje = "0.5.0.025" +#PREFERRED_VERSION_edje-native = "0.5.0.025" +#PREFERRED_VERSION_eet = "0.9.10.025" +#PREFERRED_VERSION_eet-native = "0.9.10.025" +#PREFERRED_VERSION_embryo = "0.9.1.025" +#PREFERRED_VERSION_embryo-native = "0.9.1.025" +#PREFERRED_VERSION_emotion = "0.0.1.004" +#PREFERRED_VERSION_emotion-native = "0.0.1.004" +#PREFERRED_VERSION_epeg = "0.9.0.006" +#PREFERRED_VERSION_epsilon = "0.3.0.006" +#PREFERRED_VERSION_esmart-x11 = "0.9.0.006" +#PREFERRED_VERSION_evas-x11 = "0.9.9.025" +#PREFERRED_VERSION_evas-native = "0.9.9.025" +#PREFERRED_VERSION_ewl = "0.0.4.006" +#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011" +#PREFERRED_VERSION_imlib2-native = "1.2.1.011" +#PREFERRED_VERSION_e-wm = "0.16.999.025" +#PREFERRED_VERSION_entrance = "0.9.0.006" + +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" + diff --git a/meta/conf/distro/include/preferred-gpe-versions-2.7.inc b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc new file mode 100644 index 000000000..36702025c --- /dev/null +++ b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -0,0 +1,98 @@ +# +# Specify which versions of GPE (and related) applications to build +# + +#work around some breakages +#SRCDATE_minimo=20050401 + +#set some preferred providers: +PREFERRED_PROVIDER_gconf=gconf-dbus +PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus + +#specify versions, as the header says :) +PREFERRED_VERSION_libmatchbox ?= "1.7" +PREFERRED_VERSION_matchbox ?= "0.9.1" +PREFERRED_VERSION_matchbox-common ?= "0.9.1" +PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" +PREFERRED_VERSION_matchbox-panel ?= "0.9.2" +PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" +PREFERRED_VERSION_atk ?= "1.9.0" +PREFERRED_VERSION_cairo ?= "0.5.2" +PREFERRED_VERSION_glib-2.0 ?= "2.6.4" +PREFERRED_VERSION_gtk+ ?= "2.6.10" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" +PREFERRED_VERSION_pango ?= "1.8.1" +PREFERRED_VERSION_librsvg ?= "2.6.5" +PREFERRED_VERSION_libgpewidget ?= "0.109" +PREFERRED_VERSION_libgpepimc ?= "0.5" +PREFERRED_VERSION_libgpevtype ?= "0.14" +PREFERRED_VERSION_libschedule ?= "0.15" +PREFERRED_VERSION_libcontactsdb ?= "0.3" +PREFERRED_VERSION_libtododb ?= "0.09" +PREFERRED_VERSION_gpe-icons ?= "0.25" +PREFERRED_VERSION_libgsm ?= "1.0.10" +PREFERRED_VERSION_diet-x11 ?= "6.2.1" +PREFERRED_VERSION_xproto ?= "6.6.2" +PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" +PREFERRED_VERSION_rxvt-unicode ?= "5.6" +PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" +PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_PROVIDER_xextensions = "xextensions" +PREFERRED_VERSION_xextensions ?= "1.0.1" +PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_gpe-login ?= "0.83" +PREFERRED_VERSION_gpe-session-scripts ?= "0.66" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" +PREFERRED_VERSION_gpe-todo ?= "0.55" +PREFERRED_VERSION_gpe-calendar ?= "0.70" +PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" +PREFERRED_VERSION_gpe-contacts ?= "0.43" +PREFERRED_VERSION_gpe-today ?= "0.10" +PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" +PREFERRED_VERSION_dbus ?= "0.23.4" +PREFERRED_VERSION_gpe-beam ?= "0.2.8" +PREFERRED_VERSION_gpe-bluetooth ?= "0.51" +PREFERRED_VERSION_gpe-su ?= "0.19" +PREFERRED_VERSION_gpe-conf ?= "0.1.29" +PREFERRED_VERSION_gpe-clock ?= "0.23" +PREFERRED_VERSION_gpe-mininet ?= "0.7" +PREFERRED_VERSION_gpe-mixer ?= "0.42" +PREFERRED_VERSION_gpe-shield ?= "0.8" +PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" +PREFERRED_VERSION_gpe-taskmanager ?= "0.19" +PREFERRED_VERSION_keylaunch ?= "2.0.7" +PREFERRED_VERSION_minilite ?= "0.49" +PREFERRED_VERSION_xmonobut ?= "0.4" +PREFERRED_VERSION_gpe-edit ?= "0.29" +PREFERRED_VERSION_gpe-gallery ?= "0.96" +PREFERRED_VERSION_gpe-calculator ?= "0.2" +PREFERRED_VERSION_gpe-package ?= "0.3" +PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" +PREFERRED_VERSION_gpe-terminal ?= "1.1" +PREFERRED_VERSION_gpe-watch ?= "0.10" +PREFERRED_VERSION_gpe-what ?= "0.42" +PREFERRED_VERSION_gpe-filemanager ?= "0.23" +PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-irc ?= "0.07" +PREFERRED_VERSION_gpe-lights ?= "0.13" +#PREFERRED_VERSION_gpe-nmf ?= "0.21" +PREFERRED_VERSION_gpe-othello ?= "0.2-1" +PREFERRED_VERSION_gpe-plucker ?= "0.2" +PREFERRED_VERSION_gpe-tetris ?= "0.6-4" +PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" +PREFERRED_VERSION_xdemineur ?= "2.1.1" +PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_dillo2 ?= "0.6.6" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" +PREFERRED_VERSION_linphone ?= "0.12.2" +PREFERRED_VERSION_firefox ?= "1.0" +PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" +PREFERRED_VERSION_poppler ?= "0.3.3" +PREFERRED_VERSION_evince ?= "0.3.2" +PREFERRED_VERSION_gpe_mini_browser ?= "0.19" diff --git a/meta/conf/distro/include/preferred-opie-versions.inc b/meta/conf/distro/include/preferred-opie-versions.inc new file mode 100644 index 000000000..34c1fd498 --- /dev/null +++ b/meta/conf/distro/include/preferred-opie-versions.inc @@ -0,0 +1,209 @@ +# +# Default versions +QTE_VERSION ?= "2.3.10" +OPIE_VERSION ?= "1.2.2" +PALMTOP_USE_MULTITHREADED_QT ?= "yes" + +# +# +# Opie libraries +# +PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' +PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" +PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" +PREFERRED_VERSION_qte = "${QTE_VERSION}" +PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" +PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" +PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" +PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" +PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" +PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" +# +# Opie applications +# +PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-console = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-go = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-language = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-login = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-search = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-security = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-write = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" +PREFERRED_VERSION_konqueror-embedded = "20060404" diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc new file mode 100644 index 000000000..0696ad190 --- /dev/null +++ b/meta/conf/distro/include/sane-srcdates.inc @@ -0,0 +1,85 @@ +# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version + +# Kernel modules +SRCDATE_at76c503a-modules ?= "20060814" +SRCDATE_prism54-module ?= "20060814" + +# X11 libs, extentions and protos +SRCDATE_xcalibrate ?= "20060804" +SRCDATE_compositeext ?= "20060814" +SRCDATE_drm ?= "20060814" +SRCDATE_drm-kernel ?= "20060814" +SRCDATE_fixesext ?= "20060814" +SRCDATE_libxext-native ?= "20060814" +SRCDATE_libxss ?= "20060814" +SRCDATE_recordext ?= "20060814" +SRCDATE_renderext ?= "20060814" +SRCDATE_xcalibrate ?= "20060814" +SRCDATE_xcalibrateext ?= "20060814" +SRCDATE_xxf86dgaext ?= "20060814" +SRCDATE_xxf86vmext ?= "20060814" + +# Matchbox / O-hand +SRCDATE_contacts ?= "20060707" +SRCDATE_dates ?= "20060707" +SRCDATE_web ?= "20060613" +SRCDATE_eds-dbus ?= "20060707" +SRCDATE_matchbox-common ?= "20060612" +SRCDATE_matchbox-config-gtk ?= "20060612" +SRCDATE_matchbox-desktop ?= "20060612" +SRCDATE_matchbox-keyboard ?= "20060612" +SRCDATE_matchbox-panel ?= "20060612" +SRCDATE_matchbox-panel-manager ?= "20060612" +SRCDATE_matchbox-stroke ?= "20060612" +SRCDATE_matchbox-themes-extra ?= "20060612" +SRCDATE_matchbox-wm ?= "20060612" +SRCDATE_libmatchbox ?= "20060612" +SRCDATE_libfakekey ?= "20051101" +SRCDATE_zaurusd ?= "20060628" + +# GPE +SRCDATE_dasher-gpe ?= "20060814" +SRCDATE_rosetta ?= "20060804" + +# GNOME +SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gtkhtml2 ?= "20060323" + +#Misc apps, sorted by alphabet +SRCDATE_avetanabt ?= "20060814" +SRCDATE_bl ?= "20060814" +SRCDATE_dvbstream ?= "20060814" +SRCDATE_dvbtraffic ?= "20060814" +SRCDATE_dvbtune ?= "20060814" +SRCDATE_fdclock ?= "20060814" +SRCDATE_fltk ?= "20060814" +SRCDATE_ipkg-link ?= "20050930" +SRCDATE_ipkg-link-1 ?= "20050930" +SRCDATE_ipkg-utils ?= "20050930" +SRCDATE_ipkg-utils-native ?= "20050930" +SRCDATE_kaffe-qt ?= "20060814" +SRCDATE_kbdd ?= "20060814" +SRCDATE_led ?= "20060814" +SRCDATE_linux-input ?= "20060814" +SRCDATE_madwifi-modules ?= "20060814" +SRCDATE_mileage ?= "20060814" +SRCDATE_minimo ?= "20050401" +SRCDATE_mystun-server ?= "20060814" +SRCDATE_olsrd ?= "20060814" +SRCDATE_opencvs ?= "20060814" +SRCDATE_oprofile ?= "20060214" +SRCDATE_portaudio ?= "20060814" +SRCDATE_putty ?= "20060814" +SRCDATE_python-cairo ?= "20060814" +SRCDATE_qemu-native ?= "20060723" +SRCDATE_roadster ?= "20060814" +SRCDATE_sctzap ?= "20060814" +SRCDATE_tslib ?= "20051101" +SRCDATE_waimea ?= "20060814" +SRCDATE_xcompmgr ?= "20060814" +SRCDATE_xirssi ?= "20060814" +SRCDATE_xsvg ?= "20060814" +SRCDATE_yamonenv ?= "20060814" +SRCDATE_zroadmap ?= "20060814" + diff --git a/meta/conf/distro/maemo-1.0.conf b/meta/conf/distro/maemo-1.0.conf index d30ecc908..b8592fdf6 100644 --- a/meta/conf/distro/maemo-1.0.conf +++ b/meta/conf/distro/maemo-1.0.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +require conf/distro/include/familiar.inc DISTRO = "maemo" DISTRO_NAME = "Maemo Linux" @@ -8,9 +8,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" - + " #SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -29,12 +27,12 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -include conf/distro/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions.inc # # Maemo # -include conf/distro/maemo-preferred.inc +require conf/distro/include/maemo-preferred.inc diff --git a/meta/conf/distro/maemo-preferred.inc b/meta/conf/distro/maemo-preferred.inc deleted file mode 100644 index 943f24432..000000000 --- a/meta/conf/distro/maemo-preferred.inc +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_gconf = "gconf-osso" -PREFERRED_PROVIDER_tslib = "tslib-maemo" -PREFERRED_VERSION_dbus = "0.23.1-osso5" -PREFERRED_VERSION_audiofile = "0.2.6-3osso4" -PREFERRED_PROVIDER_esd = "osso-esd" -PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7" -PREFERRED_VERSION_glib-2.0 = "2.6.4" -PREFERRED_VERSION_pango = "1.8.1" -PREFERRED_VERSION_atk = "1.9.0" -PREFERRED_VERSION_diet-x11 ?= "6.2.1" \ No newline at end of file diff --git a/meta/conf/distro/openzaurus-unstable.conf b/meta/conf/distro/openzaurus-unstable.conf index 9f79c3211..43492944f 100644 --- a/meta/conf/distro/openzaurus-unstable.conf +++ b/meta/conf/distro/openzaurus-unstable.conf @@ -11,7 +11,8 @@ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/s http://www.oesources.org/source/current/" -include conf/distro/openzaurus.conf +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/openzaurus.inc DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" @@ -25,20 +26,22 @@ DISTRO_TYPE = "debug" # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" -SRCDATE = "20060514" +SRCDATE ?= "20060701" + # # Zaurus # - ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDER_hostap-conf = "hostap-conf" +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_tslib ?= tslib KERNEL_CONSOLE = "ttyS0" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" -# fix some iconv issues, needs to be adjusted when doing uclibc builds +# Glibc provides iconv and intl -- adjust, when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" @@ -49,23 +52,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" + # # Opie # -#QTE_VERSION = "2.3.10" -#OPIE_VERSION = "1.2.2" -#PALMTOP_USE_MULTITHREADED_QT = "yes" -include conf/distro/preferred-opie-versions.inc +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +PALMTOP_USE_MULTITHREADED_QT = "yes" +require conf/distro/include/preferred-opie-versions.inc # # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" -include conf/distro/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +require conf/distro/include/preferred-gpe-versions-2.8.inc # # E # -include conf/distro/preferred-e-versions.inc +require conf/distro/include/preferred-e-versions.inc diff --git a/meta/conf/distro/openzaurus.conf b/meta/conf/distro/openzaurus.conf deleted file mode 100644 index b7f456320..000000000 --- a/meta/conf/distro/openzaurus.conf +++ /dev/null @@ -1,18 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenZaurus -#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) - -DISTRO = "openzaurus" -DISTRO_NAME = "OpenZaurus" - -INHERIT += " package_ipk debian multimachine" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -TARGET_OS = "linux" -TARGET_FPU = "soft" - -BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" - -PARALLEL_INSTALL_MODULES = "1" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/meta/conf/distro/poky-eabi.conf b/meta/conf/distro/poky-eabi.conf deleted file mode 100644 index d35ec8e44..000000000 --- a/meta/conf/distro/poky-eabi.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Poky configuration to use EABI -# - -PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - -PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" -PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3" -#PREFERRED_VERSION_gcc ?= "4.1.0" -#PREFERRED_VERSION_gcc-cross ?= "4.1.0" -#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" -PREFERRED_VERSION_binutils ?= "2.16.91.0.7" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -TARGET_VENDOR = "${@['','-poky'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" \ No newline at end of file diff --git a/meta/conf/distro/poky-eabi2.conf b/meta/conf/distro/poky-eabi2.conf deleted file mode 100644 index 2833f3090..000000000 --- a/meta/conf/distro/poky-eabi2.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# Poky configuration to use EABI -# - -PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.16.91.0.7" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -TARGET_VENDOR = "${@['','-poky'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" \ No newline at end of file diff --git a/meta/conf/distro/poky-oabi.conf b/meta/conf/distro/poky-oabi.conf deleted file mode 100644 index 71d609201..000000000 --- a/meta/conf/distro/poky-oabi.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Poky configuration to use its Original ABI -# -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" \ No newline at end of file diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index f461c5619..c32631471 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -37,7 +37,7 @@ KERNEL_CONSOLE = "ttyS0" POKYMODE ?= "oabi" -include conf/distro/poky-${POKYMODE}.conf +require conf/distro/include/poky-${POKYMODE}.inc # # Preferred providers: diff --git a/meta/conf/distro/preferred-e-versions.inc b/meta/conf/distro/preferred-e-versions.inc deleted file mode 100644 index 607acad85..000000000 --- a/meta/conf/distro/preferred-e-versions.inc +++ /dev/null @@ -1,33 +0,0 @@ -# -# Specify which versions of E-related libraries and applications to build -# - -#PREFERRED_VERSION_e = "0.16.999.025" -#PREFERRED_VERSION_ecore-x11 = "0.9.9.025" -#PREFERRED_VERSION_ecore-native = "0.9.9.025" -#PREFERRED_VERSION_edb = "1.0.5.006" -#PREFERRED_VERSION_edb-native = "1.0.5.006" -#PREFERRED_VERSION_edje = "0.5.0.025" -#PREFERRED_VERSION_edje-native = "0.5.0.025" -#PREFERRED_VERSION_eet = "0.9.10.025" -#PREFERRED_VERSION_eet-native = "0.9.10.025" -#PREFERRED_VERSION_embryo = "0.9.1.025" -#PREFERRED_VERSION_embryo-native = "0.9.1.025" -#PREFERRED_VERSION_emotion = "0.0.1.004" -#PREFERRED_VERSION_emotion-native = "0.0.1.004" -#PREFERRED_VERSION_epeg = "0.9.0.006" -#PREFERRED_VERSION_epsilon = "0.3.0.006" -#PREFERRED_VERSION_esmart-x11 = "0.9.0.006" -#PREFERRED_VERSION_evas-x11 = "0.9.9.025" -#PREFERRED_VERSION_evas-native = "0.9.9.025" -#PREFERRED_VERSION_ewl = "0.0.4.006" -#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011" -#PREFERRED_VERSION_imlib2-native = "1.2.1.011" -#PREFERRED_VERSION_e-wm = "0.16.999.025" -#PREFERRED_VERSION_entrance = "0.9.0.006" - -PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" -PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" -PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" -PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" - diff --git a/meta/conf/distro/preferred-gpe-versions-2.7.inc b/meta/conf/distro/preferred-gpe-versions-2.7.inc deleted file mode 100644 index 933195977..000000000 --- a/meta/conf/distro/preferred-gpe-versions-2.7.inc +++ /dev/null @@ -1,96 +0,0 @@ -# -# Specify which versions of GPE (and related) applications to build -# - -#work around some breakages -#SRCDATE_minimo=20050401 - -#set some preferred providers: -PREFERRED_PROVIDER_gconf=gconf-dbus -PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus - -#specify versions, as the header says :) -PREFERRED_VERSION_libmatchbox ?= "1.7" -PREFERRED_VERSION_matchbox ?= "0.9.1" -PREFERRED_VERSION_matchbox-common ?= "0.9.1" -PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" -PREFERRED_VERSION_matchbox-panel ?= "0.9.2" -PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" -PREFERRED_VERSION_atk ?= "1.9.0" -PREFERRED_VERSION_cairo ?= "0.5.2" -PREFERRED_VERSION_glib-2.0 ?= "2.6.4" -PREFERRED_VERSION_gtk+ ?= "2.6.10" -PREFERRED_VERSION_pango ?= "1.8.1" -PREFERRED_VERSION_librsvg ?= "2.6.5" -PREFERRED_VERSION_libgpewidget ?= "0.109" -PREFERRED_VERSION_libgpepimc ?= "0.5" -PREFERRED_VERSION_libgpevtype ?= "0.14" -PREFERRED_VERSION_libschedule ?= "0.15" -PREFERRED_VERSION_libcontactsdb ?= "0.3" -PREFERRED_VERSION_libtododb ?= "0.09" -PREFERRED_VERSION_gpe-icons ?= "0.25" -PREFERRED_VERSION_libgsm ?= "1.0.10" -PREFERRED_VERSION_diet-x11 ?= "6.2.1" -PREFERRED_VERSION_xproto ?= "6.6.2" -PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" -PREFERRED_VERSION_rxvt-unicode ?= "5.6" -PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" -PREFERRED_VERSION_xst ?= "0.15" -PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" -PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_gpe-login ?= "0.83" -PREFERRED_VERSION_gpe-session-scripts ?= "0.66" -PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" -PREFERRED_VERSION_gpe-todo ?= "0.55" -PREFERRED_VERSION_gpe-calendar ?= "0.70" -PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" -PREFERRED_VERSION_gpe-contacts ?= "0.43" -PREFERRED_VERSION_gpe-today ?= "0.10" -PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" -PREFERRED_VERSION_dbus ?= "0.23.4" -PREFERRED_VERSION_gpe-beam ?= "0.2.8" -PREFERRED_VERSION_gpe-bluetooth ?= "0.51" -PREFERRED_VERSION_gpe-su ?= "0.19" -PREFERRED_VERSION_gpe-conf ?= "0.1.29" -PREFERRED_VERSION_gpe-clock ?= "0.23" -PREFERRED_VERSION_gpe-mininet ?= "0.7" -PREFERRED_VERSION_gpe-mixer ?= "0.42" -PREFERRED_VERSION_gpe-shield ?= "0.8" -PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" -PREFERRED_VERSION_gpe-taskmanager ?= "0.19" -PREFERRED_VERSION_keylaunch ?= "2.0.7" -PREFERRED_VERSION_minilite ?= "0.49" -PREFERRED_VERSION_xmonobut ?= "0.4" -PREFERRED_VERSION_gpe-edit ?= "0.29" -PREFERRED_VERSION_gpe-gallery ?= "0.96" -PREFERRED_VERSION_gpe-calculator ?= "0.2" -PREFERRED_VERSION_gpe-package ?= "0.3" -PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" -PREFERRED_VERSION_gpe-terminal ?= "1.1" -PREFERRED_VERSION_gpe-watch ?= "0.10" -PREFERRED_VERSION_gpe-what ?= "0.42" -PREFERRED_VERSION_gpe-filemanager ?= "0.23" -PREFERRED_VERSION_gpe-go ?= "0.05" -PREFERRED_VERSION_gpe-irc ?= "0.07" -PREFERRED_VERSION_gpe-lights ?= "0.13" -#PREFERRED_VERSION_gpe-nmf ?= "0.21" -PREFERRED_VERSION_gpe-othello ?= "0.2-1" -PREFERRED_VERSION_gpe-plucker ?= "0.2" -PREFERRED_VERSION_gpe-tetris ?= "0.6-4" -PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" -PREFERRED_VERSION_xdemineur ?= "2.1.1" -PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" -PREFERRED_VERSION_linphone ?= "0.12.2" -PREFERRED_VERSION_firefox ?= "1.0" -PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" -PREFERRED_VERSION_poppler ?= "0.3.3" -PREFERRED_VERSION_evince ?= "0.3.2" -PREFERRED_VERSION_gpe_mini_browser ?= "0.19" diff --git a/meta/conf/distro/preferred-opie-versions.inc b/meta/conf/distro/preferred-opie-versions.inc deleted file mode 100644 index 51c993762..000000000 --- a/meta/conf/distro/preferred-opie-versions.inc +++ /dev/null @@ -1,206 +0,0 @@ -# -# Default versions -QTE_VERSION ?= "2.3.10" -OPIE_VERSION ?= "1.2.2" -PALMTOP_USE_MULTITHREADED_QT ?= "yes" - -# -# -# Opie libraries -# -PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' -PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" -PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" -PREFERRED_VERSION_qte = "${QTE_VERSION}" -PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" -PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" -PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" -PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" -PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" -PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" -# -# Opie applications -# -PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-console = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-go = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-language = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-login = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-search = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-security = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-write = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" -- cgit v1.2.3