[oe-commits] Roger Monk : ti-eula-unpack: Temp Remove Version Check which is broken in some installers

git version control git at git.openembedded.org
Tue Jun 29 14:43:09 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3a6ffbc99137af46c32c79bb69559acc2cd899f8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3a6ffbc99137af46c32c79bb69559acc2cd899f8

Author: Roger Monk <r-monk at ti.com>
Date:   Tue Jun 29 15:14:45 2010 +0100

ti-eula-unpack: Temp Remove Version Check which is broken in some installers

* IJ installer returns error for --version/--help tests
   * Remove for noew while debugging

   * Issue found by brijesh

Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <k-kooi at ti.com>

---

 recipes/ti/ti-eula-unpack.inc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/ti/ti-eula-unpack.inc b/recipes/ti/ti-eula-unpack.inc
index 947ca14..a812a85 100644
--- a/recipes/ti/ti-eula-unpack.inc
+++ b/recipes/ti/ti-eula-unpack.inc
@@ -41,10 +41,11 @@ python ti_bin_do_unpack() {
     # Run the InstallJammer binary and accept the EULA
     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()
+    # Test executable by printing installer version or help screen (--version currently broken for some installers) 
+    # - this is currently broken in some IJ installers - comment out for now
+    #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:





More information about the Openembedded-commits mailing list