Author: eelco
Date: Fri Sep 10 14:07:22 2010
New Revision: 23721
URL: https://svn.nixos.org/websvn/nix/?rev=23721&sc=1

Log:
* Move config-blocks.nix to zen-kernel where it's used.

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/config-blocks.nix
      - copied unchanged from r23708, 
nixpkgs/trunk/pkgs/os-specific/linux/kernel/config-blocks.nix
Deleted:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/config-blocks.nix
Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
   nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix     Fri Sep 
10 14:06:56 2010        (r23720)
+++ nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix     Fri Sep 
10 14:07:22 2010        (r23721)
@@ -4,7 +4,7 @@
   ...}:
 
 let 
-  conf = import ../kernel/config-blocks.nix; 
+  conf = import ./config-blocks.nix; 
 
 in
 

Modified: nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix     Fri Sep 
10 14:06:56 2010        (r23720)
+++ nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix     Fri Sep 
10 14:07:22 2010        (r23721)
@@ -4,7 +4,7 @@
   ...}:
 
 let 
-  conf = import ../kernel/config-blocks.nix; 
+  conf = import ./config-blocks.nix; 
 
   baseKernelVersion = "2.6.33";
   ZenSuffix = "zen1";

Copied: nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/config-blocks.nix (from 
r23708, nixpkgs/trunk/pkgs/os-specific/linux/kernel/config-blocks.nix)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/zen-kernel/config-blocks.nix   Fri Sep 
10 14:07:22 2010        (r23721, copy of r23708, 
nixpkgs/trunk/pkgs/os-specific/linux/kernel/config-blocks.nix)
@@ -0,0 +1,263 @@
+rec {
+      generalOptions = ''
+        # Don't include any debug features.
+        DEBUG_KERNEL n
+
+        # Support drivers that need external firmware.
+        STANDALONE n
+
+        # Make /proc/config.gz available.
+        IKCONFIG_PROC y
+
+        # Optimize with -O2, not -Os.
+        CC_OPTIMIZE_FOR_SIZE n
+
+        # Enable the kernel's built-in memory tester.
+        MEMTEST y
+
+        KALLSYMS_EXTRA_PASS n
+      '';
+      
+      virtualisation = ''
+        # Virtualisation (KVM, Xen...).
+        PARAVIRT_GUEST y
+        KVM_CLOCK y
+        KVM_GUEST y
+        XEN? y
+        KSM y
+
+        # We need 64 GB (PAE) support for Xen guest support.
+        HIGHMEM64G? y
+      '';
+
+      noPAE = ''
+        HIGHMEM64G? n
+        PAE? n
+      '';
+
+      usefulSubsystems = ''
+        # Enable various subsystems.
+        ACCESSIBILITY y # Accessibility support
+        AUXDISPLAY y # Auxiliary Display support
+        DONGLE y # Serial dongle support
+        HIPPI y
+        MTD_COMPLEX_MAPPINGS y # needed for many devices
+        NET_POCKET y # enable pocket and portable adapters
+        SCSI_LOWLEVEL y # enable lots of SCSI devices
+        SCSI_LOWLEVEL_PCMCIA y
+        SPI y # needed for many devices
+        SPI_MASTER y
+        WAN y
+      '';
+
+      cfq = ''
+        # Include the CFQ I/O scheduler in the kernel, rather than as a
+        # module, so that the initrd gets a good I/O scheduler.
+        IOSCHED_CFQ y
+      '';
+
+      noDebug = ''
+        # Disable some expensive (?) features.
+        FTRACE n
+        KPROBES n
+        PM_TRACE_RTC n
+
+        AIC79XX_DEBUG_ENABLE n
+        AIC7XXX_DEBUG_ENABLE n
+        AIC94XX_DEBUG n
+        USB_DEBUG n
+        CPU_FREQ_DEBUG n
+      '';
+
+      noNUMA = ''
+        NUMA? n
+      '';
+
+      networking = ''
+        # Networking options.
+        IP_PNP n
+        IPV6_PRIVACY y
+        NETFILTER_ADVANCED y
+        IP_VS_PROTO_TCP y
+        IP_VS_PROTO_UDP y
+        IP_VS_PROTO_ESP y
+        IP_VS_PROTO_AH y
+        IP_DCCP_CCID3 n # experimental
+        CLS_U32_PERF y
+        CLS_U32_MARK y
+      '';
+
+      wireless = ''
+        # Wireless networking.
+        IPW2100_MONITOR y # support promiscuous mode
+        IPW2200_MONITOR y # support promiscuous mode
+        IWLWIFI_LEDS? y
+        IWLWIFI_SPECTRUM_MEASUREMENT y
+        IWL3945_SPECTRUM_MEASUREMENT y
+        IWL4965 y # Intel Wireless WiFi 4965AGN
+        IWL5000 y # Intel Wireless WiFi 5000AGN
+        HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP 
driver
+        HOSTAP_FIRMWARE_NVRAM y
+      '';
+
+      fb = ''
+        # Enable various FB devices.
+        FB y
+        FB_EFI y
+        FB_NVIDIA_I2C y # Enable DDC Support
+        FB_RIVA_I2C y
+        FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+        FB_ATY_GX y # Mach64 GX support
+        FB_SAVAGE_I2C y
+        FB_SAVAGE_ACCEL y
+        FB_SIS_300 y
+        FB_SIS_315 y
+        FB_3DFX_ACCEL y
+        FB_GEODE y
+      '';
+
+      fbNoTileBlit = ''
+        # Disable tileblitting
+        FB_TILEBLITTING n
+        FB_S3 n
+        FB_VT8623 n
+        FB_ARK n
+      '';
+
+      fbConDecor = ''
+        ${fb}
+        ${fbNoTileBlit}
+        FRAMEBUFFER_CONSOLE y
+        FB_VESA y
+        FB_CON_DECOR y
+      '';
+
+      sound = ''
+        # Sound.
+        SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+        SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+        SND_USB_CAIAQ_INPUT y
+        PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+      '';
+
+      usbserial = ''
+        # USB serial devices.
+        USB_SERIAL_GENERIC y # USB Generic Serial Driver
+        USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial 
devices
+        USB_SERIAL_KEYSPAN_USA28 y
+        USB_SERIAL_KEYSPAN_USA28X y
+        USB_SERIAL_KEYSPAN_USA28XA y
+        USB_SERIAL_KEYSPAN_USA28XB y
+        USB_SERIAL_KEYSPAN_USA19 y
+        USB_SERIAL_KEYSPAN_USA18X y
+        USB_SERIAL_KEYSPAN_USA19W y
+        USB_SERIAL_KEYSPAN_USA19QW y
+        USB_SERIAL_KEYSPAN_USA19QI y
+        USB_SERIAL_KEYSPAN_USA49W y
+        USB_SERIAL_KEYSPAN_USA49WLC y
+      '';
+
+      fsXattr = ''
+        # Filesystem options - in particular, enable extended attributes and
+        # ACLs for all filesystems that support them.
+        EXT2_FS_XATTR y # Ext2 extended attributes
+        EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+        EXT2_FS_SECURITY y # Ext2 Security Labels
+        EXT2_FS_XIP y # Ext2 execute in place support
+        EXT4_FS_POSIX_ACL y
+        EXT4_FS_SECURITY y
+        REISERFS_FS_XATTR y
+        REISERFS_FS_POSIX_ACL y
+        REISERFS_FS_SECURITY y
+        JFS_POSIX_ACL y
+        JFS_SECURITY y
+        XFS_QUOTA y
+        XFS_POSIX_ACL y
+        XFS_RT y # XFS Realtime subvolume support
+        OCFS2_DEBUG_MASKLOG n
+        OCFS2_FS_POSIX_ACL? y
+        BTRFS_FS_POSIX_ACL y
+        UBIFS_FS_XATTR y
+        UBIFS_FS_ADVANCED_COMPR y
+        NFSD_V2_ACL y
+        NFSD_V3 y
+        NFSD_V3_ACL y
+        NFSD_V4 y
+        CIFS_XATTR y
+        CIFS_POSIX y
+      '';
+
+      security = ''
+        # Security related features.
+        STRICT_DEVMEM y # Filter access to /dev/mem
+        SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+      '';
+
+      blockDevices = ''
+        BLK_DEV_BSG n
+        BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+        BLK_DEV_IDEACPI y # IDE ACPI support
+        BLK_DEV_INTEGRITY y
+      '';
+
+      bluetooth = ''
+        BT_HCIUART_BCSP y
+        BT_HCIUART_H4 y # UART (H4) protocol support
+        BT_HCIUART_LL y
+        BT_RFCOMM_TTY y # RFCOMM TTY support
+      '';
+
+      misc = ''
+        # Misc. options.
+        8139TOO_8129 y
+        8139TOO_PIO n # PIO is slower
+        B43_PCMCIA y
+        BSD_PROCESS_ACCT_V3 y
+        CRASH_DUMP n
+        DMAR? n # experimental
+        DVB_DYNAMIC_MINORS y # we use udev
+        FUSION y # Fusion MPT device support
+        IDE_GD_ATAPI y # ATAPI floppy support
+        IRDA_ULTRA y # Ultra (connectionless) protocol
+        JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+        JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+        JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+        JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+        LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+        LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+        LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+        LOGO n # not needed
+        MEDIA_ATTACH y
+        MEGARAID_NEWGEN y
+        MICROCODE_AMD y
+        MODVERSIONS y
+        MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+        MTRR_SANITIZER y
+        NET_FC y # Fibre Channel driver support
+        PCI_LEGACY y
+        PPP_MULTILINK y # PPP multilink support
+        REGULATOR y # Voltage and Current Regulator Support
+        SCSI_LOGGING y # SCSI logging facility
+        SERIAL_8250 y # 8250/16550 and compatible serial support
+        SLIP_COMPRESSED y # CSLIP compressed headers
+        SLIP_SMART y
+        THERMAL_HWMON y # Hardware monitoring support
+        USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+        X86_CHECK_BIOS_CORRUPTION y
+        X86_MCE y
+      '';
+
+      bfsched = ''
+        SCHED_BFS y
+        NO_HZ n
+        HZ_1000 n
+        HZ_300 y
+        HZ 300
+      '';
+
+      forceCFSched = ''
+        SCHED_CFS? y
+        SCHED_BFS? n
+        NO_HZ? y
+      '';
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to