[gentoo-commits] proj/genkernel:master commit in: /

[Richard Yao]

commit:     e49b8a450aba6eced9caa608a3bfdc38a7dbe677
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 03:06:41 2014 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:10:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e49b8a45

Make --kerncache compatible with recent versions of GNU tar, bug #457168

Older versions of GNU tar would extract files to the interior of the
directory specified after an adjustment via -C was taken into
consideration. Newer versions will perform extraction to the exterior of
that directory. This caused --kerncache to override the /lib symlink
with an actual directory.

We correct this by switching to a more standard syntax that should be
consistent against old and new versions of GNU tar, as well as bsdtar.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index ed7a5f4..520d771 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -134,9 +134,9 @@ gen_kerncache_extract_modules()
 		print_info 1 'Extracting kerncache kernel modules'
         	if [ "${INSTALL_MOD_PATH}" != '' ]
 		then
-        		/bin/tar -xjf ${KERNCACHE} -C ${INSTALL_MOD_PATH} lib
+			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C ${INSTALL_MOD_PATH}/lib
 		else
-        		/bin/tar -xjf ${KERNCACHE} -C / lib
+			/bin/tar -xjf ${KERNCACHE} --strip-components 1 -C /lib
 		fi
 	fi
 }