From 0f79cfc1aa8d57e0202403b71903f1413868dd49 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Sun, 18 Dec 2005 15:29:08 +0000 Subject: [PATCH] Add a compile_klibc(...) fix for old GNU tars and patch the klibc Makefile to leave /lib alone. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@344 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- gen_compile.sh | 5 ++++- genkernel | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index 700416d..1f90f28 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -704,11 +704,14 @@ compile_klibc() { rm -rf "${KLIBC_DIR}" klibc-build [ ! -f "${KLIBC_SRCTAR}" ] && gen_die "Could not find klibc tarball: ${KLIBC_SRCTAR}" - /bin/tar -xpf "${KLIBC_SRCTAR}" || + /bin/tar zxpf "${KLIBC_SRCTAR}" || gen_die 'Could not extract klibc tarball' [ ! -d "${KLIBC_DIR}" ] && gen_die "klibc tarball ${KLIBC_SRCTAR} is invalid" cd "${KLIBC_DIR}" + + # Don't install to "//lib" fix + sed -e 's:$(INSTALLROOT)/$(SHLIBDIR):$(INSTALLROOT)$(INSTALLDIR)/$(CROSS)lib:' -i klibc/Makefile if [ -f ${GK_SHARE}/pkg/byteswap.h ] then echo "Inserting byteswap.h into klibc" diff --git a/genkernel b/genkernel index aa814e6..7aa895b 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # Genkernel v3 PATH="/bin:/usr/bin:/sbin:/usr/sbin" -GK_V='3.3.9' +GK_V='3.3.10' TMPDIR='/var/tmp/genkernel' TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified. -- 2.26.2