>> 3.1.0k -- Add MODULES_SATA, fix udev on non-x86 archs where there seem to be probl...

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 4fd67f9bb092cf4043b4631d04b908a6f1faf88b..ae63f9378f6ad25c74b40aca0c234f4c56e440fb 100644 (file)
--- 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 a195abba84a59dbaff623468196aad8194619170..8e9cafb9be703894d3513da3a9a6d3c2e449f95f 100644 (file)
--- 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 e096d984d37a5e8db96f590ee2ffbe807914a211..26bf6befd510d68aed1afa08f59137a7c367a13a 100755 (executable)
--- 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 385420ce5ce17939a7749f06d926e9a9286c1d7a..b1a34fc920c2a6005af45c8ec3439c5075de2946 100644 (file)
--- 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 378f0c783e99f39f6dbc86bf9f26f619156d2e76..285a826d35a40960071e3bbe8018041197a919ad 100644 (file)
--- 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"