diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-12 19:20:45 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-12 19:20:45 +0100 |
| commit | c3129dd45149b3d937ed0c1000b966042cd6e88e (patch) | |
| tree | 1543e805039f0896d74836c68917262ad3d6919e /conf | |
| parent | 475f68cf286346501ffe455d39f7269c4aa87709 (diff) | |
| parent | 09812530406d30b76d69d969adad33643c4a93b9 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 8 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 36876d49da..7aaa181c40 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1258,6 +1258,10 @@ sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d md5=b1e6309e8331e0f4e6efd311c2d97fa8 sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d +[ftp://ftp.us.debian.org/debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz] +md5=b1e6309e8331e0f4e6efd311c2d97fa8 +sha256=7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d + [http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz] md5=3fb255992b2af8f61c60a9706effbfa6 sha256=cc924ea10f77acae123194a33f46d8484642501cc6fe94b47491ecf3ad18419e @@ -15546,6 +15550,10 @@ sha256=c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572 md5=acf70a16359bf3658bdfb74bda1c4419 sha256=0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0 +[http://www.openssl.org/source/openssl-0.9.8j.tar.gz] +md5=a5cb5f6c3d11affb387ecf7a997cac0c +sha256=7131242042dbd631fbd83436f42aea1775e7c32f587fa4ada5a01df4c3ae8e8b + [http://www.openswan.org/download/old/openswan-2.2.0-kernel-2.4-klips.patch.gz] md5=5c54040bba6fea2bfb47df01056e953f sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53 diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 35e87f9ada..0d59eeb098 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1375,8 +1375,8 @@ PREFERRED_VERSION_openprotium-packages ?= "1.0" PREFERRED_VERSION_opensp ?= "1.5" PREFERRED_VERSION_opensp-native ?= "1.5" PREFERRED_VERSION_openssh ?= "4.6p1" -PREFERRED_VERSION_openssl ?= "0.9.7g" -PREFERRED_VERSION_openssl-native ?= "0.9.7g" +PREFERRED_VERSION_openssl ?= "0.9.8j" +PREFERRED_VERSION_openssl-native ?= "0.9.8j" PREFERRED_VERSION_openswan ?= "2.4.7" PREFERRED_VERSION_openttd ?= "0.6.3" PREFERRED_VERSION_openvpn ?= "2.0.9" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a861195dd1..eee7631018 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -11,7 +11,10 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -EXTRA_IMAGEDEPENDS += "zaurus-updater" + +ZAURUS-UPDATER_collie = "" +ZAURUS-UPDATER = "zaurus-updater" +EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" SERIAL_CONSOLE = "115200 ttyS0" SERIAL_CONSOLE_collie = "115200 ttySA0" |