From: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
To: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Cc: crossgcc@sourceware.org
Subject: [PATCH 5 of 5] scripts/functions: force extract folder to archive basename
Date: Thu, 28 Jul 2011 19:10:00 -0000 [thread overview]
Message-ID: <50c28edc0a0ebe6bf285.1311880213@advlt005-ubuntu> (raw)
In-Reply-To: <patchbomb.1311880208@advlt005-ubuntu>
# HG changeset patch
# User "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
# Date 1311867232 -7200
# Node ID 50c28edc0a0ebe6bf285b6656233365e2ed88df0
# Parent ac0f1f93198fca8e2f28b9499e197fa387c67234
scripts/functions: force extract folder to archive basename
Some archives like those of the 2011.07 revisions of Linaro GCC contain a folder
name different from the archive basename, which leads to errors afterwards, e.g.
when patching. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 extracts to gcc-linaro-4.5-2011.07-0/
This patch changes CT_Extract() to force the extraction of all archives to a
folder named like the archive basename. E.g.:
gcc-linaro-4.5-2011.07.tar.bz2 now extracts to gcc-linaro-4.5-2011.07/
Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
diff --git a/scripts/functions b/scripts/functions
--- a/scripts/functions
+++ b/scripts/functions
@@ -728,10 +728,15 @@
CT_Pushd "${nochdir}"
CT_DoLog EXTRA "Extracting '${basename}'"
+ CT_DoExecLog FILE mkdir -p "${basename}"
case "${ext}" in
- .tar.bz2) CT_DoExecLog FILE tar xvjf "${full_file}";;
- .tar.gz|.tgz) CT_DoExecLog FILE tar xvzf "${full_file}";;
- .tar) CT_DoExecLog FILE tar xvf "${full_file}";;
+ .tar.bz2) { bzcat "${full_file}" \
+ |tar --strip-components=1 -C "${basename}" -xvf - ;
+ } 2>&1 |CT_DoLog FILE;;
+ .tar.gz|.tgz) { gzip -d -c "${full_file}" \
+ |tar --strip-components=1 -C "${basename}" -xvf - ;
+ } 2>&1 |CT_DoLog FILE;;
+ .tar) CT_DoExecLog FILE tar --strip-components=1 -C "${basename}" -xvf "${full_file}";;
/.git) CT_ExtractGit "${basename}" "${@}";;
*) CT_DoLog WARN "Don't know how to handle '${basename}${ext}': unknown extension"
return 1
next prev parent reply other threads:[~2011-07-28 19:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <71250406-36a5-4520-8623-20c1c3bc57b4@mx-12>
2011-05-18 15:39 ` [CT-NG 1.11.1] eglibc internationalization support Benoît THÉBAUDEAU
2011-05-18 17:14 ` Yann E. MORIN
2011-05-18 17:30 ` Benoît THÉBAUDEAU
2011-06-06 17:32 ` Benoît THÉBAUDEAU
2011-06-09 13:42 ` Benoît THÉBAUDEAU
2011-06-09 21:53 ` Yann E. MORIN
2011-06-10 21:44 ` Benoît THÉBAUDEAU
2011-07-28 19:10 ` [PATCH 0 of 5] libc " Benoît THÉBAUDEAU
2011-07-28 19:10 ` [PATCH 3 of 5] scripts/eglibc: add support for locales Benoît THÉBAUDEAU
2011-07-28 20:29 ` Yann E. MORIN
2011-07-28 19:10 ` [PATCH 1 of 5] scripts/libc: do not build add-ons by default Benoît THÉBAUDEAU
2011-07-28 20:03 ` Yann E. MORIN
2011-07-28 20:11 ` [PATCH] " Benoît THÉBAUDEAU
2011-07-28 21:03 ` Yann E. MORIN
2011-07-28 19:10 ` Benoît THÉBAUDEAU [this message]
2011-07-28 21:00 ` [PATCH 5 of 5] scripts/functions: force extract folder to archive basename Yann E. MORIN
2011-07-29 13:42 ` [PATCH 0 of 5] libc internationalization support Benoît THÉBAUDEAU
2011-07-29 13:42 ` [PATCH 1 of 5] scripts/functions: force extract folder to archive basename Benoît THÉBAUDEAU
2011-07-29 21:20 ` Yann E. MORIN
2011-07-29 13:42 ` [PATCH 3 of 5] libc/eglibc: add support for locales Benoît THÉBAUDEAU
2011-07-29 13:42 ` [PATCH 2 of 5] libc: create an infrastructure to build and install the libc locales Benoît THÉBAUDEAU
2011-07-29 13:51 ` [PATCH 4 of 5] libc/glibc: add partial support for locales Benoît THÉBAUDEAU
2011-07-29 13:51 ` [PATCH 5 of 5] libc: remove unneeded glibc/eglibc common functions Benoît THÉBAUDEAU
2011-07-29 21:34 ` [PATCH 0 of 5] libc internationalization support Yann E. MORIN
2011-08-01 11:13 ` Benoît THÉBAUDEAU
2011-08-01 11:23 ` Yann E. MORIN
2011-08-05 22:01 ` Yann E. MORIN
2011-07-28 19:10 ` [PATCH 2 of 5] libc: create an infrastructure to build and install the libc locales Benoît THÉBAUDEAU
2011-07-28 20:10 ` Yann E. MORIN
2011-07-28 19:16 ` [PATCH 4 of 5] scripts/glibc: add partial support for locales Benoît THÉBAUDEAU
2011-07-28 20:54 ` Yann E. MORIN
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=50c28edc0a0ebe6bf285.1311880213@advlt005-ubuntu \
--to=benoit.thebaudeau@advansee.com \
--cc=crossgcc@sourceware.org \
--cc=yann.morin.1998@anciens.enib.fr \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).