Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 29153 Details for
Bug 46278
Kernel module groups should be configurable
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
genkernel.patch
genkernel.patch (text/plain), 8.32 KB, created by
Paul Pacheco
on 2004-04-12 12:26:01 UTC
(
hide
)
Description:
genkernel.patch
Filename:
MIME Type:
Creator:
Paul Pacheco
Created:
2004-04-12 12:26:01 UTC
Size:
8.32 KB
patch
obsolete
>diff -ur genkernel.orig/alpha/modules_load genkernel/alpha/modules_load >--- genkernel.orig/alpha/modules_load 2004-04-12 11:54:28.124166344 -0500 >+++ genkernel/alpha/modules_load 2004-04-12 12:25:41.314398144 -0500 >@@ -1,4 +1,4 @@ >-SCSI_MODULES="sd_mod sg sr_mod \ >+MODULES_SCSI="sd_mod sg sr_mod \ > aic7xxx aic7xxx_old BusLogic \ > ncr53c8xx NCR53c406a \ > initio advansys aha1740 aha1542 aha152x \ >@@ -11,11 +11,13 @@ > dmx3191d dpt_i2o imm in2000 ips qla1280 \ > sim710 sym53c416" > >-FIREWIRE_MODULES="ieee1394 ohci1394 eth1394 sbp2" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="ataraid pdcraid hptraid" >+MODULES_FIREWIRE="ieee1394 ohci1394 eth1394 sbp2" > >-PCMCIA_MODULES="ide-cs" >+MODULES_ATARAID="ataraid pdcraid hptraid" > >-USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage" >+MODULES_PCMCIA="ide-cs" >+ >+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage" > >diff -ur genkernel.orig/gen_initrd.sh genkernel/gen_initrd.sh >--- genkernel.orig/gen_initrd.sh 2004-04-12 11:54:28.142163608 -0500 >+++ genkernel/gen_initrd.sh 2004-04-12 12:36:50.630646608 -0500 >@@ -92,6 +92,9 @@ > } > > create_initrd_modules() { >+ local group >+ local group_modules >+ > if [ "${PAT}" -gt "4" ] > then > MOD_EXT=".ko" >@@ -115,11 +118,11 @@ > cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp > > mkdir -p "${TEMP}/initrd-temp/etc/modules" >- print_list ${SCSI_MODULES} > "${TEMP}/initrd-temp/etc/modules/scsi" >- print_list ${FIREWIRE_MODULES} > "${TEMP}/initrd-temp/etc/modules/firewire" >- print_list ${ATARAID_MODULES} > "${TEMP}/initrd-temp/etc/modules/ataraid" >- print_list ${PCMCIA_MODULES} > "${TEMP}/initrd-temp/etc/modules/pcmcia" >- print_list ${USB_MODULES} > "${TEMP}/initrd-temp/etc/modules/usb" >+ >+ for group_modules in ${!MODULES_*}; do >+ group="$(echo $group_modules | cut -d_ -f2 | tr "[:upper:]" "[:lower:]")" >+ print_list ${!group_modules} > "${TEMP}/initrd-temp/etc/modules/${group}" >+ done > } > > create_initrd_aux() { >@@ -143,6 +146,14 @@ > else > cp "${GK_SHARE}/generic/initrd.defaults" "${TEMP}/initrd-temp/etc/initrd.defaults" > fi >+ >+ echo -n "HWOPTS=\"" >> "${TEMP}/initrd-temp/etc/initrd.defaults" >+ for group_modules in ${!MODULES_*}; do >+ group="$(echo $group_modules | cut -d_ -f2 | tr "[:upper:]" "[:lower:]")" >+ echo -n "${group} " >> "${TEMP}/initrd-temp/etc/initrd.defaults" >+ done >+ echo "\"" >> "${TEMP}/initrd-temp/etc/initrd.defaults" >+ > if [ -f "${GK_SHARE}/${ARCH}/modprobe" ] > then > cp "${GK_SHARE}/${ARCH}/modprobe" "${TEMP}/initrd-temp/sbin/modprobe" >diff -ur genkernel.orig/gen_moddeps.sh genkernel/gen_moddeps.sh >--- genkernel.orig/gen_moddeps.sh 2004-04-12 11:54:28.141163760 -0500 >+++ genkernel/gen_moddeps.sh 2004-04-12 12:25:41.316397840 -0500 >@@ -51,12 +51,13 @@ > > gen_dep_list() > { >+ local group_modules >+ > rm -f ${TEMP}/moddeps > /dev/null >- gen_deps ${SCSI_MODULES} >- gen_deps ${FIREWIRE_MODULES} >- gen_deps ${ATARAID_MODULES} >- gen_deps ${PCMCIA_MODULES} >- gen_deps ${USB_MODULES} >+ >+ for group_modules in ${!MODULES_*}; do >+ gen_deps ${!group_modules} >+ done > > # Only list each module once > cat ${TEMP}/moddeps | sort | uniq >diff -ur genkernel.orig/generic/initrd.defaults genkernel/generic/initrd.defaults >--- genkernel.orig/generic/initrd.defaults 2004-04-12 11:54:28.135164672 -0500 >+++ genkernel/generic/initrd.defaults 2004-04-12 12:39:01.042820944 -0500 >@@ -14,7 +14,7 @@ > KVER="${KMAJOR}.${KMINOR}" > MISCOPTS="cdcache idebug detect" > HWOPTS="scsi firewire ataraid pcmcia usb keymap cache" >-MY_HWOPTS="usb firewire" >+MY_HWOPTS="usb firewire fs" > QUIET=1 > ROOT_LINKS="bin sbin lib lib64 boot usr opt" > ROOT_TREES="etc root home var" >diff -ur genkernel.orig/parisc/modules_load genkernel/parisc/modules_load >--- genkernel.orig/parisc/modules_load 2004-04-12 11:54:28.136164520 -0500 >+++ genkernel/parisc/modules_load 2004-04-12 12:25:41.317397688 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="usb-ohci hid usb-storage" >+MODULES_PCMCIA="" >+ >+MODULES_USB="usb-ohci hid usb-storage" > >diff -ur genkernel.orig/parisc64/modules_load genkernel/parisc64/modules_load >--- genkernel.orig/parisc64/modules_load 2004-04-12 11:54:28.130165432 -0500 >+++ genkernel/parisc64/modules_load 2004-04-12 12:25:41.317397688 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="usb-ohci hid usb-storage" >+MODULES_PCMCIA="" >+ >+MODULES_USB="usb-ohci hid usb-storage" > >diff -ur genkernel.orig/ppc/modules_load genkernel/ppc/modules_load >--- genkernel.orig/ppc/modules_load 2004-04-12 11:54:28.118167256 -0500 >+++ genkernel/ppc/modules_load 2004-04-12 12:25:41.318397536 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="" >+MODULES_PCMCIA="" >+ >+MODULES_USB="" > >diff -ur genkernel.orig/ppc64/modules_load genkernel/ppc64/modules_load >--- genkernel.orig/ppc64/modules_load 2004-04-12 11:54:28.126166040 -0500 >+++ genkernel/ppc64/modules_load 2004-04-12 12:38:27.159971920 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="" >+MODULES_PCMCIA="" >+ >+MODULES_USB="" > >diff -ur genkernel.orig/sparc/modules_load genkernel/sparc/modules_load >--- genkernel.orig/sparc/modules_load 2004-04-12 11:54:28.127165888 -0500 >+++ genkernel/sparc/modules_load 2004-04-12 12:25:41.319397384 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="" >+MODULES_PCMCIA="" >+ >+MODULES_USB="" > >diff -ur genkernel.orig/sparc64/modules_load genkernel/sparc64/modules_load >--- genkernel.orig/sparc64/modules_load 2004-04-12 11:54:28.131165280 -0500 >+++ genkernel/sparc64/modules_load 2004-04-12 12:25:41.319397384 -0500 >@@ -1,10 +1,12 @@ >-SCSI_MODULES="" >+MODULES_SCSI="" > >-FIREWIRE_MODULES="" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="" >+MODULES_FIREWIRE="" > >-PCMCIA_MODULES="" >+MODULES_ATARAID="" > >-USB_MODULES="" >+MODULES_PCMCIA="" >+ >+MODULES_USB="" > >diff -ur genkernel.orig/x86/modules_load genkernel/x86/modules_load >--- genkernel.orig/x86/modules_load 2004-04-12 11:54:28.120166952 -0500 >+++ genkernel/x86/modules_load 2004-04-12 12:26:56.586954976 -0500 >@@ -1,4 +1,4 @@ >-SCSI_MODULES="sd_mod sg sr_mod \ >+MODULES_SCSI="sd_mod sg sr_mod \ > aic7xxx aic7xxx_old BusLogic \ > ncr53c8xx NCR53c406a \ > initio advansys aha1740 aha1542 aha152x \ >@@ -11,7 +11,13 @@ > dmx3191d dpt_i2o imm in2000 ips qla1280 \ > sim710 sym53c416" > >-FIREWIRE_MODULES="ieee1394 ohci1394 eth1394 sbp2" >-ATARAID_MODULES="ataraid pdcraid hptraid" >-PCMCIA_MODULES="ide-cs" >-USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage" >+MODULES_FS="ext3 reiserfs xfs ext2" >+ >+MODULES_FIREWIRE="ieee1394 ohci1394 eth1394 sbp2" >+ >+MODULES_ATARAID="ataraid pdcraid hptraid" >+ >+MODULES_PCMCIA="ide-cs" >+ >+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage" >+ >diff -ur genkernel.orig/x86_64/modules_load genkernel/x86_64/modules_load >--- genkernel.orig/x86_64/modules_load 2004-04-12 11:54:28.138164216 -0500 >+++ genkernel/x86_64/modules_load 2004-04-12 12:25:41.321397080 -0500 >@@ -1,7 +1,7 @@ >-SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx" >-#SCSI_MODULES="3w-xxxx sata_sil" >+MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx" >+#MODULES_SCSI="3w-xxxx sata_sil" > #sata_sil sata_promise sata_via \ >-#SCSI_MODULES="sd_mod sg sr_mod \ >+#MODULES_SCSI="sd_mod sg sr_mod \ > #aic7xxx aic7xxx_old BusLogic \ > #ncr53c8xx NCR53c406a \ > #initio advansys aha1740 aha1542 aha152x \ >@@ -15,11 +15,13 @@ > #dmx3191d dpt_i2o imm in2000 ips qla1280 \ > #qlogicfas qlogicfc qlogicisp \ > >-FIREWIRE_MODULES="ieee1394 ohci1394 sbp2" >+MODULES_FS="ext3 reiserfs xfs ext2" > >-ATARAID_MODULES="ataraid pdcraid hptraid" >+MODULES_FIREWIRE="ieee1394 ohci1394 sbp2" > >-PCMCIA_MODULES="ide-cs" >+MODULES_ATARAID="ataraid pdcraid hptraid" > >-USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage" >+MODULES_PCMCIA="ide-cs" >+ >+MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage" >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 46278
:
28392
|
29153
|
32202