diff options
-rw-r--r-- | classes/fsl-eula-unpack.bbclass | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index d5e31c4a..9b8f2af6 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass | |||
@@ -6,16 +6,7 @@ | |||
6 | # | 6 | # |
7 | # SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true" | 7 | # SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true" |
8 | 8 | ||
9 | FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28" | 9 | LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f700405ef00f28" |
10 | FSL_EULA_FILE_MD5SUMS = \ | ||
11 | "${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24}" | ||
12 | |||
13 | # The checksum for the EULA in the layer | ||
14 | FSL_EULA_FILE_MD5SUM ?= \ | ||
15 | "${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24}" | ||
16 | |||
17 | LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" | ||
18 | LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}" | ||
19 | 10 | ||
20 | LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" | 11 | LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" |
21 | 12 | ||
@@ -30,7 +21,6 @@ python fsl_bin_do_unpack() { | |||
30 | rootdir = localdata.getVar('WORKDIR', True) | 21 | rootdir = localdata.getVar('WORKDIR', True) |
31 | fetcher = bb.fetch2.Fetch(src_uri, localdata) | 22 | fetcher = bb.fetch2.Fetch(src_uri, localdata) |
32 | 23 | ||
33 | found = 0 | ||
34 | for url in fetcher.ud.values(): | 24 | for url in fetcher.ud.values(): |
35 | # Skip this fetcher if it's not under EULA or if the fetcher type is not supported | 25 | # Skip this fetcher if it's not under EULA or if the fetcher type is not supported |
36 | if not url.parm.get('fsl-eula', False) or url.type not in ['http', 'https', 'ftp', 'file']: | 26 | if not url.parm.get('fsl-eula', False) or url.type not in ['http', 'https', 'ftp', 'file']: |
@@ -39,40 +29,9 @@ python fsl_bin_do_unpack() { | |||
39 | if not os.path.exists(url.localpath): | 29 | if not os.path.exists(url.localpath): |
40 | bb.debug(1, "Exiting as '%s' cannot be found" % url.basename) | 30 | bb.debug(1, "Exiting as '%s' cannot be found" % url.basename) |
41 | return | 31 | return |
42 | found += 1 | ||
43 | bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename) | 32 | bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename) |
44 | cmd = "sh %s --auto-accept --force" % (url.localpath) | 33 | cmd = "sh %s --auto-accept --force" % (url.localpath) |
45 | bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir) | 34 | bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir) |
46 | |||
47 | # Check for two EULAs, one from the layer and one from the package | ||
48 | bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...") | ||
49 | if found > 1: | ||
50 | bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.") | ||
51 | layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER') | ||
52 | licenses = d.getVar('LIC_FILES_CHKSUM') or "" | ||
53 | md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or "" | ||
54 | found_layer_license = False | ||
55 | found_package_license = False | ||
56 | for license in licenses.split(): | ||
57 | if license == layer_license: | ||
58 | bb.note("Found Freescale EULA for the layer %s." % license) | ||
59 | found_layer_license = True | ||
60 | continue | ||
61 | try: | ||
62 | (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license) | ||
63 | if method != "file" or not path: | ||
64 | raise bb.fetch.MalformedUrl() | ||
65 | except bb.fetch.MalformedUrl: | ||
66 | bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license)) | ||
67 | if parm.get('md5') in md5sums: | ||
68 | bb.note("Found Freescale EULA for the package %s." % license) | ||
69 | found_package_license = True | ||
70 | if not found_layer_license: | ||
71 | bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." | ||
72 | % (layer_license, licenses)) | ||
73 | if not found_package_license: | ||
74 | bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." | ||
75 | % (md5sums.split(), licenses)) | ||
76 | } | 35 | } |
77 | 36 | ||
78 | python do_unpack() { | 37 | python do_unpack() { |