From af26af6fc7aa26ca5482cc8e79d1b09422f105ee Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 14 Feb 2013 14:33:42 -0500
Subject: [PATCH] Remove EOL'd Linux 3.6
---
pkgs/os-specific/linux/kernel/linux-3.6.nix | 275 --------------------
pkgs/os-specific/linux/kernel/patches.nix | 14 -
pkgs/top-level/all-packages.nix | 14 -
pkgs/top-level/release-cross.nix | 1 -
4 files changed, 304 deletions(-)
delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.6.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix
deleted file mode 100644
index 987f14f0921..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.6.nix
+++ /dev/null
@@ -1,275 +0,0 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
-
-let
- configWithPlatform = kernelPlatform :
- ''
- # Power management and debugging for powertop.
- DEBUG_KERNEL y
- PM_ADVANCED_DEBUG y
- PM_RUNTIME y
- TIMER_STATS y
- USB_SUSPEND y
- BACKTRACE_SELF_TEST n
- CPU_NOTIFIER_ERROR_INJECT? n
- DEBUG_DEVRES n
- DEBUG_NX_TEST n
- DEBUG_STACK_USAGE n
- DEBUG_STACKOVERFLOW n
- RCU_TORTURE_TEST n
- SCHEDSTATS 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
-
- # 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
- BLK_CGROUP y # required by CFQ
-
- # Enable NUMA.
- NUMA? y
-
- # Disable some expensive (?) features.
- FTRACE n
- KPROBES n
- PM_TRACE_RTC n
-
- # 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
- SCSI_LOWLEVEL y # enable lots of SCSI devices
- SCSI_LOWLEVEL_PCMCIA y
- SPI y # needed for many devices
- SPI_MASTER y
- WAN y
-
- # 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 networking.
- IPW2100_MONITOR y # support promiscuous mode
- IPW2200_MONITOR? y # support promiscuous mode
- HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
- HOSTAP_FIRMWARE_NVRAM y
- ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
- ATH9K_AHB y # Ditto, AHB bus
- B43_PHY_HT y
- BCMA_HOST_PCI y
-
- # Some settings to make sure that fbcondecor works - in particular,
- # disable tileblitting and the drivers that need it.
-
- # 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
-
- # Video configuration
- # Enable KMS for devices whose X.org driver supports it.
- DRM_I915_KMS y
- DRM_RADEON_KMS y
- # Hybrid graphics support
- VGA_SWITCHEROO y
-
- # 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)
-
- # 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
-
- # 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
- 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
- NFS_FSCACHE y
- CIFS_XATTR y
- CIFS_POSIX y
- CIFS_FSCACHE y
-
- # Security related features.
- STRICT_DEVMEM y # Filter access to /dev/mem
- SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
- # Misc. options.
- 8139TOO_8129 y
- 8139TOO_PIO n # PIO is slower
- AIC79XX_DEBUG_ENABLE n
- AIC7XXX_DEBUG_ENABLE n
- AIC94XX_DEBUG n
- B43_PCMCIA y
- BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
- BLK_DEV_IDEACPI y # IDE ACPI support
- BLK_DEV_INTEGRITY y
- BSD_PROCESS_ACCT_V3 y
- BT_HCIUART_BCSP y
- BT_HCIUART_H4 y # UART (H4) protocol support
- BT_HCIUART_LL y
- BT_RFCOMM m
- BT_RFCOMM_TTY y # RFCOMM TTY support
- CRASH_DUMP n
- DMAR? n # experimental
- DVB_DYNAMIC_MINORS? y # we use udev
- EFI_STUB y # EFI bootloader in the bzImage itself
- 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
- 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_DEBUG n
- USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
- USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
- X86_CHECK_BIOS_CORRUPTION y
- X86_MCE y
- XEN_DOM0 y
-
- # Linux Containers
- RT_GROUP_SCHED? y
- CGROUP_DEVICE? y
- CGROUP_MEM_RES_CTLR? y
- CGROUP_MEM_RES_CTLR_SWAP? y
- DEVPTS_MULTIPLE_INSTANCES? y
-
- # Enable staging drivers. These are somewhat experimental, but
- # they generally don't hurt.
- STAGING y
-
- # PROC_EVENTS requires that the netlink connector is not built
- # as a module. This is required by libcgroup's cgrulesengd.
- CONNECTOR y
- PROC_EVENTS y
-
- # Tracing
- FTRACE y
- FUNCTION_TRACER y
- FTRACE_SYSCALLS y
- SCHED_TRACER y
-
- # Devtmpfs support.
- DEVTMPFS y
-
- # Media support
- MEDIA_CAMERA_SUPPORT? y
- MEDIA_RC_SUPPORT? y
-
- # Easier debug of NFS issues
- SUNRPC_DEBUG y
-
- ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
- ${extraConfig}
- '';
-in
-
-import ./generic.nix (
-
- rec {
- version = "3.6.11";
- testing = false;
-
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "0cnbdhsgxxdl44gqfqlh8nyf6yzmdz7xkfa0xh2rzdscwqh8085h";
- };
-
- config = configWithPlatform stdenv.platform;
- configCross = configWithPlatform stdenv.cross.platform;
-
- features.iwlwifi = true;
- features.efiBootStub = true;
- features.needsCifsUtils = true;
- features.canDisableNetfilterConntrackHelpers = true;
- features.netfilterRPFilter = true;
- }
-
- // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 980aed4c162..5288050d70d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -147,20 +147,6 @@ rec {
features.aufs3 = true;
};
- aufs3_6 = rec {
- name = "aufs3.6";
- version = "3.6.20121210";
- utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
- utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
- patch = makeAufs3StandalonePatch {
- inherit version;
- rev = "f541ebfd88df0f4e6f9daf55053282e4f52cc4d9";
- sha256 = "4d615a5f3c14a6a7c49bc6d65e78a2cdb89321cbd8a53f87cc8fe9edda382c3a";
- };
- features.aufsBase = true;
- features.aufs3 = true;
- };
-
# not officially released yet, but 3.x seems to work fine
aufs3_7 = rec {
name = "aufs3.7";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3fe0c1290e..98891a26048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5967,19 +5967,6 @@ let
];
};
- linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) {
- inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
- kernelPatches =
- [
- kernelPatches.sec_perm_2_6_24
- # kernelPatches.aufs3_6
- ] ++ lib.optionals (platform.kernelArch == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
- };
-
linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
@@ -6111,7 +6098,6 @@ let
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen);
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
- linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6);
linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7);
# The current default kernel / kernel modules.
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index ac066114408..b80ab43b931 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -17,7 +17,6 @@ let
};
nixUnstable.hostDrv = nativePlatforms;
linuxPackages_3_4.kernel.hostDrv = linux;
- linuxPackages_3_6.kernel.hostDrv = linux;
};
/* Basic list of packages to be natively built,