aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-05-20 01:18:52 +0300
committerArmin Kuster <akuster808@gmail.com>2020-05-28 21:28:24 -0700
commite00eb979c5017692c71ccd75ccdf324248a6b5f7 (patch)
treeea42b72d779f3c1b4099d44ec05e1ed1585be8cd
parent6fbfbc4b1239b4b2f492b45103fa7a3f6e4b2f18 (diff)
downloadmeta-openembedded-e00eb979c5017692c71ccd75ccdf324248a6b5f7.tar.gz
meta-openembedded-e00eb979c5017692c71ccd75ccdf324248a6b5f7.tar.bz2
meta-openembedded-e00eb979c5017692c71ccd75ccdf324248a6b5f7.zip
unicode-ucd: Stop broken license downloading
WARNING: unicode-ucd-12.1.0-r0 do_fetch: Checksum mismatch for local file /home/bunk/yoctomaster/yocto-tmp/downloads/unicode.org.license.html Cleaning and trying again. WARNING: unicode-ucd-12.1.0-r0 do_fetch: Renaming /home/bunk/yoctomaster/yocto-tmp/downloads/unicode.org.license.html to /home/bunk/yoctomaster/yocto-tmp/downloads/unicode.org.license.html_bad-checksum_e9dd7d435db23241be3be21b5fca729b5cf883c8c039a70ea093031420d06abb WARNING: unicode-ucd-12.1.0-r0 do_fetch: Checksum failure encountered with download of https://www.unicode.org/license.html;name=license;subdir=unicode-ucd-12.1.0;downloadfilename=unicode.org.license.html - will attempt other sources if available This downloaded a license file from upstream. The upstream file did not match (copyright year changed). A stale copy was downloaded from a mirror instead and checked. The stale file with known contents never changes. Replace with a dummy check on a local copy of the license file. License checksum changed due to dos2unix conversion. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit a2719b02e11e6bf13b23796a3d07ada005dd6f8e) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/unicode-ucd/files/license.html98
-rw-r--r--meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb7
2 files changed, 100 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/unicode-ucd/files/license.html b/meta-oe/recipes-support/unicode-ucd/files/license.html
new file mode 100644
index 000000000..a02442ad9
--- /dev/null
+++ b/meta-oe/recipes-support/unicode-ucd/files/license.html
@@ -0,0 +1,98 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html>
+
+
+
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en-us">
+<meta name="VI60_defaultClientScript" content="JavaScript">
+<meta name="GENERATOR" content="Microsoft FrontPage 12.0">
+<meta name="keywords" content="Unicode Standard, copyright">
+<meta name="ProgId" content="FrontPage.Editor.Document">
+<title>Unicode License Agreement</title>
+<link rel="stylesheet" type="text/css"
+
+href="http://www.unicode.org/webscripts/standard_styles.css">
+
+<style type="text/css">
+pre {
+ FONT-FAMILY: Arial, Geneva, sans-serif;
+}
+</style>
+
+
+</head>
+
+
+<body text="#330000">
+
+ <table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <tr>
+
+ <!-- BEGIN CONTENTS -->
+
+ <td>
+
+
+<blockquote>
+<h2><a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h2>
+
+<pre>
+See <a href="https://www.unicode.org/copyright.html">Terms of Use</a> for definitions of Unicode Inc.'s
+Data Files and Software.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+</pre>
+
+</blockquote>
+
+
+
+ </td>
+
+ </tr>
+
+ </table>
+</body>
+</html>
diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb
index 89ab565ce..b29bb784e 100644
--- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb
+++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb
@@ -1,18 +1,15 @@
SUMMARY = "Unicode Character Database"
HOMEPAGE = "https://unicode.org/ucd/"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://unicode.org.license.html;beginline=42;endline=85;md5=67619d0c52706853c0256514e7fd04cd"
+LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377"
SRC_URI = " \
https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \
- https://www.unicode.org/license.html;name=license;subdir=${BP};downloadfilename=unicode.org.license.html \
+ file://license.html \
"
SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6"
SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6"
-SRC_URI[license.md5sum] = "f03bafb623258f85ff2032c1ce567b7c"
-SRC_URI[license.sha256sum] = "983225207de8a707d0903a8d70fb7a4b28c5e0f64f2366e84a6192a2d618fed4"
-
inherit allarch
do_configure[noexec] = "1"