diff options
author | Klaus Kurzmann <mok@fluxnetz.de> | 2009-11-01 21:52:35 +0100 |
---|---|---|
committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-11-01 21:52:35 +0100 |
commit | 1500d06c2c05502903ed6d8effe87415ad894e05 (patch) | |
tree | 32af442c570ec1564696929dfeb37e0495d8f880 | |
parent | 9d30ae6f7536240d0484c1c3c05b56eaaafeb3b8 (diff) | |
parent | 267b8f6a49b83ba8ab1748c23222f9534b0b228b (diff) | |
download | openembedded-1500d06c2c05502903ed6d8effe87415ad894e05.tar.gz |
Merge branch 'shr/import' of ssh+git://git@git.openembedded.net/openembedded into shr/import
-rw-r--r-- | conf/checksums.ini | 8 | ||||
-rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 2 | ||||
-rw-r--r-- | recipes/eject/eject_2.1.5.bb | 2 | ||||
-rw-r--r-- | recipes/tzdata/tzdata_2009p.bb | 3 |
4 files changed, 13 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 0b4c6199d6..339e8a67a2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21578,6 +21578,14 @@ sha256=7609980204940ceaf74b5a48d15ea0c079eaec627e149cf3d986cfed268881fe md5=c572bfb704e2da88b9e48517cfa3578f sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a +[ftp://elsie.nci.nih.gov/pub/tzdata2009o.tar.gz] +md5=75c74b9c8df7c83c8e3c3068fff08a82 +sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7 + +[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz] +md5=e401e284512be17f5cf63ee52e4f3284 +sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c + [ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz] md5=8b766bb807c1f7c0c02ff798ea5db80e sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 9572b706a8..639e704689 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1888,7 +1888,7 @@ PREFERRED_VERSION_twutils ?= "0.2" PREFERRED_VERSION_txdrug ?= "0.1" PREFERRED_VERSION_tximage ?= "0.2" PREFERRED_VERSION_tzcode-native ?= "2007k" -PREFERRED_VERSION_tzdata ?= "2009n" +PREFERRED_VERSION_tzdata ?= "2009p" PREFERRED_VERSION_u2nl ?= "1.3" PREFERRED_VERSION_uae4all ?= "0.7.1" PREFERRED_VERSION_ubahnnav ?= "0.4.1" diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb index 7cf7188899..3bbe6a85b3 100644 --- a/recipes/eject/eject_2.1.5.bb +++ b/recipes/eject/eject_2.1.5.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" inherit autotools -SRC_URI = "http://ca.geocities.com/jefftranter@rogers.com/eject-${PV}.tar.gz" +SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/eject-2.1.5.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/recipes/tzdata/tzdata_2009p.bb b/recipes/tzdata/tzdata_2009p.bb new file mode 100644 index 0000000000..17c2dd4f0c --- /dev/null +++ b/recipes/tzdata/tzdata_2009p.bb @@ -0,0 +1,3 @@ +require tzdata.inc +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" +PR = "${INC_PR}.0" |