Updated the unionfs compiling section. This *should* allow unionfs to build on suppo...

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 82701aff1b7eb961f0226d851009c82e51ee1662..9b8c02aafd4edfb3df2624c5c6fa5cb18e9ddaa2 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -332,11 +332,17 @@ compile_unionfs_modules() {
                        gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!'
                cd "${UNIONFS_DIR}"
                print_info 1 'unionfs modules: >> Compiling...'
-               sed -i Makefile -e "s|LINUXSRC =.*|LINUXSRC =${KERNEL_DIR}|g"
-               
-               #Fix for hardened/selinux systems to have extened attributes
-               #per r2d2's request
-               sed -i Makefile -e "s|#  \(EXTRACFLAGS=-DUNIONFS_XATTR -DFIST_SETXATTR_CONSTVOID\)|\1|g"
+               echo "LINUXSRC=${KERNEL_DIR}" >> fistdev.mk
+               echo "MODDIR= /lib/modules/${KV}" >> fistdev.mk
+               echo "KERNELVERSION=${KV}" >> fistdev.mk
+               # Fix for hardened/selinux systems to have extened attributes
+               # per r2d2's request
+               echo "EXTRACFLAGS=-DUNIONFS_XATTR -DFIST_SETXATTR_CONSTVOID" \
+                       >> fistdev.mk
+               # Here we do something really nasty and disable debugging, along with
+               # change our default CFLAGS
+               echo "UNIONFS_DEBUG_CFLAG=-DUNIONFS_NDEBUG" >> fistdev.mk
+               echo "UNIONFS_OPT_CFLAG= -O2 -pipe" >> fistdev.mk
 
                if [ "${PAT}" -ge '6' ]
                then
@@ -346,9 +352,9 @@ compile_unionfs_modules() {
                
                        cd "${TEMP}"
                        cd "${UNIONFS_DIR}"
-                       compile_generic unionfs2.6 kernel
+                       compile_generic unionfs.ko kernel
                else
-                       compile_generic unionfs2.4 kernel
+                       gen_die 'unionfs is only supported on 2.6 targets'
                fi
                print_info 1 'unionfs: >> Copying to cache...'
        

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

diff --git a/genkernel.8 b/genkernel.8
index d5df2689917de6f2d6b93cf95c9f454d6d0218b7..9c24889fe8c2749141aa25418890724c0347fc07 100644 (file)
--- a/genkernel.8
+++ b/genkernel.8
@@ -190,7 +190,7 @@ or compile static LVM2 binaries if static ones do not exist.
 Force devfs on 2.6 series kernels. Not recommended or supported.
 .TP
 \fB\-\-unionfs\fR
-Add unionfs support.
+Add unionfs support. This is completely unsupported and may be broken.
 .TP
 \fB\-\-linuxrc=\fR<file>
 Use <file> for the linuxrc instead of the genkernel linuxrc.