diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a52da35 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +AUTHORS ident +BUGS ident +ChangeLog ident +HACKING ident +README ident +TODO ident +genkernel ident +*.conf ident +*.sh ident diff --git a/AUTHORS b/AUTHORS index 12ccbef..3ac777d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,5 @@ +# $Id$ + This list is split into two alphabetical lists. The first is a listing of the authors of the original Gentoo package. The copyrights for all of those code contributions belong to the Gentoo Foundation. The second list is the authors diff --git a/BUGS b/BUGS index 03049c8..84c366c 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,5 @@ +# $Id$ + This file lists out some known bugs which need to be resolved. Do not file bug reports against these bugs, as the genkernel team is aware of them and has yet to implement a solution. diff --git a/ChangeLog b/ChangeLog index 7ff705e..1e16904 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,23 +1,83 @@ # ChangeLog for genkernel # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 +# $Id$ + + 25 Jul 2009; Chris Gianelloni genkernel.conf, + .gitattributes: + Adding Id header and Ident for genkernel.conf + + 25 Jul 2009; Chris Gianelloni + arch/alpha/config.sh, arch/arm/config.sh, arch/ia64/config.sh, + arch/mips/config.sh, arch/parisc/config.sh, arch/parisc64/config.sh, + arch/ppc/config.sh, arch/ppc64/config.sh, arch/sparc/config.sh, + arch/sparc64/config.sh, arch/um/config.sh, arch/x86/config.sh, + arch/x86_64/config.sh, defaults/config.sh, gen_arch.sh, gen_bootloader.sh, + gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh, + gen_funcs.sh, gen_initramfs.sh, gen_moddeps.sh, gen_package.sh: + Adding Id header. + + 25 Jul 2009; Chris Gianelloni genkernel, + .gitattributes: + Adding Id header and enabling Ident on *.sh files. + + 25 Jul 2009; Chris Gianelloni AUTHORS, BUGS, + HACKING, README, TODO: + Adding Id header. + + 25 Jul 2009; Chris Gianelloni .gitattributes: + Adding additional files to .gitattributes to enable Ident. + + 25 Jul 2009; Chris Gianelloni +.gitattributes: + Adding .gitattributes file. + + 19 Jul 2009; Andrew Gaffney defaults/initrd.scripts: + Change command used to determine real filename for REAL_RESUME for Gentoo + bug #269603 + + 19 Jul 2009; Andrew Gaffney arch/alpha/modules_load, + arch/arm/modules_load, arch/ia64/modules_load, arch/mips/modules_load, + arch/parisc/modules_load, arch/parisc64/modules_load, + arch/ppc/modules_load, arch/ppc64/modules_load, arch/sparc/modules_load, + arch/sparc64/modules_load, arch/um/modules_load, arch/x86/modules_load, + arch/x86_64/modules_load, defaults/modules_load: + Add aic94xx to MODULES_SCSI for Gentoo bug #277792 + + 12 Jul 2009; Andrew Gaffney arch/x86/kernel-config, + arch/x86_64/kernel-config: + enable CONFIG_SYSFS_DEPRECATED=y in x86/x86_64 kernel-config for Gentoo + bug #225249 + + 12 Jul 2009; Andrew Gaffney gen_initramfs.sh: + Apply patch for Gentoo bug #276753 for new lvm.static binary + + 07 Jul 2009; Chris Gianelloni genkernel: + Version bumping to 3.4.10.905 for release. + + 04 Jul 2009; Andrew Gaffney gen_funcs.sh, genkernel: + Remove code to check for host kernel LOOP support for Gentoo bug #275757 + + 28 Jun 2009; Andrew Gaffney defaults/modprobe, + genkernel.conf: + Restore BOOTLOADER="grub" example line in genkernel.conf for Gentoo bug + #274768 12 May 2009; Andrew Gaffney arch/x86/modules_load, defaults/initrd.scripts: - Apply fix to deference links for gentoo bug #269603 + Apply fix to deference links for Gentoo bug #269603 09 May 2009; Andrew Gaffney arch/x86/modules_load: foo 09 May 2009; Andrew Gaffney arch/x86/modules_load, arch/x86_64/modules_load: - Add dm-crypt module for gentoo bug #269042 + Add dm-crypt module for Gentoo bug #269042 24 Apr 2009; Chris Gianelloni genkernel: Rolling a new genkernel 3.4.10.904 version for testing. 17 Apr 2009; Andrew Gaffney netboot/busy-config: - Apply patch from gentoo bug #266373 for additional options in the netboot + Apply patch from Gentoo bug #266373 for additional options in the netboot busy-config 06 Mar 2009; Andrew Gaffney gen_initramfs.sh: @@ -37,7 +97,7 @@ 20 Feb 2009; Andrew Gaffney arch/sparc64/config.sh, gen_compile.sh, gen_funcs.sh, gen_package.sh: - Add support for multiple possible kernel binary paths for gentoo bug + Add support for multiple possible kernel binary paths for Gentoo bug #255085 04 Feb 2009; Andrew Gaffney defaults/linuxrc: @@ -46,10 +106,10 @@ 19 Jan 2009; Andrew Gaffney defaults/initrd.scripts, defaults/linuxrc: - Remove detect_sbp2_devices() for gentoo bug #239474 + Remove detect_sbp2_devices() for Gentoo bug #239474 16 Jan 2009; Andrew Gaffney genkernel.conf: - Add commented out DISKLABEL=yes option for gentoo bug #229847 + Add commented out DISKLABEL=yes option for Gentoo bug #229847 08 Jan 2009; Chris Gianelloni TODO: Added more verbosity to the auto-detection section. @@ -98,7 +158,7 @@ Allow old 'initramfs' option instead of 'ramdisk' for compatability 17 Dec 2008; Andrew Gaffney defaults/linuxrc: - Remove the use of 'env -i' when calling switch_root due to gentoo bug + Remove the use of 'env -i' when calling switch_root due to Gentoo bug #248688 16 Dec 2008; Andrew Gaffney netboot/linuxrc.x: @@ -171,7 +231,7 @@ Explicitly set UTILS_{CC,LD,AS} if UTILS_CROSS_COMPILE is set 14 Dec 2008; Andrew Gaffney gen_cmdline.sh: - Typo fix for gentoo bug #250875 + Typo fix for Gentoo bug #250875 14 Dec 2008; Chris Gianelloni arch/alpha/config.sh, arch/arm/config.sh, arch/ia64/config.sh, @@ -201,7 +261,7 @@ 13 Dec 2008; Andrew Gaffney defaults/linuxrc, gen_cmdline.sh, gen_determineargs.sh, gen_initramfs.sh: Add --real-root= parameter to specify a default for real_root= in the - initramfs for gentoo bug #249783 + initramfs for Gentoo bug #249783 12 Dec 2008; Andrew Gaffney -arch/alpha/busy-config, -arch/arm/busy-config, -arch/ia64/busy-config, -arch/mips/busy-config, @@ -234,7 +294,7 @@ Enable CONFIG_MAKEDEVS in busy-config for netboot 09 Dec 2008; Andrew Gaffney gen_initramfs.sh: - s/aux/luks/ for gentoo bug #250330 + s/aux/luks/ for Gentoo bug #250330 07 Dec 2008; Andrew Gaffney arch/alpha/busy-config, arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config, @@ -262,13 +322,13 @@ 17 Nov 2008; Andrew Gaffney gen_initramfs.sh: Break apart cryptsetup stuff into separate append_luks() and make - append_auxillary() dependent on ${BUSYBOX} for gentoo bug #247052 + append_auxillary() dependent on ${BUSYBOX} for Gentoo bug #247052 15 Nov 2008; Andrew Gaffney defaults/linuxrc: - Applied patch for UUID support for real_resume= from gentoo bug #239687 + Applied patch for UUID support for real_resume= from Gentoo bug #239687 15 Nov 2008; Andrew Gaffney gen_determineargs.sh: - Added modified version of patch from gentoo bug #238707 + Added modified version of patch from Gentoo bug #238707 14 Nov 2008; Andrew Gaffney gen_initramfs.sh: Only append unionfs_fuse stuff if UNIONFS is set @@ -293,7 +353,7 @@ pairs 14 Nov 2008; Andrew Gaffney defaults/linuxrc: - Skip good_root check for /dev/nfs for gentoo bug #246759 + Skip good_root check for /dev/nfs for Gentoo bug #246759 14 Nov 2008; Andrew Gaffney defaults/initrd.scripts: Simplify implementation of parse_opt in linuxrc @@ -386,7 +446,7 @@ arch/sparc/busy-config, arch/sparc64/busy-config, arch/um/busy-config, arch/x86/busy-config, arch/x86_64/busy-config, defaults/busy-config: Enabling CONFIG_WGET and CONFIG_FEATURE_TAR_BZIP2 for initial support of - gentoo bug 211976 + Gentoo bug #211976 31 Oct 2008; Chris Gianelloni genkernel: Tagging a 3.4.10.901 release, for testing. Adding periods to ChangeLog to diff --git a/HACKING b/HACKING index 35db81b..02081d3 100644 --- a/HACKING +++ b/HACKING @@ -1,3 +1,5 @@ +# $Id$ + This document is a work-in-progress to describe the workflow through the various parts of genkernel so that we can split the code into modular chunks. If you are interested in helping with genkernel development, contact Chris Gianelloni diff --git a/README b/README index f0be325..7a83e38 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +# $Id$ + DEPENDANCIES: - GCC and binutils - GNU Bash diff --git a/TODO b/TODO index 9b9fbd7..afa1b5c 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +# $Id$ + - Need configs for other currently-unsupported arches - Make configs stackable - Move modules_load to /etc/genkernel diff --git a/arch/alpha/config.sh b/arch/alpha/config.sh index 9168d29..44494f1 100755 --- a/arch/alpha/config.sh +++ b/arch/alpha/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load index f54dd7b..3edfddd 100644 --- a/arch/alpha/modules_load +++ b/arch/alpha/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/arm/config.sh b/arch/arm/config.sh index 91c87e1..52ec777 100755 --- a/arch/arm/config.sh +++ b/arch/arm/config.sh @@ -1,3 +1,4 @@ +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/arm/modules_load b/arch/arm/modules_load index 2e93dce..6147ac4 100644 --- a/arch/arm/modules_load +++ b/arch/arm/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/ia64/config.sh b/arch/ia64/config.sh index 0373b27..38f1bc1 100755 --- a/arch/ia64/config.sh +++ b/arch/ia64/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load index d38cd40..daa67df 100644 --- a/arch/ia64/modules_load +++ b/arch/ia64/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/mips/config.sh b/arch/mips/config.sh index 3a54c46..05b3c82 100755 --- a/arch/mips/config.sh +++ b/arch/mips/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/mips/modules_load b/arch/mips/modules_load index f54dd7b..3edfddd 100644 --- a/arch/mips/modules_load +++ b/arch/mips/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/parisc/config.sh b/arch/parisc/config.sh index db6a73c..3e2049f 100755 --- a/arch/parisc/config.sh +++ b/arch/parisc/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load index f54dd7b..3edfddd 100644 --- a/arch/parisc/modules_load +++ b/arch/parisc/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/parisc64/config.sh b/arch/parisc64/config.sh index db6a73c..3e2049f 100755 --- a/arch/parisc64/config.sh +++ b/arch/parisc64/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load index d38cd40..daa67df 100644 --- a/arch/parisc64/modules_load +++ b/arch/parisc64/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/ppc/config.sh b/arch/ppc/config.sh index e8102be..e86e926 100755 --- a/arch/ppc/config.sh +++ b/arch/ppc/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load index f54dd7b..3edfddd 100644 --- a/arch/ppc/modules_load +++ b/arch/ppc/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/ppc64/config.sh b/arch/ppc64/config.sh index e8102be..e86e926 100755 --- a/arch/ppc64/config.sh +++ b/arch/ppc64/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load index d38cd40..daa67df 100644 --- a/arch/ppc64/modules_load +++ b/arch/ppc64/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh index 887c0d3..34cec73 100755 --- a/arch/sparc/config.sh +++ b/arch/sparc/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load index f54dd7b..3edfddd 100644 --- a/arch/sparc/modules_load +++ b/arch/sparc/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh index d3edb96..d1e37d5 100755 --- a/arch/sparc64/config.sh +++ b/arch/sparc64/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load index d38cd40..daa67df 100644 --- a/arch/sparc64/modules_load +++ b/arch/sparc64/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/um/config.sh b/arch/um/config.sh index 0f3d9cf..070602e 100755 --- a/arch/um/config.sh +++ b/arch/um/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/um/modules_load b/arch/um/modules_load index 38e8f71..6db5652 100644 --- a/arch/um/modules_load +++ b/arch/um/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/x86/config.sh b/arch/x86/config.sh index df72b1b..7f339ea 100755 --- a/arch/x86/config.sh +++ b/arch/x86/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config index 27a1e9c..12ca2c6 100644 --- a/arch/x86/kernel-config +++ b/arch/x86/kernel-config @@ -78,7 +78,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_FAIR_USER_SCHED=y # CONFIG_FAIR_CGROUP_SCHED is not set CONFIG_CGROUP_CPUACCT=y -# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_SYSFS_DEPRECATED=y CONFIG_PROC_PID_CPUSET=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y diff --git a/arch/x86/modules_load b/arch/x86/modules_load index 6f420ef..e3f0177 100644 --- a/arch/x86/modules_load +++ b/arch/x86/modules_load @@ -11,7 +11,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/arch/x86_64/config.sh b/arch/x86_64/config.sh index 5751c6c..8e692e8 100755 --- a/arch/x86_64/config.sh +++ b/arch/x86_64/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config index cfadcc7..7656dc9 100644 --- a/arch/x86_64/kernel-config +++ b/arch/x86_64/kernel-config @@ -74,7 +74,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_FAIR_USER_SCHED=y # CONFIG_FAIR_CGROUP_SCHED is not set CONFIG_CGROUP_CPUACCT=y -# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_SYSFS_DEPRECATED=y CONFIG_PROC_PID_CPUSET=y # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load index 7f8f69a..c706d56 100644 --- a/arch/x86_64/modules_load +++ b/arch/x86_64/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-crypt dm-bbr raid0 raid1 raid456 # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/defaults/config.sh b/defaults/config.sh index df72b1b..7f339ea 100755 --- a/defaults/config.sh +++ b/defaults/config.sh @@ -1,5 +1,4 @@ -#!/bin/bash - +# $Id$ # # Arch-specific options that normally shouldn't be changed. # diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 1ccab59..a3478af 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -869,7 +869,7 @@ rundebugshell() { swsusp_resume() { # determine swap resume partition - local device=$(ls -Ll "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 6-7 | sed 's/,\ */:/') + local device=$(ls -lL "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \ -f 5-6 | sed 's/,\ */:/') [ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume return 0 } diff --git a/defaults/modprobe b/defaults/modprobe index 1591c42..8790122 100755 --- a/defaults/modprobe +++ b/defaults/modprobe @@ -22,7 +22,7 @@ modules_dep_list() { echo 'modules_dep_list(): Improper usage!' exit 1 fi - cat /lib/modules/${KV}/modules.dep | grep ${1}${KSUFF}\: | cut -d\: -f2 + cat /lib/modules/${KV}/modules.dep | grep /"${1}${KSUFF}:" | cut -d':' -f2 } @@ -84,6 +84,7 @@ modprobe2() { real_path=`real_mod_path ${1}` if [ "${real_path}" = '' -o "${real_path}" = ' ' ] then + [ "${2}" = '-n' ] && echo -n " -> $1" echo ' module not found.' exit 2 fi diff --git a/defaults/modules_load b/defaults/modules_load index f54dd7b..15ad3e5 100644 --- a/defaults/modules_load +++ b/defaults/modules_load @@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai # Hardware (IDE/SCSI/SATA) MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata" MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma" -MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc" +MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx" MODULES_WAITSCAN="scsi_wait_scan" # Hardware (Network) diff --git a/gen_arch.sh b/gen_arch.sh index 7cb9a99..079edb2 100755 --- a/gen_arch.sh +++ b/gen_arch.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ get_official_arch() { if [ "${CMD_ARCHOVERRIDE}" != '' ] diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 2eb628b..9b1deef 100755 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -1,3 +1,5 @@ +# $Id$ + set_bootloader() { case "${BOOTLOADER}" in grub) diff --git a/gen_cmdline.sh b/gen_cmdline.sh index c274217..94b4260 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ longusage() { echo "Gentoo Linux Genkernel ${GK_V}" diff --git a/gen_compile.sh b/gen_compile.sh index 9c3e0f0..1c28519 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ compile_kernel_args() { local ARGS diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 9296793..ebc6fde 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ determine_config_file() { if [ "${CMD_KERNEL_CONFIG}" != "" ] diff --git a/gen_determineargs.sh b/gen_determineargs.sh index c853a43..d911f07 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ get_KV() { if [ "${NO_KERNEL_SOURCES}" = '1' -a -e "${KERNCACHE}" ] diff --git a/gen_funcs.sh b/gen_funcs.sh index 3a5f492..e4a1c4a 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ isTrue() { case "$1" in @@ -236,23 +237,6 @@ gen_die() { exit 1 } -has_loop() { - if [ -e /var/log/dmesg ] - then - cat /var/log/dmesg | egrep -q '^loop:' - else - dmesg | egrep -q '^loop:' - fi - if [ -e '/dev/loop0' -o -e '/dev/loop/0' -a ${PIPESTATUS[1]} ] - then - # We found a standard dev loop device, assume loop is compiled into the - # kernel or the module is loaded - return 0 - else - return 1 - fi -} - isBootRO() { return $(awk '( $2 == "'${BOOTDIR}'" && $4 ~ /(^|,)ro(,|$)/){ I=1; exit }END{print !I }' /proc/mounts); diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 979994a..9f66b71 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ CPIO_ARGS="--quiet -o -H newc" @@ -217,7 +218,12 @@ append_lvm(){ cd ${TEMP} mkdir -p "${TEMP}/initramfs-lvm-temp/bin/" mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/" - if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable' + if [ -e '/sbin/lvm.static' ] + then + print_info 1 ' LVM: Adding support (using local static binaries)...' + cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" || + gen_die 'Could not copy over lvm!' + elif [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable' then print_info 1 ' LVM: Adding support (using local static binaries)...' cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" || diff --git a/gen_moddeps.sh b/gen_moddeps.sh index caf60f2..5aeb84f 100755 --- a/gen_moddeps.sh +++ b/gen_moddeps.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ modules_kext() { diff --git a/gen_package.sh b/gen_package.sh index 3b0c046..60cbce0 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ gen_minkernpackage() { print_info 1 'Creating minimal kernel package' diff --git a/genkernel b/genkernel index 0da2a56..ef925a6 100755 --- a/genkernel +++ b/genkernel @@ -1,7 +1,8 @@ #!/bin/bash +# $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='3.4.10.904' +GK_V='3.4.10.905' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option. @@ -129,23 +130,6 @@ dump_debugcache NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..." -if [ "${BUILD_RAMDISK}" -ne '0' ] -then - if ! has_loop - then - modprobe loop 2>/dev/null - sleep 3 - if ! has_loop - then - print_error 1 'The build-host kernel does not appear to have loop device support.' - print_error 1 'Please load loop support before running genkernel!' - gen_die 'Load loop support!' - else - print_info 1 'loop: "loop" module loaded successfully...' - fi - fi -fi - # Check BOOTDIR is mounted if isTrue ${CMD_NOINSTALL} then diff --git a/genkernel.conf b/genkernel.conf index 0cb6a46..240d613 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -1,4 +1,5 @@ # Configuration file for genkernel +# $Id$ # This file is sourced by genkernel at startup and determines which options # we will be using to compile our kernel. The order of precidence is simple, @@ -79,6 +80,9 @@ USECOLOR="yes" # Enable disklabel support (copies blkid to initrd) # DISKLABEL="yes" +# Add new kernel to grub? +# BOOTLOADER="grub" + # =========Low Level Compile Settings========= # # GNU Make to use for kernel. See also the --kernel-make command line option.