diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-19 16:21:34 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-19 16:21:34 +0200 |
| commit | eb376e5b84ebd87c1f1e9e25d51a4ad77ccffb86 (patch) | |
| tree | adf769e6d4f6bfc42482acab4b3b8916313c4c62 | |
| parent | ea19b9d74d63552653dd74713777472f80c9d35a (diff) | |
| parent | fe80a43e570761e2b5788fdc886bae24bb673c7b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 2 | ||||
| -rw-r--r-- | recipes/granule/granule.inc | 2 | ||||
| -rw-r--r-- | recipes/granule/granule_1.2.4.bb | 4 | ||||
| -rw-r--r-- | recipes/granule/granule_1.4.0.bb | 4 |
5 files changed, 10 insertions, 6 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 03624c2661..3545595433 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9402,6 +9402,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c md5=7f4e11d04e369391de27fca82ee60f11 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c +[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz] +md5=4e327db531133ffeb650392042341443 +sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 + [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz] md5=75c8832f90e445ff361d767c8a2c3ece sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61 diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f1f04e5e6a..c05676cb50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -13,7 +13,7 @@ DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") diff --git a/recipes/granule/granule.inc b/recipes/granule/granule.inc index ba32d489f4..71ac55db2d 100644 --- a/recipes/granule/granule.inc +++ b/recipes/granule/granule.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-${MINVER}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/granule/granule_1.2.4.bb b/recipes/granule/granule_1.2.4.bb deleted file mode 100644 index cb01eb0388..0000000000 --- a/recipes/granule/granule_1.2.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require granule.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-1.tar.gz" - diff --git a/recipes/granule/granule_1.4.0.bb b/recipes/granule/granule_1.4.0.bb new file mode 100644 index 0000000000..109a3b4c97 --- /dev/null +++ b/recipes/granule/granule_1.4.0.bb @@ -0,0 +1,4 @@ +require granule.inc + +MINVER = "7" +S = "${WORKDIR}/${P}-${MINVER}" |