[linux-dvb] [PATCH] get_dvb_firmware use of unshield

[Mattias Holmlund <u89@m1.holmlund.se>]

get_dvb_firmware uses unshield to unpack the firmware for sp887x. Since 
release 0.3 (2004-04-30) of unshield, the command-line parameters for 
unshield has changed. See

http://cvs.sourceforge.net/viewcvs.py/synce/unshield/src/unshield.c?r1=1.9&r2=1.10

The attached patch updates get_dvb_firmware to use the new command-line 
format for unshield. Unfortunately, this breaks get_dvb_firmware sp887x 
for users with older versions of unshield.

Can you accept the patch as-is, or do you want me to support older 
versions of unshield as well?

/Mattias
Index: get_dvb_firmware
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/Documentation/dvb/get_dvb_firmware,v
retrieving revision 1.7
diff -u -r1.7 get_dvb_firmware
--- get_dvb_firmware	16 Dec 2004 15:59:26 -0000	1.7
+++ get_dvb_firmware	4 Feb 2005 18:22:06 -0000
@@ -79,8 +79,8 @@
     wgetfile($sourcefile, $url);
     unzip($sourcefile, $tmpdir);
     unshield("$tmpdir/$cabfile", $tmpdir);
-    verify("$tmpdir/sc_main.mc", $hash);
-    copy("$tmpdir/sc_main.mc", $outfile);
+    verify("$tmpdir/ZEnglish/sc_main.mc", $hash);
+    copy("$tmpdir/ZEnglish/sc_main.mc", $outfile);
     
     $outfile;
 }
@@ -292,7 +292,7 @@
 sub unshield {
     my ($sourcefile, $todir) = @_;
 
-    system("unshield -d \"$todir\" \"$sourcefile\" > /dev/null" ) and die ("unshield failed - unable to extract firmware");
+    system("unshield x -d \"$todir\" \"$sourcefile\" > /dev/null" ) and die ("unshield failed - unable to extract firmware");
 }
 
 sub verify {