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>

13 files changed, 33 insertions, 55 deletions

diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index 2c9b827c41..aaccf54d0b 100644
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -6,8 +6,8 @@ LICENSE = "MIT"
 
 INC_PR = "r7"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-           ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
+           ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos "
 S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"
diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb
index 6aff3b6f5e..4665363d40 100644
--- a/recipes/mesa/mesa-dri_7.2.bb
+++ b/recipes/mesa/mesa-dri_7.2.bb
@@ -22,7 +22,7 @@ FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 
-SRC_URI[md5sum] = "04d379292e023df0b0266825cb0dbde5"
-SRC_URI[sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
-SRC_URI[md5sum] = "22e03dc4038cd63f32c21eb60994892b"
-SRC_URI[sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
+SRC_URI[archive.md5sum] = "04d379292e023df0b0266825cb0dbde5"
+SRC_URI[archive.sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
+SRC_URI[demos.md5sum] = "22e03dc4038cd63f32c21eb60994892b"
+SRC_URI[demos.sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb
index 92723762e5..583584be19 100644
--- a/recipes/mesa/mesa-dri_7.4.bb
+++ b/recipes/mesa/mesa-dri_7.4.bb
@@ -22,7 +22,7 @@ FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 
-SRC_URI[md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
+SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
+SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
+SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
+SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb
index 22c22d3ac6..a1a4d08a51 100644
--- a/recipes/mesa/mesa-dri_7.6.bb
+++ b/recipes/mesa/mesa-dri_7.6.bb
@@ -5,8 +5,8 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
           "
 PE = "1"
 PR = "${INC_PR}.0"
@@ -27,7 +27,7 @@ FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${
 
 EXTRA_OECONF += "--disable-gallium --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 
-SRC_URI[md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
-SRC_URI[sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
-SRC_URI[md5sum] = "0ede7adf217951acd90dbe4551210c07"
-SRC_URI[sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
+SRC_URI[archive.md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
+SRC_URI[archive.sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
+SRC_URI[demos.md5sum] = "0ede7adf217951acd90dbe4551210c07"
+SRC_URI[demos.sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
diff --git a/recipes/mesa/mesa-full_7.0.2.bb b/recipes/mesa/mesa-full_7.0.2.bb
index 2e0b8b6e67..efb54e0d29 100644
--- a/recipes/mesa/mesa-full_7.0.2.bb
+++ b/recipes/mesa/mesa-full_7.0.2.bb
@@ -1,8 +1,8 @@
 include mesa-mesa.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-        ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2 \
-        ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
+        ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2;name=glut \
+        ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos \
         file://mklib-rpath-link.patch;patch=1 \
         file://fix-host-compile.patch;patch=1 \
         file://fix-progs-makefile.patch;patch=1 \
diff --git a/recipes/mesa/mesa-xlib_7.2.bb b/recipes/mesa/mesa-xlib_7.2.bb
index cccdbd1c80..9fedd8bd86 100644
--- a/recipes/mesa/mesa-xlib_7.2.bb
+++ b/recipes/mesa/mesa-xlib_7.2.bb
@@ -19,7 +19,7 @@ do_install_append () {
     install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
 }
 
-SRC_URI[md5sum] = "04d379292e023df0b0266825cb0dbde5"
-SRC_URI[sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
-SRC_URI[md5sum] = "22e03dc4038cd63f32c21eb60994892b"
-SRC_URI[sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
+SRC_URI[archive.md5sum] = "04d379292e023df0b0266825cb0dbde5"
+SRC_URI[archive.sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
+SRC_URI[demos.md5sum] = "22e03dc4038cd63f32c21eb60994892b"
+SRC_URI[demos.sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
diff --git a/recipes/mesa/mesa-xlib_7.4.bb b/recipes/mesa/mesa-xlib_7.4.bb
index 46f965dc5d..f24087dba2 100644
--- a/recipes/mesa/mesa-xlib_7.4.bb
+++ b/recipes/mesa/mesa-xlib_7.4.bb
@@ -19,7 +19,7 @@ do_install_append () {
     install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
 }
 
-SRC_URI[md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
+SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
+SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
+SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
+SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb
index 438a6d4baa..25934ece46 100644
--- a/recipes/mesa/mesa-xlib_7.6.bb
+++ b/recipes/mesa/mesa-xlib_7.6.bb
@@ -5,8 +5,8 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
           "
 
 PE = "1"
@@ -14,7 +14,7 @@ PR = "${INC_PR}.0"
 
 EXTRA_OECONF += "--disable-gallium --with-driver=xlib"
 
-SRC_URI[md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
-SRC_URI[sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
-SRC_URI[md5sum] = "0ede7adf217951acd90dbe4551210c07"
-SRC_URI[sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
+SRC_URI[archive.md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
+SRC_URI[archive.sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
+SRC_URI[demos.md5sum] = "0ede7adf217951acd90dbe4551210c07"
+SRC_URI[demos.sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
diff --git a/recipes/mesa/mesa_6.5.2.bb b/recipes/mesa/mesa_6.5.2.bb
index e90c7e1180..cbb2a32ddb 100644
--- a/recipes/mesa/mesa_6.5.2.bb
+++ b/recipes/mesa/mesa_6.5.2.bb
@@ -4,8 +4,5 @@ PR = "${INC_PR}.0"
 
 SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
 
-
-
-
 SRC_URI[md5sum] = "e4d894181f1859651658b3704633e10d"
 SRC_URI[sha256sum] = "137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f"
diff --git a/recipes/mesa/mesa_7.0.2.bb b/recipes/mesa/mesa_7.0.2.bb
index ee5d87d6d1..a5063cf9f8 100644
--- a/recipes/mesa/mesa_7.0.2.bb
+++ b/recipes/mesa/mesa_7.0.2.bb
@@ -4,8 +4,5 @@ PR = "${INC_PR}.0"
 
 SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
 
-
-
-
 SRC_URI[md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
 SRC_URI[sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
diff --git a/recipes/mesa/mesa_7.2.bb b/recipes/mesa/mesa_7.2.bb
index dcf872a9ef..43cde679a1 100644
--- a/recipes/mesa/mesa_7.2.bb
+++ b/recipes/mesa/mesa_7.2.bb
@@ -1,7 +1,2 @@
 # This is a dummy package so OE can use the poky mesa files
 require mesa-dri_${PV}.bb
-
-SRC_URI[md5sum] = "04d379292e023df0b0266825cb0dbde5"
-SRC_URI[sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
-SRC_URI[md5sum] = "22e03dc4038cd63f32c21eb60994892b"
-SRC_URI[sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
diff --git a/recipes/mesa/mesa_7.4.bb b/recipes/mesa/mesa_7.4.bb
index 0fa4859f52..43cde679a1 100644
--- a/recipes/mesa/mesa_7.4.bb
+++ b/recipes/mesa/mesa_7.4.bb
@@ -1,7 +1,2 @@
 # This is a dummy package so OE can use the poky mesa files
 require mesa-dri_${PV}.bb
-
-SRC_URI[md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
diff --git a/recipes/mesa/mesa_7.6.bb b/recipes/mesa/mesa_7.6.bb
index ac42cf2291..f5c9a174fa 100644
--- a/recipes/mesa/mesa_7.6.bb
+++ b/recipes/mesa/mesa_7.6.bb
@@ -4,9 +4,3 @@ require mesa-dri_${PV}.bb
 PR = "${INC_PR}.1"
 
 EXTRA_OECONF += "--disable-egl"
-
-
-SRC_URI[md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
-SRC_URI[sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
-SRC_URI[md5sum] = "0ede7adf217951acd90dbe4551210c07"
-SRC_URI[sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"