aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2020-03-27 20:23:10 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2020-03-27 20:23:10 -0300
commit61e4da6ebe5d362213283fc26bf42c2fb79769ff (patch)
tree908cc16f91a2e8ccc076390e5860b6fe35d480a9
parent49291d13e6c0a555e10fcfb12f550fbf6eba3e19 (diff)
downloadmeta-freescale-61e4da6ebe5d362213283fc26bf42c2fb79769ff.tar.gz
meta-freescale-61e4da6ebe5d362213283fc26bf42c2fb79769ff.tar.bz2
meta-freescale-61e4da6ebe5d362213283fc26bf42c2fb79769ff.zip
Revert "fsl-eula-unpack.bbclass: Enhance EULA model"
This reverts commit 49291d13e6c0a555e10fcfb12f550fbf6eba3e19.
-rw-r--r--classes/fsl-eula-unpack.bbclass43
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 @@
#
# SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28"
-FSL_EULA_FILE_MD5SUMS = \
- "${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24}"
-
-# The checksum for the EULA in the layer
-FSL_EULA_FILE_MD5SUM ?= \
- "${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24}"
-
-LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
-LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}"
+LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f700405ef00f28"
LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE"
@@ -30,7 +21,6 @@ python fsl_bin_do_unpack() {
rootdir = localdata.getVar('WORKDIR', True)
fetcher = bb.fetch2.Fetch(src_uri, localdata)
- found = 0
for url in fetcher.ud.values():
# Skip this fetcher if it's not under EULA or if the fetcher type is not supported
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() {
if not os.path.exists(url.localpath):
bb.debug(1, "Exiting as '%s' cannot be found" % url.basename)
return
- found += 1
bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename)
cmd = "sh %s --auto-accept --force" % (url.localpath)
bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir)
-
- # Check for two EULAs, one from the layer and one from the package
- bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...")
- if found > 1:
- bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.")
- layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER')
- licenses = d.getVar('LIC_FILES_CHKSUM') or ""
- md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or ""
- found_layer_license = False
- found_package_license = False
- for license in licenses.split():
- if license == layer_license:
- bb.note("Found Freescale EULA for the layer %s." % license)
- found_layer_license = True
- continue
- try:
- (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license)
- if method != "file" or not path:
- raise bb.fetch.MalformedUrl()
- except bb.fetch.MalformedUrl:
- bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license))
- if parm.get('md5') in md5sums:
- bb.note("Found Freescale EULA for the package %s." % license)
- found_package_license = True
- if not found_layer_license:
- bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'."
- % (layer_license, licenses))
- if not found_package_license:
- bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'."
- % (md5sums.split(), licenses))
}
python do_unpack() {