pyrox.dev / nixpkgs
lol
fork atom

Remove EOL'd Linux 3.5

Shea Levy 0ad870eb c2308490

-343
unified split
-13
pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch
··· 1 - --- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100 2 - +++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100 3 - @@ -176,8 +176,8 @@ 4 - * after the retries we will kill the socket and 5 - * reconnect which may clear the network problem. 6 - */ 7 - - if ((i >= 14) || (!server->noblocksnd && (i > 2))) { 8 - - cERROR(1, "sends on sock %p stuck for 15 seconds", 9 - + if ((i >= 119) || (!server->noblocksnd && (i > 2))) { 10 - + cERROR(1, "sends on sock %p stuck for 119 seconds", 11 - ssocket); 12 - rc = -EAGAIN; 13 - break;
-271
pkgs/os-specific/linux/kernel/linux-3.5.nix
··· 1 - args @ { stdenv, fetchurl, extraConfig ? "" 2 - , perl, mktemp, module_init_tools 3 - , ... }: 4 - 5 - let 6 - configWithPlatform = kernelPlatform : 7 - '' 8 - # Power management and debugging for powertop. 9 - DEBUG_KERNEL y 10 - PM_ADVANCED_DEBUG y 11 - PM_RUNTIME y 12 - TIMER_STATS y 13 - USB_SUSPEND y 14 - BACKTRACE_SELF_TEST n 15 - CPU_NOTIFIER_ERROR_INJECT? n 16 - DEBUG_DEVRES n 17 - DEBUG_NX_TEST n 18 - DEBUG_STACK_USAGE n 19 - DEBUG_STACKOVERFLOW n 20 - RCU_TORTURE_TEST n 21 - SCHEDSTATS n 22 - 23 - # Support drivers that need external firmware. 24 - STANDALONE n 25 - 26 - # Make /proc/config.gz available. 27 - IKCONFIG_PROC y 28 - 29 - # Optimize with -O2, not -Os. 30 - CC_OPTIMIZE_FOR_SIZE n 31 - 32 - # Enable the kernel's built-in memory tester. 33 - MEMTEST y 34 - 35 - # Include the CFQ I/O scheduler in the kernel, rather than as a 36 - # module, so that the initrd gets a good I/O scheduler. 37 - IOSCHED_CFQ y 38 - BLK_CGROUP y # required by CFQ 39 - 40 - # Enable NUMA. 41 - NUMA? y 42 - 43 - # Disable some expensive (?) features. 44 - FTRACE n 45 - KPROBES n 46 - PM_TRACE_RTC n 47 - 48 - # Enable various subsystems. 49 - ACCESSIBILITY y # Accessibility support 50 - AUXDISPLAY y # Auxiliary Display support 51 - DONGLE y # Serial dongle support 52 - HIPPI? y 53 - MTD_COMPLEX_MAPPINGS y # needed for many devices 54 - SCSI_LOWLEVEL y # enable lots of SCSI devices 55 - SCSI_LOWLEVEL_PCMCIA y 56 - SPI y # needed for many devices 57 - SPI_MASTER y 58 - WAN y 59 - 60 - # Networking options. 61 - IP_PNP n 62 - IPV6_PRIVACY y 63 - NETFILTER_ADVANCED y 64 - IP_VS_PROTO_TCP y 65 - IP_VS_PROTO_UDP y 66 - IP_VS_PROTO_ESP y 67 - IP_VS_PROTO_AH y 68 - IP_DCCP_CCID3 n # experimental 69 - CLS_U32_PERF y 70 - CLS_U32_MARK y 71 - 72 - # Wireless networking. 73 - IPW2100_MONITOR y # support promiscuous mode 74 - IPW2200_MONITOR y # support promiscuous mode 75 - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver 76 - HOSTAP_FIRMWARE_NVRAM y 77 - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus 78 - ATH9K_AHB y # Ditto, AHB bus 79 - B43_PHY_HT y 80 - BCMA_HOST_PCI y 81 - 82 - # Some settings to make sure that fbcondecor works - in particular, 83 - # disable tileblitting and the drivers that need it. 84 - 85 - # Enable various FB devices. 86 - FB y 87 - FB_EFI y 88 - FB_NVIDIA_I2C y # Enable DDC Support 89 - FB_RIVA_I2C y 90 - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support 91 - FB_ATY_GX y # Mach64 GX support 92 - FB_SAVAGE_I2C y 93 - FB_SAVAGE_ACCEL y 94 - FB_SIS_300 y 95 - FB_SIS_315 y 96 - FB_3DFX_ACCEL y 97 - FB_GEODE y 98 - 99 - # Video configuration 100 - # Enable KMS for devices whose X.org driver supports it. 101 - DRM_I915_KMS y 102 - DRM_RADEON_KMS y 103 - # Hybrid graphics support 104 - VGA_SWITCHEROO y 105 - 106 - # Sound. 107 - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode 108 - SND_HDA_INPUT_BEEP y # Support digital beep via input layer 109 - SND_USB_CAIAQ_INPUT y 110 - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) 111 - 112 - # USB serial devices. 113 - USB_SERIAL_GENERIC y # USB Generic Serial Driver 114 - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices 115 - USB_SERIAL_KEYSPAN_USA28 y 116 - USB_SERIAL_KEYSPAN_USA28X y 117 - USB_SERIAL_KEYSPAN_USA28XA y 118 - USB_SERIAL_KEYSPAN_USA28XB y 119 - USB_SERIAL_KEYSPAN_USA19 y 120 - USB_SERIAL_KEYSPAN_USA18X y 121 - USB_SERIAL_KEYSPAN_USA19W y 122 - USB_SERIAL_KEYSPAN_USA19QW y 123 - USB_SERIAL_KEYSPAN_USA19QI y 124 - USB_SERIAL_KEYSPAN_USA49W y 125 - USB_SERIAL_KEYSPAN_USA49WLC y 126 - 127 - # Filesystem options - in particular, enable extended attributes and 128 - # ACLs for all filesystems that support them. 129 - EXT2_FS_XATTR y # Ext2 extended attributes 130 - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists 131 - EXT2_FS_SECURITY y # Ext2 Security Labels 132 - EXT2_FS_XIP y # Ext2 execute in place support 133 - EXT4_FS_POSIX_ACL y 134 - EXT4_FS_SECURITY y 135 - REISERFS_FS_XATTR y 136 - REISERFS_FS_POSIX_ACL y 137 - REISERFS_FS_SECURITY y 138 - JFS_POSIX_ACL y 139 - JFS_SECURITY y 140 - XFS_QUOTA y 141 - XFS_POSIX_ACL y 142 - XFS_RT y # XFS Realtime subvolume support 143 - OCFS2_DEBUG_MASKLOG n 144 - BTRFS_FS_POSIX_ACL y 145 - UBIFS_FS_XATTR? y 146 - UBIFS_FS_ADVANCED_COMPR y 147 - NFSD_V2_ACL y 148 - NFSD_V3 y 149 - NFSD_V3_ACL y 150 - NFSD_V4 y 151 - NFS_FSCACHE y 152 - CIFS_XATTR y 153 - CIFS_POSIX y 154 - CIFS_FSCACHE y 155 - 156 - # Security related features. 157 - STRICT_DEVMEM y # Filter access to /dev/mem 158 - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default 159 - 160 - # Misc. options. 161 - 8139TOO_8129 y 162 - 8139TOO_PIO n # PIO is slower 163 - AIC79XX_DEBUG_ENABLE n 164 - AIC7XXX_DEBUG_ENABLE n 165 - AIC94XX_DEBUG n 166 - B43_PCMCIA y 167 - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support 168 - BLK_DEV_IDEACPI y # IDE ACPI support 169 - BLK_DEV_INTEGRITY y 170 - BSD_PROCESS_ACCT_V3 y 171 - BT_HCIUART_BCSP y 172 - BT_HCIUART_H4 y # UART (H4) protocol support 173 - BT_HCIUART_LL y 174 - BT_RFCOMM m 175 - BT_RFCOMM_TTY y # RFCOMM TTY support 176 - CRASH_DUMP n 177 - DMAR? n # experimental 178 - DVB_DYNAMIC_MINORS y # we use udev 179 - EFI_STUB y # EFI bootloader in the bzImage itself 180 - FUSION y # Fusion MPT device support 181 - IDE_GD_ATAPI y # ATAPI floppy support 182 - IRDA_ULTRA y # Ultra (connectionless) protocol 183 - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels 184 - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels 185 - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support 186 - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED 187 - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support 188 - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger 189 - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback 190 - LOGO n # not needed 191 - MEDIA_ATTACH y 192 - MEGARAID_NEWGEN y 193 - MICROCODE_AMD y 194 - MODVERSIONS y 195 - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension 196 - MTRR_SANITIZER y 197 - NET_FC y # Fibre Channel driver support 198 - PPP_MULTILINK y # PPP multilink support 199 - REGULATOR y # Voltage and Current Regulator Support 200 - SCSI_LOGGING y # SCSI logging facility 201 - SERIAL_8250 y # 8250/16550 and compatible serial support 202 - SLIP_COMPRESSED y # CSLIP compressed headers 203 - SLIP_SMART y 204 - THERMAL_HWMON y # Hardware monitoring support 205 - USB_DEBUG n 206 - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators 207 - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling 208 - X86_CHECK_BIOS_CORRUPTION y 209 - X86_MCE y 210 - XEN_DOM0 y 211 - 212 - # Linux Containers 213 - RT_GROUP_SCHED? y 214 - CGROUP_DEVICE? y 215 - CGROUP_MEM_RES_CTLR? y 216 - CGROUP_MEM_RES_CTLR_SWAP? y 217 - DEVPTS_MULTIPLE_INSTANCES? y 218 - 219 - # Enable staging drivers. These are somewhat experimental, but 220 - # they generally don't hurt. 221 - STAGING y 222 - 223 - # PROC_EVENTS requires that the netlink connector is not built 224 - # as a module. This is required by libcgroup's cgrulesengd. 225 - CONNECTOR y 226 - PROC_EVENTS y 227 - 228 - # Tracing 229 - FTRACE y 230 - FUNCTION_TRACER y 231 - FTRACE_SYSCALLS y 232 - SCHED_TRACER y 233 - 234 - # Devtmpfs support. 235 - DEVTMPFS y 236 - 237 - # Easier debug of NFS issues 238 - SUNRPC_DEBUG y 239 - 240 - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} 241 - ${extraConfig} 242 - ''; 243 - in 244 - 245 - import ./generic.nix ( 246 - 247 - rec { 248 - version = "3.5.7"; 249 - testing = false; 250 - 251 - preConfigure = '' 252 - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" 253 - ''; 254 - 255 - src = fetchurl { 256 - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; 257 - sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini"; 258 - }; 259 - 260 - config = configWithPlatform stdenv.platform; 261 - configCross = configWithPlatform stdenv.cross.platform; 262 - 263 - features.iwlwifi = true; 264 - features.efiBootStub = true; 265 - features.needsCifsUtils = true; 266 - features.canDisableNetfilterConntrackHelpers = true; 267 - features.netfilterRPFilter = true; 268 - } 269 - 270 - // removeAttrs args ["extraConfig"] 271 - )
-26
pkgs/os-specific/linux/kernel/patches.nix
··· 147 147 features.aufs3 = true; 148 148 }; 149 149 150 - aufs3_5 = rec { 151 - name = "aufs3.5"; 152 - version = "3.5.20121210"; 153 - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; 154 - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; 155 - patch = makeAufs3StandalonePatch { 156 - inherit version; 157 - rev = "1658e9080c0e49f38feee5027cf0d32940a661ca"; 158 - sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044"; 159 - }; 160 - features.aufsBase = true; 161 - features.aufs3 = true; 162 - }; 163 - 164 150 aufs3_6 = rec { 165 151 name = "aufs3.6"; 166 152 version = "3.6.20121210"; ··· 216 202 features.cifsTimeout = true; 217 203 }; 218 204 219 - cifs_timeout_3_5_7 = 220 - { name = "cifs-timeout"; 221 - patch = ./cifs-timeout-3.5.7.patch; 222 - features.cifsTimeout = true; 223 - }; 224 - 225 205 no_xsave = 226 206 { name = "no-xsave"; 227 207 patch = ./no-xsave.patch; ··· 231 211 dell_rfkill = 232 212 { name = "dell-rfkill"; 233 213 patch = ./dell-rfkill.patch; 234 - }; 235 - 236 - # seems no longer necessary on 3.6 237 - perf3_5 = 238 - { name = "perf-3.5"; 239 - patch = ./perf-3.5.patch; 240 214 }; 241 215 242 216 sheevaplug_modules_2_6_35 =
-17
pkgs/os-specific/linux/kernel/perf-3.5.patch
··· 1 - http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 2 - 3 - Fix to build perf. 4 - 5 - diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c 6 - index 9f6cebd..d5491f1 100644 7 - --- a/tools/perf/util/evsel.c 8 - +++ b/tools/perf/util/evsel.c 9 - @@ -15,7 +15,7 @@ 10 - #include "cpumap.h" 11 - #include "thread_map.h" 12 - #include "target.h" 13 - -#include "../../include/linux/perf_event.h" 14 - +#include "../../../include/linux/perf_event.h" 15 - 16 - #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) 17 - #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
-16
pkgs/top-level/all-packages.nix
··· 5967 5967 ]; 5968 5968 }; 5969 5969 5970 - linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { 5971 - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; 5972 - kernelPatches = 5973 - [ 5974 - kernelPatches.sec_perm_2_6_24 5975 - # kernelPatches.aufs3_5 5976 - kernelPatches.perf3_5 5977 - kernelPatches.cifs_timeout_3_5_7 5978 - ] ++ lib.optionals (platform.kernelArch == "mips") 5979 - [ kernelPatches.mips_fpureg_emu 5980 - kernelPatches.mips_fpu_sigill 5981 - kernelPatches.mips_ext3_n32 5982 - ]; 5983 - }; 5984 - 5985 5970 linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { 5986 5971 inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; 5987 5972 kernelPatches = ··· 6126 6111 linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); 6127 6112 linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); 6128 6113 linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); 6129 - linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); 6130 6114 linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); 6131 6115 linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); 6132 6116