--- trunk/include/kernel.sminc	2013/08/14 10:47:24	18717
+++ trunk/include/kernel.sminc	2013/08/14 11:08:46	18720
@@ -16,6 +16,12 @@
 #                        set the version here like USE_LINUX_FIRMARE="20110605"
 #                        version "internal" keeps the bits too
 #
+#  ${INCLUDE_KERNELVERSION_FILE}: creates a /boot/kernelversion file (deprecated)
+#  ${USE_KERNEL_SYMLINKS}: creates symlinks to unversioned kernel image files
+#			   - kernel-x.x.x.x -> /boot/vmlinuz
+#			   - initrd-x.x.x.x -> /boot/initrd
+#			   - config-x.x.x.x -> /boot/config
+#			   - System.map-x.x.x.x -> /boot/System.map
 
 sminclude mtools
 
@@ -90,6 +96,8 @@
 				DEPEND="${DEPEND}
 					>= sys-kernel/linux-firmware-${LINUX_FIRMWARE}"
 			fi
+		SDEPEND="${SDEPEND}
+			>= sys-dev/bc-1.06"
 		: ${DESCRIPTION="Kernel image of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."}
 		;;
 
@@ -111,7 +119,7 @@
 KPVER="${PVER}"
 KPBUILD="${PBUILD}"
 KBRANCH="${BRANCH}"
-SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"
+SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH USE_KERNEL_SYMLINKS"
 
 # dummy function to apply kernel patches
 kernel_apply_patches()
@@ -229,13 +237,16 @@
 		/usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
 		|| die
 
-	# install kernel description
-	echo "
-KRNVER=${BRANCH}-${PVER}-${ARCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}
-KRNLIB=${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}
-KRNIMG=kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}
-KRNINITRD=
-" > ${BINDIR}/boot/kernelversion || die
+	if [[ ${INCLUDE_KERNELVERSION_FILE} = true ]]
+	then
+		MCONFIG=/boot/kernelversion
+		# install kernel description
+		mclearconfig || die
+		maddconfig "KRNVER=${BRANCH}-${PVER}-${ARCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
+		maddconfig "KRNLIB=${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
+		maddconfig "KRNIMG=kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
+		maddconfig "KRNINITRD=" || die
+	fi
 
 	# install kernel-config from srcdir
 	minstallfile .config \
@@ -429,12 +440,15 @@
 		new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}
 	fi
 
-	# symlink actual kernel to /boot/vmlinuz etc...
-	ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz
-	ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map
-	ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config
-	[[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&
-		ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd
+	if [[ ${USE_KERNEL_SYMLINKS} = true ]]
+	then
+		# symlink actual kernel to /boot/vmlinuz etc...
+		ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz
+		ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map
+		ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config
+		[[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&
+			ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd
+	fi
 }
 
 kernel_sources_postinstall()