diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-07-14 14:54:15 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-14 14:54:15 +0000 |
| commit | 5b7397bba0d219bb48f7ae0524f757b3cbdcc949 (patch) | |
| tree | 9b458259c8097e5e66c47d84cedf7e9cd5fc6d91 | |
| parent | cc127cca7bb25d1858e98ccd891b75c6613d1a9a (diff) | |
familiar-unstable.conf: include fixed cvs dates
| -rw-r--r-- | conf/distro/familiar-unstable.conf | 16 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 13 |
2 files changed, 16 insertions, 13 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index e42456672c..b5893b7330 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,7 +1,6 @@ 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 @@ -9,7 +8,6 @@ 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" +include conf/distro/include/sane-srcdates.conf + # # Opie # @@ -67,7 +72,6 @@ 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 # diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index ebbf84b37e..30d361b2fb 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -10,7 +10,6 @@ CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ http://www.oesources.org/source/current/" - include conf/distro/openzaurus.conf DISTRO_TYPE = "debug" @@ -25,11 +24,11 @@ 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" @@ -39,7 +38,7 @@ KERNEL_CONSOLE = "ttyS0" #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" @@ -56,9 +55,9 @@ PREFERRED_VERSION_binutils = "2.15.94.0.1" # # Opie # -#QTE_VERSION = "2.3.10" -#OPIE_VERSION = "1.2.2" -#PALMTOP_USE_MULTITHREADED_QT = "yes" +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +PALMTOP_USE_MULTITHREADED_QT = "yes" include conf/distro/preferred-opie-versions.inc # |