summaryrefslogtreecommitdiffstats
path: root/classes/fsl-eula-unpack.bbclass
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-04-15 20:10:09 -0500
committerTom Hochstein <tom.hochstein@nxp.com>2022-04-15 20:46:30 -0500
commitb1e0530e129345dc64b968e6825ca1d3f223a9f5 (patch)
tree361bfdc81999043c2f3471a111d0642a2306b64b /classes/fsl-eula-unpack.bbclass
parent3742561f0ab4fc746dace10531d10317bd46a3b4 (diff)
downloadmeta-freescale-b1e0530e129345dc64b968e6825ca1d3f223a9f5.tar.gz
fsl-eula-unpack.bbclass: Unpack NXP EULA archives last
NXP EULA archive-based builds like imx-gpu-viv fail because the unpacked folder is empty: ``` ERROR: imx-gpu-viv-1_6.4.3.p2.4-aarch64-r0 do_populate_lic: QA Issue: imx-gpu-viv: LIC_FILES_CHKSUM points to an invalid file: /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-mx8m-fsl-linux/imx-gpu-viv/1_6.4.3.p2.4-aarch64-r0/imx-gpu-viv-6.4.3.p2.4-aarch64/COPYING [license-checksum] ``` This is traced to a change in bitbake: ``` b074f4a ast: Improve function flags handling for EXPORT_FUNCTIONS ``` That change includes a fix for cleandirs, so now the call to base_unpack, done after the NXP EULA archive unpack, does now remove the folder(s) created by the NXP EULA archive unpack. Fix the problem by simply unpacking the NXP EULA archives last. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'classes/fsl-eula-unpack.bbclass')
-rw-r--r--classes/fsl-eula-unpack.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 857c4ca0..31db6003 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -162,13 +162,12 @@ python do_unpack() {
162 else: 162 else:
163 bb.note("Freescale EULA has been accepted for '%s'" % pkg) 163 bb.note("Freescale EULA has been accepted for '%s'" % pkg)
164 164
165 # The binary unpack needs to be done first so 'S' is valid
166 bb.build.exec_func('fsl_bin_do_unpack', d)
167
168 try: 165 try:
169 bb.build.exec_func('base_do_unpack', d) 166 bb.build.exec_func('base_do_unpack', d)
170 except: 167 except:
171 raise 168 raise
169
170 bb.build.exec_func('fsl_bin_do_unpack', d)
172} 171}
173 172
174do_unpack[vardepsexclude] += "FSL_EULA_FILE" 173do_unpack[vardepsexclude] += "FSL_EULA_FILE"