--- trunk/include/kernel.sminc	2012/10/09 07:54:18	13439
+++ trunk/include/kernel.sminc	2014/09/05 06:47:42	22123
@@ -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
 
@@ -57,7 +63,7 @@
 : ${PCAT="sys-kernel"}
 : ${HOMEPAGE="http://magellan-linux.de/"}
 : ${TARBALLPVER="${PVER}"}
-: ${SRCFILE="linux-${TARBALLPVER}.tar.bz2"}
+: ${SRCFILE="linux-${TARBALLPVER}.tar.xz"}
 : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
 
 if [[ -z ${SRC_URI[*]} ]]
@@ -78,11 +84,19 @@
 	esac
 fi
 
+case ${PNAME} in
+	*-lts) _upparam="longterm" ;;
+	*) _upparam="stable" ;;
+esac
+
+UP2DATE="updatecmd http://www.kernel.org/ | grep -A1 -i '${_upparam}:' | sed 's/.*:\ \([0-9]\.[0-9].*\)\ [0-9].*/\1/;q'"
+
 case ${KERNEL_TYPE} in
 	image)
 		: ${PROVIDE="virtual/kernel"}
 		: ${DEPEND=">= virtual/module-tools
 			>= sys-fs/udev-115
+			>= sys-apps/grubby-8.29-r1
 			>= virtual/initramfs-tools
 			>= virtual/initscripts"}
 			if [[ ! -z ${LINUX_FIRMWARE}  ]] && [[ ${LINUX_FIRMWARE} != internal ]]
@@ -90,6 +104,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 +127,13 @@
 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()
+{
+	return 0
+}
 
 kernel_src_prepare()
 {
@@ -123,6 +145,7 @@
 	chmod -R a+r-w+X,u+w ${SRCDIR} || die
 
 	cd ${SRCDIR}
+	kernel_apply_patches || die
 
 	# fixes INSTALL_PATH to /boot and EXTRAVERSION
 	sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
@@ -180,6 +203,8 @@
 
 			# at least alsa-drivers needs this one ...
 			touch include/linux/autoconf.h || die
+
+			# compat symlink for 3.7.x new version.h location until everything is fixed
 			;;
 	esac
 }
@@ -222,13 +247,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 \
@@ -391,15 +419,9 @@
 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
 	then
 		mount /boot &> /dev/null
-	fi
-}
 
-kernel_image_postremove()
-{
-	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
-	then
 		# remove old image entry from grub
-		new-kernel-pkg -v --rminitrd --rmmodep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
+		new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
 	fi
 }
 
@@ -422,12 +444,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()
@@ -474,8 +499,8 @@
 # export pre/postinstall functions depending on KERNEL_TYPE
 case ${KERNEL_TYPE} in
 	image)
-		export_inherits kernel_image preinstall preremove postinstall postremove
-		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall kernel_image_postremove"
+		export_inherits kernel_image preinstall preremove postinstall
+		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall"
 		;;
 	sources)
 		export_inherits kernel_sources postinstall