From 874474391d5d9813c39414f8232f6b01d162e659 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 11 Jul 2007 03:20:07 +0000
Subject: [PATCH] 	* merged r21183, r21220, r21420 from kernel-cleanup2: 
 	* changed linux26 to not install the patches, because that's the job
 of linux26-src 		* changed linux26 to not run mkinitrd, because
 that has to be done hooked - close #340 		* changed linux26 to
 also run depmod on stage 1 and improved to fix lib/modules/*/source symlink

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21650 10447126-35f2-4685-b0cf-6dd780d3921f
---
 base/linux26/linux26.conf | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/base/linux26/linux26.conf b/base/linux26/linux26.conf
index cedbc93ab..de29d8fc4 100644
--- a/base/linux26/linux26.conf
+++ b/base/linux26/linux26.conf
@@ -1,4 +1,3 @@
-#!/bin/sh
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
@@ -131,39 +130,21 @@ main_lx() {
 			abort "At least one of the 3rd party kernel modules failed!"
 		fi
 
-	  if atstage native; then
-		echo "Running 'depmod -a -q -F /boot/System.map ${lx_kernelrelease}' ..."
-		depmod -a -q -F $root/boot/System.map_${lx_kernelrelease} ${lx_kernelrelease}
+		echo "Running 'depmod -ae -b ${root:-/} -q -F /boot/System.map ${lx_kernelrelease}' ..."
+		depmod -ae -b ${root:-/} -q -F $root/boot/System.map_${lx_kernelrelease} ${lx_kernelrelease}
 
 		# due static depmod :-(
 		for x in $moduledir/modules.*
 		do [ -f $x ] && add_flist $x; done
 
-		[ -z "`type -p mkinitrd`" ] || mkinitrd ${lx_kernelrelease}
-	  else
-		# In theory depmod here as well ...
-		[ ! -e $root/sbin/mkinitrd ] || sh $root/sbin/mkinitrd -R $root ${lx_kernelrelease}
-	  fi
-
-	  echo "Fixing /lib/modules/${ver}/build symlink ..."
-	  rm -f $root/lib/modules/${lx_kernelrelease}/build
-	  ln -sf ../../../usr/src/linux-${lx_kernelrelease} \
-	     $root/lib/modules/${lx_kernelrelease}/build
+		echo "Fixing /lib/modules/${ver}/build and source symlinks ..."
+		for x in build source; do
+			rm -f $root/lib/modules/${lx_kernelrelease}/$x
+			ln -snf ../../../usr/src/linux-${lx_kernelrelease} \
+				$root/lib/modules/${lx_kernelrelease}/$x
+		done
 	fi
 
-	echo "Copying kernel patches ..."
-	(
-	 cd $root/usr/src/
-	 rm -rf linux$treever-patches ; mkdir -p linux$treever-patches
-	 echo -e "This directory contains all the applied patches, used\n\
-to build the kernel (in addition to the official kernel sources)." > \
-		linux$treever-patches/README
-	 for x in $patchfiles ; do
-		# if the patch does not exist it was downloaded or so
-		# and we just do not copy it ...
-		[ -f $x ] && cp -v $x linux$treever-patches/ || true
-	 done
-	)
 }
 
 custmain="main_lx"