--- smage/branches/alx-0_6_0/include/kernel26.sminc	2011/01/22 23:14:38	1661
+++ smage/branches/alx-0_6_0/include/kernel26.sminc	2011/01/22 23:34:45	1664
@@ -1,5 +1,5 @@
 # kernel26 global smage functions
-# $Header: /alx-cvs/smage/include/kernel26.sminc,v 1.4 2006/04/03 20:08:07 niro Exp $
+# $Id$
 
 # needed extra vars:
 #   ${KERNEL_TYPE}:   needed, 'sources' or 'image'
@@ -10,10 +10,45 @@
 #   ${PSUBVER}:       optional, only needed for 2.6.x.x naming scheme
 #   ${EXTRAVERSION}:  optinal, extra version for the kernel name
 #                     default setting is ${PSUBVER}-${BRANCH}-${PBUILD}
+#   ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.)
 
-EXTRAVERSION="${PSUBVER}-${BRANCH}-${PBUILD}"
+sminclude mtools
+
+# remove me when all distris support this:
+if [[ ${USE_KERNEL_ARCH_EXTENSION} = true ]]
+then
+	KERNEL_ARCH_EXTENSION="-${ARCH}"
+else
+	KERNEL_ARCH_EXTENSION=""
+fi
+
+# some sane defaults
+: ${SRCFILE="linux-${PVER/${PSUBVER}/}.tar.bz2"}
+: ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
+
+: ${SRC_URI=(
+	http://www.kernel.org/pub/linux/kernel/v${PVER:0:3}/${SRCFILE}
+	mirror://kernel26-${BRANCH}/${SRCFILE}
+	mirror://kernel26-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-i686
+	mirror://kernel26-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-x86_64
+)}
+
+: ${DEPEND=">= sys-apps/module-init-tools-3.2
+	>= sys-fs/udev-115
+	>= sys-apps/mkinitrd-5.0.8
+	>= sys-apps/initscripts-0.4.3"}
+
+: ${PROVIDE="virtual/kernel"}
+
+EXTRAVERSION="${PSUBVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}"
 KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD}-${ARCH}"
 
+# special vars for mage file only
+KPVER="${PVER}"
+KPBUILD="${PBUILD}"
+KBRANCH="${BRANCH}"
+SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"
+
 kernel26_src_prepare()
 {
 	munpack ${SRCFILE} || die
@@ -38,21 +73,22 @@
 
 	# inject our kernel config
 	cp ${KERNEL_CONFIG} ${SRCDIR}/.config || die
-	make oldconfig || die
+	make ARCH=${ARCH/i*86/x86} oldconfig || die
 
 	case ${KERNEL_TYPE} in
 		image)
-			mmake || die
+			mmake ARCH=${ARCH/i*86/x86} || die
 			;;
 
 		sources)
 			make clean || die
 
 			# needed to compile other programs like iptables
-			make prepare || die
+			make ARCH=${ARCH/i*86/x86} prepare || die
 			# needed to cover >=2.6.14 builds
-			make prepare-all || die
-			make scripts || die
+			# but deprecated with >=2.6.21, prepare cover all targets there
+			[[ $(echo ${PVER} | sed "s:\.::g") < 2621 ]] && { make ARCH=${ARCH/i*86/x86} prepare-all || die; }
+			make ARCH=${ARCH/i*86/x86} scripts || die
 
 			# at least alsa-drivers needs this one ...
 			touch include/linux/autoconf.h || die
@@ -65,56 +101,69 @@
 	cd ${SRCDIR}
 
 	# needed directories
-	install -d ${BINDIR}/boot || die
+	minstalldir /boot || die
 
 	# install modules
-	make INSTALL_MOD_PATH=${BINDIR} modules_install || die
+	make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR} modules_install || die
 
 	# install kernelimage
-	local my_arch="${ARCH}"
-	[[ ${my_arch} = i*86 ]] && my_arch=i386
-	install -m 0644 -o root -g root \
-		arch/${my_arch}/boot/bzImage \
-		${BINDIR}/boot/kernel-${PVER}-${BRANCH}-${PBUILD} \
-		|| die
+	if [[ -z ${KERNEL_IMAGE_PATH} ]]
+	then
+		local my_arch="${ARCH}"
+		[[ ${my_arch} = i*86 ]] && my_arch=i386
+		minstallfile arch/${my_arch}/boot/bzImage \
+			/boot/kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+			|| die
+	else
+		minstallfile ${KERNEL_IMAGE_PATH} \
+			/boot/kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+			|| die
+	fi
 
 	# install System.map
-	install -m 0644 -o root -g root \
-		System.map \
-		${BINDIR}/boot/System.map-${PVER}-${BRANCH}-${PBUILD} \
+	minstallfile System.map \
+		/boot/System.map-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+		|| die
+
+	# install Module.symvers in boot and /usr/src
+	minstallfile Module.symvers \
+		/boot/Module.symvers-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+		|| die
+	minstalldir /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} || die
+	minstallfile Module.symvers \
+		/usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
 		|| die
 
 	# install kernel description
 	echo "
-KRNVER=${BRANCH}-${PVER}-${ARCH}-${PBUILD}
-KRNLIB=${PVER}-${BRANCH}-${PBUILD}
-KRNIMG=kernel-${PVER}-${BRANCH}-${PBUILD}
+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
 
 	# install kernel-config from srcdir
-	install -m 0644 -o root -g root \
-		.config \
-		${BINDIR}/boot/config-${PVER}-${BRANCH}-${PBUILD} \
+	minstallfile .config \
+		/boot/config-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
 		|| die
 
 	# fix build symlink
-	if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/build ]
+	if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ]
 	then
 		echo "fixing build symlink"
-		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/build || die
-		ln -snf /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
-			${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/build \
+		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die
+		mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
+			/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
 			|| die
 	fi
 
 	# and fixing source symlink
-	if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/source ]
+	if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ]
 	then
 		echo "fixing source symlink"
-		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/source || die
-		ln -snf /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
-			${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}/source \
+		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die
+		mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
+			/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
 			|| die
 	fi
 }
@@ -127,7 +176,7 @@
 	tar cvjf ${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}.tar.bz2 $(basename ${SRCDIR}) || die
 
 	echo "Moving linux-${PVER}-${BRANCH}-${PBUILD} tarball to \${BINDIR}/usr/src ... "
-	install -d ${BINDIR}/usr/src || die
+	minstalldir /usr/src || die
 	mv ${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}.tar.bz2 ${BINDIR}/usr/src || die
 }
 
@@ -155,7 +204,7 @@
 		kernel-modules-${PVER}-${BRANCH}-${PBUILD} || die
 
 	echo "Moving kernel-modules-${PVER}-${BRANCH}-${PBUILD} tarball to \${BINDIR}/usr/src ... "
-	install -d ${BINDIR}/usr/src || die
+	minstalldir /usr/src || die
 	mv ${BUILDDIR}/kernel-modules-${PVER}-${BRANCH}-${PBUILD}.tar.bz2 ${BINDIR}/usr/src || die
 }
 
@@ -210,4 +259,105 @@
 	echo ${mod_suffix}
 }
 
+kernel26_image_preinstall()
+{
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		mount /boot &> /dev/null
+	fi
+}
+
+kernel26_image_preremove()
+{
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		mount /boot &> /dev/null
+	fi
+}
+
+kernel26_image_postremove()
+{
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		# remove old image entry from grub
+		new-kernel-pkg -v --rminitrd --remove ${KPVER}-${KBRANCH}-${KPBUILD}
+	fi
+}
+
+kernel26_image_postinstall()
+{
+	[ ! -d ${MROOT}/sys ] && install -d ${MROOT}/sys
+
+	# fixes a small glitch in <=mage-0.3.6-r15 with symlinks
+	[ -f ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD} ] && \
+		rm ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}
+
+	[ -x ${MROOT}/sbin/depmod ] &&
+		${MROOT}/sbin/depmod -ae \
+			-F /boot/System.map-${KPVER}-${KBRANCH}-${KPBUILD} \
+			${KPVER}-${KBRANCH}-${KPBUILD}
+
+	# do not run this if ${MROOT} is set !
+	if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
+	then
+		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
+}
+
+kernel26_sources_postinstall()
+{
+	# check for linux-VERSION/include as the kernel-image installs
+	# the file Modules.symver in the linux-VERSION directory
+	if [ ! -d ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}/include ]
+	then
+		echo "Unpacking linux-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "
+		tar xvjf ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src
+	fi
+
+	if [ ! -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ] &&
+		[ -f ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 ]
+	then
+		echo "Unpacking kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "
+		tar xvjf ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src
+	fi
+
+	# if not exist create linux symlink
+	if [ ! -h ${MROOT}/usr/src/linux ]
+	then
+		echo "Creating linux -> linux-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "
+		[ ! -d ${MROOT}/usr/src ] && install ${MROOT}/usr/src
+		ln -snf ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD} \
+			${MROOT}/usr/src/linux || die
+	fi
+
+	# if not exist create kernel-modules symlink
+	if [ ! -h ${MROOT}/usr/src/kernel-modules ] &&
+		[ -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ]
+	then
+		echo "Creating kernel-modules -> kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "
+		[ ! -d ${MROOT}/usr/src ] && install ${MROOT}/usr/src
+		ln -snf ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} \
+			${MROOT}/usr/src/kernel-modules || die
+	fi
+}
+
 export_inherits kernel26 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"
+		;;
+	sources)
+		export_inherits kernel26_sources postinstall
+		SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel26_sources_postinstall"
+		;;
+esac