diff options
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 5 | ||||
| -rw-r--r-- | conf/distro/familiar-unstable.conf | 5 | ||||
| -rw-r--r-- | conf/distro/jlime-shrek.conf | 1 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 18 | ||||
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 12 |
5 files changed, 14 insertions, 27 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 2fc1e31c72..4cfea8e3da 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -3,7 +3,6 @@ DISTRO_VERSION = "test-${DATE}" include conf/distro/angstrom.conf - DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! @@ -27,10 +26,6 @@ include conf/distro/preferred-gpe-versions-2.8.inc # E include conf/distro/preferred-e-versions.inc -PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" -PREFERRED_VERSION_qte = "2.3.10" - - PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_libx11 = "diet-x11" diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index ab367378af..8b40c5811a 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -5,7 +5,6 @@ DISTRO_VERSION = "unstable-${DATE}" include conf/distro/familiar.conf - DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! @@ -39,7 +38,6 @@ 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 @@ -57,9 +55,6 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1" # Opie # -PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" -PREFERRED_VERSION_qte = "2.3.10" - #OPIE_VERSION = "1.2.1" #include conf/distro/preferred-opie-versions.inc diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index c3f88c5511..943da6b9db 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -29,7 +29,6 @@ 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_qte = "2.3.10" PREFERRED_VERSION_xserver-kdrive = "20050207" INHERIT += "package_tar package_ipk" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 1143f1d940..fd392b84e5 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -21,26 +21,20 @@ DISTRO_TYPE = "debug" # ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" +PREFERRED_PROVIDER_hostap-conf = "hostap-conf" KERNEL_CONSOLE = "ttyS0" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" - -PREFERRED_VERSION_hostap-modules ?= "0.3.9" - -#fix some iconv issues, needs to be adjusted when doing uclibc builds +# fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" - # # Base # -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" 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" @@ -48,10 +42,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # # Opie # -PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" - -#OPIE_VERSION = "1.2.1" -#include conf/distro/preferred-opie-versions.inc +OPIE_VERSION = "1.2.2" +PALMTOP_USE_MULTITHREADED_QT = "no" +#PALMTOP_USE_MULTITHREADED_QT = "yes" +include conf/distro/preferred-opie-versions.inc # # GPE diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index d9f65b3831..8b6f7d06b2 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/preferred-opie-versions.inc @@ -1,14 +1,18 @@ # -# A list of applications. +# 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 = "2.3.10" 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}" @@ -191,4 +195,4 @@ 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 = "20030705" +PREFERRED_VERSION_konqueror-embedded = "20060404" |