From f63898c3ddc389f7a7cfa63d89ed517b71e0222d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 11 Aug 2006 19:55:20 +0000 Subject: [PATCH] Add in the kernel version compatibility table from http://www.am-utils.org/project-unionfs.html and ensure that genkernel dies if the unionfs module fails to build. Until now, it would fail and the build would continue without it. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@424 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- gen_compile.sh | 6 +++--- genkernel.conf | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index dd6ea58..ac5045f 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -351,7 +351,7 @@ compile_unionfs_modules() { cd "${UNIONFS_DIR}" # Compile unionfs module within the unionfs # environment not within the kernelsrc dir - make unionfs.ko + make unionfs.ko || gen_die 'failed to compile unionfs' else gen_die 'unionfs is only supported on 2.6 targets' fi @@ -361,9 +361,9 @@ compile_unionfs_modules() { if [ -f unionfs.ko ] then - cp unionfs.ko ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs/unionfs + cp -f unionfs.ko ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs/unionfs else - cp unionfs.o ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs/unionfs + cp -f unionfs.o ${TEMP}/unionfs/lib/modules/${KV}/kernel/fs/unionfs fi cd ${TEMP}/unionfs diff --git a/genkernel.conf b/genkernel.conf index d0f857a..eebb1c0 100755 --- a/genkernel.conf +++ b/genkernel.conf @@ -125,6 +125,13 @@ DMRAID_DIR="dmraid/${DMRAID_VER}" DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2" DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2" +# Kernel Version Compatibility +# (from http://www.am-utils.org/project-unionfs.html) + +# 2.6.9 - 2.6.15 1.1.5 +# 2.6.16 1.2 +# 2.6.17 1.3 + UNIONFS_VER="VERSION_UNIONFS" UNIONFS_DIR="unionfs-${UNIONFS_VER}" UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-${UNIONFS_VER}.tar.gz" -- 2.26.2