From: Roger Shimizu <rogershimizu@gmail.com>
To: Michal Marek <mmarek@suse.com>, Russell King <linux@arm.linux.org.uk>
Cc: Roger Shimizu <rogershimizu@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-kbuild@vger.kernel.org
Subject: [RFC] scripts: make extract-vmlinux support ARM vmlinuz
Date: Tue, 26 Jan 2016 21:10:36 +0900 [thread overview]
Message-ID: <1453810236-2082-1-git-send-email-rogershimizu@gmail.com> (raw)
vmlinuz on ARM seems is not an ELF, so scripts/extract-vmlinux
need to support such case.
This fix is tested on amd64 and armel platform.
Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
---
Dear Michal and Russell,
I'm studying ARM booting process, and happened to find scripts/extract-vmlinux
in kernel tree is broken on ARM for long time. [0][1]
[0]: https://bugs.launchpad.net/linaro-ubuntu/+bug/1050453
[1]: https://bugs.linaro.org/show_bug.cgi?id=461
The patch I created looks like dirty hack, and I don't know the status of
whether vmlinuz is ELF or not on other platforms, so I make this as "RFC".
Please comment. Thank you!
Cheers,
Roger
| 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
index 5061abcc2540..d569eb8c8efe 100755
--- a/scripts/extract-vmlinux
+++ b/scripts/extract-vmlinux
@@ -15,7 +15,15 @@ check_vmlinux()
# Use readelf to check if it's a valid ELF
# TODO: find a better to way to check that it's really vmlinux
# and not just an elf
- readelf -h $1 > /dev/null 2>&1 || return 1
+ case "$2" in
+ 0|"")
+ readelf -h $1 > /dev/null 2>&1 || return 1
+ ;;
+ 1|*)
+ # For ARCH like ARM, vmlinux is not ELF, so we only do the check
+ # when $2 is 0 or NULL
+ ;;
+ esac
cat $1
exit 0
@@ -31,7 +39,7 @@ try_decompress()
do
pos=${pos%%:*}
tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
- check_vmlinux $tmp
+ test $? -eq 0 && check_vmlinux $tmp 1
done
}
@@ -53,7 +61,7 @@ check_vmlinux $img
# That didn't work, so retry after decompression.
try_decompress '\037\213\010' xy gunzip
-try_decompress '\3757zXZ\000' abcde unxz
+try_decompress '\3757zXZ\000' abcde "unxz --single-stream"
try_decompress 'BZh' xy bunzip2
try_decompress '\135\0\0\0' xxx unlzma
try_decompress '\211\114\132' xy 'lzop -d'
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: rogershimizu@gmail.com (Roger Shimizu)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC] scripts: make extract-vmlinux support ARM vmlinuz
Date: Tue, 26 Jan 2016 21:10:36 +0900 [thread overview]
Message-ID: <1453810236-2082-1-git-send-email-rogershimizu@gmail.com> (raw)
vmlinuz on ARM seems is not an ELF, so scripts/extract-vmlinux
need to support such case.
This fix is tested on amd64 and armel platform.
Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
---
Dear Michal and Russell,
I'm studying ARM booting process, and happened to find scripts/extract-vmlinux
in kernel tree is broken on ARM for long time. [0][1]
[0]: https://bugs.launchpad.net/linaro-ubuntu/+bug/1050453
[1]: https://bugs.linaro.org/show_bug.cgi?id=461
The patch I created looks like dirty hack, and I don't know the status of
whether vmlinuz is ELF or not on other platforms, so I make this as "RFC".
Please comment. Thank you!
Cheers,
Roger
| 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
index 5061abcc2540..d569eb8c8efe 100755
--- a/scripts/extract-vmlinux
+++ b/scripts/extract-vmlinux
@@ -15,7 +15,15 @@ check_vmlinux()
# Use readelf to check if it's a valid ELF
# TODO: find a better to way to check that it's really vmlinux
# and not just an elf
- readelf -h $1 > /dev/null 2>&1 || return 1
+ case "$2" in
+ 0|"")
+ readelf -h $1 > /dev/null 2>&1 || return 1
+ ;;
+ 1|*)
+ # For ARCH like ARM, vmlinux is not ELF, so we only do the check
+ # when $2 is 0 or NULL
+ ;;
+ esac
cat $1
exit 0
@@ -31,7 +39,7 @@ try_decompress()
do
pos=${pos%%:*}
tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
- check_vmlinux $tmp
+ test $? -eq 0 && check_vmlinux $tmp 1
done
}
@@ -53,7 +61,7 @@ check_vmlinux $img
# That didn't work, so retry after decompression.
try_decompress '\037\213\010' xy gunzip
-try_decompress '\3757zXZ\000' abcde unxz
+try_decompress '\3757zXZ\000' abcde "unxz --single-stream"
try_decompress 'BZh' xy bunzip2
try_decompress '\135\0\0\0' xxx unlzma
try_decompress '\211\114\132' xy 'lzop -d'
--
2.1.4
next reply other threads:[~2016-01-26 12:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 12:10 Roger Shimizu [this message]
2016-01-26 12:10 ` [RFC] scripts: make extract-vmlinux support ARM vmlinuz Roger Shimizu
2016-01-26 13:42 ` Russell King - ARM Linux
2016-01-26 13:42 ` Russell King - ARM Linux
2016-01-26 23:28 ` Roger Shimizu
2016-01-26 23:28 ` Roger Shimizu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453810236-2082-1-git-send-email-rogershimizu@gmail.com \
--to=rogershimizu@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mmarek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.