--- smage/trunk/include/kernel.sminc	2011/09/06 18:26:19	2936
+++ smage/trunk/include/kernel.sminc	2011/09/06 18:31:29	2937
@@ -1,4 +1,4 @@
-# kernel26 global smage functions
+# kernel global smage functions
 # $Id$
 
 # needed extra vars:
@@ -49,7 +49,7 @@
 KBRANCH="${BRANCH}"
 SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"
 
-kernel26_src_prepare()
+kernel_src_prepare()
 {
 	munpack ${SRCFILE} || die
 	mv ${BUILDDIR}/linux-${PVER/${PSUBVER}/} ${SRCDIR} || die
@@ -65,7 +65,7 @@
 		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die
 }
 
-kernel26_src_compile()
+kernel_src_compile()
 {
 	cd ${SRCDIR}
 
@@ -96,7 +96,7 @@
 	esac
 }
 
-kernel26_image_src_install()
+kernel_image_src_install()
 {
 	cd ${SRCDIR}
 
@@ -168,7 +168,7 @@
 	fi
 }
 
-kernel26_sources_src_install()
+kernel_sources_src_install()
 {
 	cd ${BUILDDIR}
 
@@ -181,8 +181,8 @@
 }
 
 # installs module-sources path/to/SRCDIR to MODDIR/MODNAME
-# kernel26_external_modules_install path/to/SRCDIR DESTDIRNAME
-kernel26_external_modules_install()
+# kernel_external_modules_install path/to/SRCDIR DESTDIRNAME
+kernel_external_modules_install()
 {
 	cd ${BUILDDIR}
 
@@ -195,7 +195,7 @@
 	mv ${modsrc} ${moddir}/${moddest} || die
 }
 
-kernel26_external_modules_tarball()
+kernel_external_modules_tarball()
 {
 	cd ${BUILDDIR}
 
@@ -208,15 +208,15 @@
 	mv ${BUILDDIR}/kernel-modules-${PVER}-${BRANCH}-${PBUILD}.tar.bz2 ${BINDIR}/usr/src || die
 }
 
-kernel26_src_install()
+kernel_src_install()
 {
 	case ${KERNEL_TYPE} in
 		image)
-			kernel26_image_src_install || die
+			kernel_image_src_install || die
 			;;
 
 		sources)
-			kernel26_sources_src_install || die
+			kernel_sources_src_install || die
 			;;
 	esac
 }
@@ -259,7 +259,7 @@
 	echo ${mod_suffix}
 }
 
-kernel26_image_preinstall()
+kernel_image_preinstall()
 {
 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
 	then
@@ -267,7 +267,7 @@
 	fi
 }
 
-kernel26_image_preremove()
+kernel_image_preremove()
 {
 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
 	then
@@ -275,7 +275,7 @@
 	fi
 }
 
-kernel26_image_postremove()
+kernel_image_postremove()
 {
 	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
 	then
@@ -284,7 +284,7 @@
 	fi
 }
 
-kernel26_image_postinstall()
+kernel_image_postinstall()
 {
 	[ ! -d ${MROOT}/sys ] && install -d ${MROOT}/sys
 
@@ -311,7 +311,7 @@
 		ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd
 }
 
-kernel26_sources_postinstall()
+kernel_sources_postinstall()
 {
 	# check for linux-VERSION/include as the kernel-image installs
 	# the file Modules.symver in the linux-VERSION directory
@@ -348,16 +348,16 @@
 	fi
 }
 
-export_inherits kernel26 src_prepare src_compile src_install
+export_inherits kernel src_prepare src_compile src_install
 
 # export pre/postinstall functions depending on KERNEL_TYPE
 case ${KERNEL_TYPE} in
 	image)
-		export_inherits kernel26_image preinstall preremove postinstall postremove
-		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel26_image_preinstall kernel26_image_preremove kernel26_image_postinstall kernel26_image_postremove"
+		export_inherits kernel_image preinstall preremove postinstall postremove
+		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall kernel_image_postremove"
 		;;
 	sources)
-		export_inherits kernel26_sources postinstall
-		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel26_sources_postinstall"
+		export_inherits kernel_sources postinstall
+		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_sources_postinstall"
 		;;
 esac