diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-05-11 16:52:09 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-11 16:52:09 +0000 |
| commit | 42a161da4b4609b4b29d4b249f23d2b799596716 (patch) | |
| tree | abeccb996c57c3a67ae63f9c9e65a3b8c8fc1c05 | |
| parent | 78f6083b915b67b962c6a80ddd55d022a7238f6d (diff) | |
| parent | 01863d57ffb035ad0cc64aa273d6a13d28bae787 (diff) | |
merge of 315a43a2834c10ffcb7b5641f22459f878a47297
and cdafdfea115bd337ea8b144f31e6951f530615d2
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 8 | ||||
| -rw-r--r-- | conf/distro/jlime-shrek.conf | 6 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 12 | ||||
| -rw-r--r-- | packages/openssl/openssl.inc | 6 | ||||
| -rw-r--r-- | packages/openssl/openssl_0.9.7e.bb | 2 | ||||
| -rw-r--r-- | packages/openssl/openssl_0.9.7g.bb | 2 |
6 files changed, 27 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index c80a574a0d..9b03d70219 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -1,3 +1,11 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom <http://www.angstrom-distribution.org> +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> +#@-------------------------------------------------------------------- + #DISTRO_VERSION = "2006.9" DISTRO_VERSION = "test-${DATE}" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 943da6b9db..22fd792f85 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -1,6 +1,6 @@ #@TYPE: Distribution #@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com> -#@DESCRIPTION: Linux for HP jornada 5xx,6xx,7xx,8xx series +#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series) #@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com> DISTRO = "Jornada Linux Mobility Edition" @@ -8,9 +8,9 @@ DISTRO_NAME = "JLime" DISTRO_VERSION = "Shrek" DISTRO_TYPE = "release" -export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/" +export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/" -SRCDATE = 20050518 +SRCDATE = "20050518" PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index cc87380494..1419ca9317 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -1,3 +1,9 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OpenZaurus <http://www.openzaurus.org> +#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family +#@-------------------------------------------------------------------- + DISTRO_VERSION = ".dev-snapshot-${DATE}" include conf/distro/openzaurus.conf @@ -14,8 +20,7 @@ DISTRO_TYPE = "debug" # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" -# SRCDATE = "20050704" - +SRCDATE = "20060507" # # Zaurus # @@ -44,8 +49,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" -PALMTOP_USE_MULTITHREADED_QT = "no" -#PALMTOP_USE_MULTITHREADED_QT = "yes" +PALMTOP_USE_MULTITHREADED_QT = "yes" include conf/distro/preferred-opie-versions.inc # diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc index d5cd66aeb7..a73811a1cb 100644 --- a/packages/openssl/openssl.inc +++ b/packages/openssl/openssl.inc @@ -51,6 +51,12 @@ do_compile () { linux-armeb) target=linux-elf-armeb ;; + linux-sh3) + target=debian-sh3 + ;; + linux-sh4) + target=debian-sh4 + ;; linux-i586) target=linux-pentium ;; diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb index 887bf96a61..6493ddd090 100644 --- a/packages/openssl/openssl_0.9.7e.bb +++ b/packages/openssl/openssl_0.9.7e.bb @@ -1,6 +1,6 @@ include openssl.inc -PR = "r2" +PR = "r3" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1 \ diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb index 09b25c1f8f..88f474efb7 100644 --- a/packages/openssl/openssl_0.9.7g.bb +++ b/packages/openssl/openssl_0.9.7g.bb @@ -2,7 +2,7 @@ inherit pkgconfig include openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ |