diff options
-rw-r--r-- | recipes/ti/ti-eula-unpack.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/recipes/ti/ti-eula-unpack.inc b/recipes/ti/ti-eula-unpack.inc index bcd2d3a542..947ca143ea 100644 --- a/recipes/ti/ti-eula-unpack.inc +++ b/recipes/ti/ti-eula-unpack.inc @@ -9,8 +9,6 @@ # TI_BIN_UNPK_WDEXT - This variable extends workdir path, if user wants to put # the output in some internal directory -export DISPLAY = "" - python do_unpack () { bb.build.exec_func('base_do_unpack', d) bb.build.exec_func('ti_bin_do_unpack', d) @@ -41,7 +39,13 @@ python ti_bin_do_unpack() { os.chmod(binfile, 0755) # Run the InstallJammer binary and accept the EULA - filename = "HOME=%s ./%s" % (workdir, binfile) + filename = "HOME=%s ./%s --mode console" % (workdir, binfile) + + # Test executable by printing installer version + if os.system(filename + " --version") != 0: + print "ERROR: ti-eula-unpack: failed to execute binary installer" + raise bb.build.FuncFailed() + f = os.popen(filename,'w') for cmd in cmd_list: if cmd == "workdir": @@ -56,7 +60,9 @@ python ti_bin_do_unpack() { if bool(tarfile) == True: tarfile = bb.data.expand(tarfile, localdata) tcmd = 'tar xz --no-same-owner -f %s -C %s' % (tarfile, workdir) - os.system(tcmd) + if os.system(tcmd) != 0: + print "ERROR: ti-eula-unpack: failed to extract tarfile" + raise bb.build.FuncFailed() # Return to the previous directory os.chdir(save_cwd) |