Added patch from bug #118324.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@351 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_compile.sh b/gen_compile.sh
index 85b65a941462c20d534d88ef57f9bae3d96712a5..874849c57060954e2eb7810ae7e708fbd9df8488 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -710,26 +710,10 @@ compile_klibc() {
        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"
-               cp "${GK_SHARE}/pkg/byteswap.h" "include/"
-       else
-               echo "${GK_SHARE}/pkg/byteswap.h not found"
-       fi
+       sed -e 's:SHLIBDIR = /lib:SHLIBDIR = $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib:' -i scripts/Kbuild.install
        print_info 1 'klibc: >> Compiling...'
        ln -snf "${KERNEL_DIR}" linux || gen_die "Could not link to ${KERNEL_DIR}"
-       sed -i MCONFIG -e "s|prefix      =.*|prefix      = ${TEMP}/klibc-build|g"
-       # PPC fixup for 2.6.14
-       if [ "${VER}" -eq '2' -a "${PAT}" -eq '6' -a "${SUB}" -ge '14' ]
-        then
-               if [ "${ARCH}" = 'ppc' -o "${ARCH}" = 'ppc64' ]
-               then
-                       # Headers are moving around .. need to make them available
-                       echo 'INCLUDE += -I$(KRNLSRC)/arch/$(ARCH)/include' >> MCONFIG
-               fi
-       fi
+       sed -i Makefile -e "s|prefix      = /usr|prefix      = ${TEMP}/klibc-build|g"
        if [ "${ARCH}" = 'um' ]
        then
                compile_generic "ARCH=um" utils

diff --git a/genkernel b/genkernel
index 618e94f0930b678d9f7832a255302ec4d6718bf6..0bd2894f170c0d0daa00f3876115894e2195c7dd 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.11'
+GK_V='3.3.11_pre1'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.

diff --git a/pkg/byteswap.h b/pkg/byteswap.h
deleted file mode 100644 (file)
index d30b1cb..0000000
--- a/pkg/byteswap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * elf.h
- */
-
-#ifndef _BYTESWAP_H
-#define _BYTESWAP_H
-
-#define bswap_16(x) \
-       ((__u16)( \
-               (((__u16)(x) & (__u16)0x00ffU) << 8) | \
-               (((__u16)(x) & (__u16)0xff00U) >> 8) ))
-#define bswap_32(x) \
-       ((__u32)( \
-               (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
-               (((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
-               (((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
-               (((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
-#define bswap_64(x) \
-       ((__u64)( \
-               (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
-               (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
-               (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
-               (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
-               (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
-               (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
-               (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
-               (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
-
-#endif /* _BYTESWAP_H */
-