Commit 59dde385 authored by Hui Zhu's avatar Hui Zhu Committed by Michal Marek

markup_oops.pl: minor fixes

1. Fix a little format issue.
2. Check the return of "Getopt::Long::GetOptions".  Output usage and
   exit if it get error.
3. Change $ARGV[$#ARGV] to $ARGV[0].
4. Change the code which get $modulefile from modinfo.  Replace the
   pipeline with `modinfo -F filename $module`.
4. Change usage from "Specify the module directory name" to "Specify the
   module filename".
Signed-off-by: default avatarHui Zhu <teawater@gmail.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 52e13e21
...@@ -23,10 +23,10 @@ my $modulefile = ""; ...@@ -23,10 +23,10 @@ my $modulefile = "";
# Get options # Get options
Getopt::Long::GetOptions( Getopt::Long::GetOptions(
'cross-compile|c=s' => \$cross_compile, 'cross-compile|c=s' => \$cross_compile,
'module|m=s' => \$modulefile, 'module|m=s' => \$modulefile,
'help|h' => \&usage, 'help|h' => \&usage,
); ) || usage ();
my $vmlinux_name = $ARGV[$#ARGV]; my $vmlinux_name = $ARGV[0];
if (!defined($vmlinux_name)) { if (!defined($vmlinux_name)) {
my $kerver = `uname -r`; my $kerver = `uname -r`;
chomp($kerver); chomp($kerver);
...@@ -193,7 +193,7 @@ if ($target eq "0") { ...@@ -193,7 +193,7 @@ if ($target eq "0") {
# if it's a module, we need to find the .ko file and calculate a load offset # if it's a module, we need to find the .ko file and calculate a load offset
if ($module ne "") { if ($module ne "") {
if ($modulefile eq "") { if ($modulefile eq "") {
my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`; $modulefile = `modinfo -F filename $module`;
chomp($modulefile); chomp($modulefile);
} }
$filename = $modulefile; $filename = $modulefile;
...@@ -362,7 +362,7 @@ Usage: ...@@ -362,7 +362,7 @@ Usage:
OPTION: OPTION:
-c, --cross-compile CROSS_COMPILE Specify the prefix used for toolchain. -c, --cross-compile CROSS_COMPILE Specify the prefix used for toolchain.
-m, --module MODULE_DIRNAME Specify the module directory name. -m, --module MODULE_DIRNAME Specify the module filename.
-h, --help Help. -h, --help Help.
EOT EOT
exit; exit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment