From: Tim Yamin <plasmaroo@gentoo.org>
Date: Fri, 25 Feb 2005 16:56:40 +0000 (+0000)
Subject: >> 3.1.0k -- Add MODULES_SATA, fix udev on non-x86 archs where there seem to be probl... 
X-Git-Tag: v3.4.10.902~578
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef068ec0277d6fa48896de2d3b62f6c8989ace75;p=genkernel.git

>> 3.1.0k -- Add MODULES_SATA, fix udev on non-x86 archs where there seem to be problems with KLibC+udev so use a static udev on those.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@174 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_compile.sh b/gen_compile.sh
index 4fd67f9..ae63f93 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -612,9 +612,14 @@ compile_udev() {
 
 		cd "${UDEV_DIR}"
 		print_info 1 'udev: >> Compiling...'
-		ln -snf "${KERNEL_DIR}" klibc/linux ||
-			gen_die "Could not link to ${KERNEL_DIR}"
-		compile_generic "KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
+
+		if [ "${ARCH}" = 'x86' ]
+		then
+			ln -snf "${KERNEL_DIR}" klibc/linux || gen_die "Could not link to ${KERNEL_DIR}"
+			compile_generic "KERNEL_DIR=$KERNEL_DIR USE_KLIBC=true USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
+		else
+			LDFLAGS='--static' compile_generic "-e KERNEL_DIR=$KERNEL_DIR USE_LOG=false DEBUG=false udevdir=/dev all etc/udev/udev.conf" utils
+		fi
 		strip udev || gen_die 'Failed to strip the udev binary!'
 
 		print_info 1 '      >> Installing...'
diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index a195abb..8e9cafb 100644
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -17,8 +17,8 @@ MISCOPTS='idebug detect'
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
 
-HWOPTS='usb firewire keymap cache lvm2 evms2'
-MY_HWOPTS='usb firewire lvm2 evms2'
+HWOPTS='usb firewire keymap cache lvm2 evms2 sata'
+MY_HWOPTS='usb firewire lvm2 evms2 sata'
 
 QUIET=1
 ROOT_LINKS='bin sbin lib lib64 boot usr opt'
diff --git a/genkernel b/genkernel
index e096d98..26bf6be 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.0k'
+GK_V='3.1.0l'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
@@ -251,10 +251,10 @@ fi
 if [ "${BUILD_INITRD}" -eq '1' ]
 then
 	# Compile dietlibc
-	if [ "${USE_DIETLIBC}" = '1' ]
-	then
-		compile_dietlibc
-	fi
+	# if [ "${USE_DIETLIBC}" = '1' ]
+	# then
+	#	compile_dietlibc
+	# fi
 
 	# Compile Busybox
 	compile_busybox
diff --git a/x86/modules_load b/x86/modules_load
index 385420c..b1a34fc 100644
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -6,10 +6,11 @@ dtc fdomain gdth pas16 pci2220i pci2000 psi240i \
 qlogicfas qlogicfc qlogicisp \
 seagate t128  u14-34f ultrastor wd7000  \
 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 \
-sim710 sym53c416"
+sim710 sym53c416 dc395x"
 
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs"
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 MODULES_LVM2="dm-mod dm-snapshot dm-mirror"
+MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse ahci"
diff --git a/x86_64/modules_load b/x86_64/modules_load
index 378f0c7..285a826 100644
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -1,6 +1,6 @@
-MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx sd_mod sata_nv sata_sis sata_via sata_sil sata_promise"
+MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx sd_mod"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="ide-cs"
 MODULES_USB="ehci-hcd uhci-hcd ohci-hcd hid usb-storage"
-
+MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse ahci"