--- trunk/core/include/kernel26.sminc	2009/02/08 22:51:56	1075
+++ trunk/core/include/kernel26.sminc	2009/06/10 17:03:29	1935
@@ -1,5 +1,5 @@
 # kernel26 global smage functions
-# $Header: /magellan-cvs/smage/include/kernel26.sminc,v 1.25 2008/05/24 09:33:17 niro Exp $
+# $Id$
 
 # needed extra vars:
 #   ${KERNEL_TYPE}:   needed, 'sources' or 'image'
@@ -12,6 +12,8 @@
 #                     default setting is ${PSUBVER}-${BRANCH}-${PBUILD}
 #   ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.)
 
+sminclude mtools
+
 # remove me when all distris support this:
 if [[ ${USE_KERNEL_ARCH_EXTENSION} = true ]]
 then
@@ -99,7 +101,7 @@
 	cd ${SRCDIR}
 
 	# needed directories
-	install -d ${BINDIR}/boot || die
+	minstalldir /boot || die
 
 	# install modules
 	make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR} modules_install || die
@@ -109,21 +111,18 @@
 	then
 		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}${KERNEL_ARCH_EXTENSION} \
+		minstallfile arch/${my_arch}/boot/bzImage \
+			/boot/kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
 			|| die
 	else
-		install -m 0644 -o root -g root \
-			${KERNEL_IMAGE_PATH} \
-			${BINDIR}/boot/kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+		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}${KERNEL_ARCH_EXTENSION} \
+	minstallfile System.map \
+		/boot/System.map-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
 		|| die
 
 	# install kernel description
@@ -135,9 +134,8 @@
 " > ${BINDIR}/boot/kernelversion || die
 
 	# install kernel-config from srcdir
-	install -m 0644 -o root -g root \
-		.config \
-		${BINDIR}/boot/config-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
+	minstallfile .config \
+		/boot/config-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION} \
 		|| die
 
 	# fix build symlink
@@ -145,8 +143,8 @@
 	then
 		echo "fixing build symlink"
 		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die
-		ln -snf /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
-			${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
+		mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
+			/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
 			|| die
 	fi
 
@@ -155,8 +153,8 @@
 	then
 		echo "fixing source symlink"
 		rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die
-		ln -snf /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
-			${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
+		mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
+			/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
 			|| die
 	fi
 }
@@ -169,7 +167,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
 }
 
@@ -197,7 +195,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
 }