diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-07-24 18:01:50 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-07-24 18:01:50 +0000 |
| commit | 2d8d69888259bdb65dc982dd5c4594ad91db546d (patch) | |
| tree | cd593ec2d10de47f6c4705f9b3edffc0c6b2487e /conf | |
| parent | 817cb42b0dc6e3db089c8cdc4a1340718e858000 (diff) | |
| parent | 2496c7ff2948f46a26af3288cc838cddc4d0a9e9 (diff) | |
merge of '12352b7bc5ed816b041b5c82997364952c87b92b'
and '5dd453cc72f6d98b8b8b88d2c4198cd2f26e858e'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-opie-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 28 |
2 files changed, 21 insertions, 10 deletions
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc index 51c9937628..34c1fd498e 100644 --- a/conf/distro/include/preferred-opie-versions.inc +++ b/conf/distro/include/preferred-opie-versions.inc @@ -65,6 +65,7 @@ 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}" @@ -203,4 +204,6 @@ 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/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index c44f352872..3c2d8e560b 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -11,9 +11,6 @@ export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey # No uniroot PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -# Lets set a few more terminals -SYSVINIT_ENABLED_GETTYS = "4" - #<> #<> We will set CVS DATE when things are known to work. #<> @@ -52,7 +49,7 @@ PREFERRED_VERSION_glibc-initial = "2.3.2" #<> PREFERRED_VERSION_glib-2.0-native = "2.6.5" PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.8.4" +PREFERRED_VERSION_glib-2.0 = "2.10.0" PREFERRED_VERSION_glib-1.2 = "1.2.10" #<> @@ -69,7 +66,8 @@ PREFRRED_VERSION_cairo = "1.0.4" #<>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) -INHERIT += "package_ipk multimachine" +SRC_DIST_LOCAL = "copy" +INHERIT += "package_ipk package_tar multimachine src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" @@ -77,7 +75,7 @@ TARGET_OS = "linux" #<>What we want on the bootstrap image (extra) #<> #<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \ +BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \ e2tools e2fsprogs kernel-modules spectrum-fw keymaps" #<> @@ -85,10 +83,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-to #<> QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" -PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt" -PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" -OPIE_VERSION = "20060709" -require conf/distro/include/preferred-opie-cvs-versions.inc +OPIE_VERSION = "1.2.2" +require conf/distro/include/preferred-opie-versions.inc + +#<> +#<> Lets decide on a GPE versipns +#<> +require conf/distro/include/preferred-gpe-versions-2.7.inc #<> #<> We want pcmciautils, not pcmcia-cs @@ -106,3 +107,10 @@ FULL_OPTIMIZATION = "-O1" #<> IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" +#<> +#<> +#<> +#<> General non-essential programs +#<> +#<> +PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file |