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
cleanup-cruft
Chris Gianelloni 19 years ago
parent 3af2ff6360
commit f63898c3dd

@ -351,7 +351,7 @@ compile_unionfs_modules() {
cd "${UNIONFS_DIR}" cd "${UNIONFS_DIR}"
# 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 make unionfs.ko || gen_die 'failed to compile unionfs'
else else
gen_die 'unionfs is only supported on 2.6 targets' gen_die 'unionfs is only supported on 2.6 targets'
fi fi
@ -361,9 +361,9 @@ compile_unionfs_modules() {
if [ -f unionfs.ko ] if [ -f unionfs.ko ]
then 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 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 fi
cd ${TEMP}/unionfs cd ${TEMP}/unionfs

@ -125,6 +125,13 @@ DMRAID_DIR="dmraid/${DMRAID_VER}"
DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2" DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2"
DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.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_VER="VERSION_UNIONFS"
UNIONFS_DIR="unionfs-${UNIONFS_VER}" UNIONFS_DIR="unionfs-${UNIONFS_VER}"
UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-${UNIONFS_VER}.tar.gz" UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-${UNIONFS_VER}.tar.gz"

Loading…
Cancel
Save