denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added patch from Fabio Erculiani <lxnay@lxnaydesign.net> to fix unionfs compilation. This is for bug #152945.

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@481 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 18 years ago
parent c6619d5f91
commit 01a16e0aa2
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File

5
ChangeLog
Unescape View File

@ -2,6 +2,11 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
gen_compile.sh, genkernel:
Added patch from Fabio Erculiani <lxnay@lxnaydesign.net> to fix unionfs
compilation. This is for bug #152945.
08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh, 08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
gen_funcs.sh: gen_funcs.sh:
Added patch from Martin Parm <parmus@diku.dk> to fix the --no-color option. Added patch from Martin Parm <parmus@diku.dk> to fix the --no-color option.

6
gen_cmdline.sh
Unescape View File

@ -209,7 +209,8 @@ parse_cmdline() {
;; ;;
--unionfs) --unionfs)
echo echo
print_warning 1 "WARNING: unionfs support is in active development and is not meant for general use." print_warning 1 "WARNING: unionfs support is in active development and is not meant for general"
print_warning 1 "use."
print_warning 1 "DISABLING UNIONFS SUPPORT AT THIS TIME." print_warning 1 "DISABLING UNIONFS SUPPORT AT THIS TIME."
echo echo
;; ;;
@ -217,7 +218,8 @@ parse_cmdline() {
CMD_UNIONFS=1 CMD_UNIONFS=1
print_info 2 "CMD_UNIONFS: $CMD_UNIONFS" print_info 2 "CMD_UNIONFS: $CMD_UNIONFS"
echo echo
print_warning 1 "WARNING: unionfs support is in active development and is not meant for general use." print_warning 1 "WARNING: unionfs support is in active development and is not meant for general"
print_warning 1 "use."
print_warning 1 "Bug Reports without patches/fixes will be ignored." print_warning 1 "Bug Reports without patches/fixes will be ignored."
print_warning 1 "Use at your own risk as this could blow up your system." print_warning 1 "Use at your own risk as this could blow up your system."
print_warning 1 "This code is subject to change at any time." print_warning 1 "This code is subject to change at any time."

19
gen_compile.sh
Unescape View File

@ -327,9 +327,9 @@ compile_unionfs_modules() {
gen_die "Could not find unionfs source tarball: ${UNIONFS_SRCTAR}!" gen_die "Could not find unionfs source tarball: ${UNIONFS_SRCTAR}!"
cd "${TEMP}" cd "${TEMP}"
rm -rf ${UNIONFS_DIR} > /dev/null rm -rf ${UNIONFS_DIR} > /dev/null
rm -rf unionfs > /dev/null rm -rf unionfs* > /dev/null
mkdir -p unionfs mkdir unionfs
/bin/tar -zxpf ${UNIONFS_SRCTAR} || /bin/tar xzpf ${UNIONFS_SRCTAR} ||
gen_die 'Could not extract unionfs source tarball!' gen_die 'Could not extract unionfs source tarball!'
[ -d "${UNIONFS_DIR}" ] || [ -d "${UNIONFS_DIR}" ] ||
gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!' gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!'
@ -338,6 +338,7 @@ compile_unionfs_modules() {
echo "LINUXSRC=${KERNEL_DIR}" >> fistdev.mk echo "LINUXSRC=${KERNEL_DIR}" >> fistdev.mk
echo 'TOPINC=-I$(LINUXSRC)/include' >> fistdev.mk echo 'TOPINC=-I$(LINUXSRC)/include' >> fistdev.mk
echo "MODDIR= /lib/modules/${KV}" >> fistdev.mk echo "MODDIR= /lib/modules/${KV}" >> fistdev.mk
echo "KVERS=${KV}" >> fistdev.mk
echo "KERNELVERSION=${KV}" >> fistdev.mk echo "KERNELVERSION=${KV}" >> fistdev.mk
# Fix for hardened/selinux systems to have extened attributes # Fix for hardened/selinux systems to have extened attributes
# per r2d2's request. Also add -DUNIONFS_UNSUPPORTED for 2.6.16 # per r2d2's request. Also add -DUNIONFS_UNSUPPORTED for 2.6.16
@ -350,11 +351,13 @@ compile_unionfs_modules() {
if [ "${PAT}" -ge '6' ] if [ "${PAT}" -ge '6' ]
then then
cd "${TEMP}" # ARCH is used by unionfs - and conflicts with genkernel
cd "${UNIONFS_DIR}" ARCH_PUSH=${ARCH}
unset ARCH
# Compile unionfs module within the unionfs # Compile unionfs module within the unionfs
# environment not within the kernelsrc dir # environment not within the kernelsrc dir
make unionfs.ko || gen_die 'failed to compile unionfs' make unionfs.ko || gen_die 'failed to compile unionfs'
ARCH=${ARCH_PUSH}
else else
gen_die 'unionfs is only supported on 2.6 targets' gen_die 'unionfs is only supported on 2.6 targets'
fi fi
@ -386,7 +389,7 @@ compile_unionfs_utils() {
gen_die "Could not find unionfs source tarball: ${UNIONFS_SRCTAR}!" gen_die "Could not find unionfs source tarball: ${UNIONFS_SRCTAR}!"
cd "${TEMP}" cd "${TEMP}"
rm -rf ${UNIONFS_DIR} > /dev/null rm -rf ${UNIONFS_DIR} > /dev/null
rm -rf unionfs > /dev/null rm -rf unionfs* > /dev/null
mkdir -p unionfs/sbin mkdir -p unionfs/sbin
/bin/tar -zxpf ${UNIONFS_SRCTAR} || /bin/tar -zxpf ${UNIONFS_SRCTAR} ||
gen_die 'Could not extract unionfs source tarball!' gen_die 'Could not extract unionfs source tarball!'
@ -394,9 +397,13 @@ compile_unionfs_utils() {
gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!' gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!'
cd "${UNIONFS_DIR}" cd "${UNIONFS_DIR}"
print_info 1 'unionfs tools: >> Compiling...' print_info 1 'unionfs tools: >> Compiling...'
sed -i utils/Makefile -e 's|${CC} -o|${CC} -static -o|g'
sed -i Makefile -e 's|${CC} -o|${CC} -static -o|g' sed -i Makefile -e 's|${CC} -o|${CC} -static -o|g'
compile_generic utils utils compile_generic utils utils
if [ ! -e "uniondbg" ]; then
cd utils
fi
print_info 1 'unionfs: >> Copying to cache...' print_info 1 'unionfs: >> Copying to cache...'
strip uniondbg unionctl strip uniondbg unionctl
cp uniondbg ${TEMP}/unionfs/sbin/ || cp uniondbg ${TEMP}/unionfs/sbin/ ||

2
genkernel
Unescape View File

@ -2,7 +2,7 @@
# Genkernel v3 # Genkernel v3
PATH="/bin:/usr/bin:/sbin:/usr/sbin" PATH="/bin:/usr/bin:/sbin:/usr/sbin"
GK_V='3.4.6' GK_V='3.4.7_pre1'
TMPDIR='/var/tmp/genkernel' TMPDIR='/var/tmp/genkernel'
TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$ TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$

Write Preview
Loading…
Cancel
Save