recipes: move checksums to recipes from checksums.ini, part 2 manual adjustement

* all: multiple checked items in SRC_URI (needs name= param)
* other fixes like non-existent URL, checksums moved ot .inc or included .bb (ie for -native)
* ...
* tested with micro/micro-uclibc/Angstrom/SHR with
  SOURCE_MIRROR_FETCH="True" (ignoring COMPATIBLE_*
* also tested -c fetch with s/SRC_URI_append_[^ ]*/SRC_URI_append/g and
  s/SRC_URI_[^ ]*/SRC_URI_append/g to catch all URLs used only for
  distro/machine/virtual override (see
  http://build.shr-project.org/tests/jama/SRC_URI.removeOverrides.patch)
* in case I downloaded different checksum then what was in checksums.ini
  I used the old one from checksums.ini and put my checksum in comment
* I'll send to ML list of recipes which cannot be downloaded (weren't
  converted) and where I got different checksums

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 19 insertions, 14 deletions

diff --git a/recipes/roadmap/roadmap-gtk2_1.1.0.bb b/recipes/roadmap/roadmap-gtk2_1.1.0.bb
index f09d951878..0e2a3766b4 100644
--- a/recipes/roadmap/roadmap-gtk2_1.1.0.bb
+++ b/recipes/roadmap/roadmap-gtk2_1.1.0.bb
@@ -2,16 +2,16 @@ require roadmap-gtk2.inc
 
 PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz;name=archive \
            file://cross.patch;patch=1;pnum=2 \
            file://options.mk.patch;patch=1;pnum=2 \
            file://roadmap_path.patch;patch=1 \
            file://roadmap.desktop.patch;patch=1 \
-	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz "
+	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir "
 
 S = "${WORKDIR}/roadmap-${PV}/src"
 
-SRC_URI[md5sum] = "773c1e4291177c5b7a887763f6cb83a6"
-SRC_URI[sha256sum] = "bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed"
-SRC_URI[md5sum] = "d669ae4a3567b0d5d3ff5db6351b4053"
-SRC_URI[sha256sum] = "651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674"
+SRC_URI[archive.md5sum] = "773c1e4291177c5b7a887763f6cb83a6"
+SRC_URI[archive.sha256sum] = "bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed"
+SRC_URI[usdir.md5sum] = "d669ae4a3567b0d5d3ff5db6351b4053"
+SRC_URI[usdir.sha256sum] = "651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674"
diff --git a/recipes/roadmap/roadmap-gtk2_cvs.bb b/recipes/roadmap/roadmap-gtk2_cvs.bb
index 9d7adbaa3e..05acd9686f 100644
--- a/recipes/roadmap/roadmap-gtk2_cvs.bb
+++ b/recipes/roadmap/roadmap-gtk2_cvs.bb
@@ -7,7 +7,9 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
            file://options.mk.patch;patch=1;pnum=2 \
            file://roadmap_path.patch;patch=1 \
-	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
+	   http://roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz;name=usdir "
 
 S = "${WORKDIR}/roadmap/src"
 
+SRC_URI[usdir.md5sum] = "7b407c7ff5a38216f85d648365d81894"
+SRC_URI[usdir.sha256sum] = "bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb"
diff --git a/recipes/roadmap/zroadmap_1.1.0.bb b/recipes/roadmap/zroadmap_1.1.0.bb
index 97745d5fa0..161a41eeab 100644
--- a/recipes/roadmap/zroadmap_1.1.0.bb
+++ b/recipes/roadmap/zroadmap_1.1.0.bb
@@ -2,7 +2,7 @@ require zroadmap.inc
 
 PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz;name=archive \
            file://cross.patch;patch=1;pnum=2 \
            file://options.mk.patch;patch=1;pnum=2 \
            file://qt/qt2-fixes.patch;patch=1 \
@@ -11,11 +11,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://qt/roadmap_main.patch;patch=1 \
            file://roadmap_path.patch;patch=1 \
            file://roadmap.desktop.patch;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir"
 
 S = "${WORKDIR}/roadmap-${PV}/src"
 
-SRC_URI[md5sum] = "773c1e4291177c5b7a887763f6cb83a6"
-SRC_URI[sha256sum] = "bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed"
-SRC_URI[md5sum] = "d669ae4a3567b0d5d3ff5db6351b4053"
-SRC_URI[sha256sum] = "651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674"
+SRC_URI[archive.md5sum] = "773c1e4291177c5b7a887763f6cb83a6"
+SRC_URI[archive.sha256sum] = "bfaa36f246dc01775268644c153a2c65f5e2009b45d19f72e3d06c83c59d3aed"
+SRC_URI[usdir.md5sum] = "d669ae4a3567b0d5d3ff5db6351b4053"
+SRC_URI[usdir.sha256sum] = "651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674"
diff --git a/recipes/roadmap/zroadmap_cvs.bb b/recipes/roadmap/zroadmap_cvs.bb
index 383ffe8f69..fb06bb76af 100644
--- a/recipes/roadmap/zroadmap_cvs.bb
+++ b/recipes/roadmap/zroadmap_cvs.bb
@@ -8,6 +8,9 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://options.mk.patch;patch=1;pnum=2 \
            file://qt/qt2-fixes.patch;patch=1 \
            file://roadmap_path.patch;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz;name=usdir"
 
 S = "${WORKDIR}/roadmap/src"
+
+SRC_URI[usdir.md5sum] = "d669ae4a3567b0d5d3ff5db6351b4053"
+SRC_URI[usdir.sha256sum] = "651f040408a9dfe3ece1d490cd808fc80e878fd39876f50f6772f9e5f9ee3674"