From d92da4dd64a9b8be7d992910580f39fc10183537 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 14 Apr 2005 12:43:28 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/14 01:08:14+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/13 01:15:42+02:00 uni-frankfurt.de!mickeyl add missing orinoco-cs to zaurus-clamshell-2.4.conf 2005/04/13 00:55:56+02:00 uni-frankfurt.de!mickeyl update oz-3.5.4.conf 2005/04/12 18:21:01+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/04/12 18:20:49+02:00 uni-frankfurt.de!mickeyl add opie-irc to base image for systems >= 24 BKrev: 425e6570DYy-RAgOWfZHUtOMGDVuUg --- conf/distro/openzaurus-3.5.4.conf | 56 ++++++++++++++++++++++++++++++++++ conf/machine/zaurus-clamshell-2.4.conf | 2 +- packages/meta/opie-collections.inc | 6 ++-- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index e69de29bb2..c550d8e1f9 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -0,0 +1,56 @@ +include conf/distro/openzaurus.conf +DISTRO = "openzaurus" +DISTRO_NAME = "OpenZaurus" +DISTRO_VERSION = "3.5.3-snapshot-${DATE}" +# DISTRO_VERSION = "3.5.4" +DISTRO_TYPE = "debug" +# DISTRO_TYPE = "release" + +FEED_URIS += " \ + upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \ + base##http://openzaurus.org/official/unstable/3.5.3/feed/base/ \ + libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/ \ + console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ + devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" + +CVSDATE = "20050415" + +# +# Zaurus +# + +ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" +OEINCLUDELOGS = "yes" +KERNEL_CONSOLE = "ttyS0" +#DEBUG_OPTIMIZATION = "-O -g3" +#DEBUG_BUILD = "1" +#INHIBIT_PACKAGE_STRIP = "1" + +# +# 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" +# +# Opie +# + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_konqueror-embedded = "20030705" + +OPIE_VERSION = "1.2.1" +include conf/distro/preferred-opie-versions.inc + +# +# GPE +# + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +GPE_EXTRA_INSTALL += " gsoko" + +include conf/distro/preferred-gpe-versions.inc + diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 3c0ee3fc0f..c25e2d2bcb 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "c7x0-kernels-2.4-embedix" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \ hostap-utils prism3-firmware prism3-support" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ kernel-module-usbdcore kernel-module-usbdmonitor chkhinge \ hostap-utils prism3-firmware prism3-support" diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 589897cc31..471c897c06 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -92,9 +92,11 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec # OPIE_DEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop opie-reader \ - qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix" + qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ + opie-irc " OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop opie-reader \ - qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix" + qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ + opie-irc " # # -- cgit v1.2.3