mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Remove EOL'd Linux 3.5
This commit is contained in:
Shea Levy
parent
c23084906b
commit
0ad870eb5e
@ -1,13 +0,0 @@
|
||||
--- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100
|
||||
+++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100
|
||||
@@ -176,8 +176,8 @@
|
||||
* after the retries we will kill the socket and
|
||||
* reconnect which may clear the network problem.
|
||||
*/
|
||||
- if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
|
||||
- cERROR(1, "sends on sock %p stuck for 15 seconds",
|
||||
+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
|
||||
+ cERROR(1, "sends on sock %p stuck for 119 seconds",
|
||||
ssocket);
|
||||
rc = -EAGAIN;
|
||||
break;
|
||||
@ -1,271 +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
|
||||
|
||||
# Easier debug of NFS issues
|
||||
SUNRPC_DEBUG y
|
||||
|
||||
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
|
||||
${extraConfig}
|
||||
'';
|
||||
in
|
||||
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.5.7";
|
||||
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 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini";
|
||||
};
|
||||
|
||||
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"]
|
||||
)
|
||||
@ -147,20 +147,6 @@ rec {
|
||||
features.aufs3 = true;
|
||||
};
|
||||
|
||||
aufs3_5 = rec {
|
||||
name = "aufs3.5";
|
||||
version = "3.5.20121210";
|
||||
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
|
||||
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
|
||||
patch = makeAufs3StandalonePatch {
|
||||
inherit version;
|
||||
rev = "1658e9080c0e49f38feee5027cf0d32940a661ca";
|
||||
sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044";
|
||||
};
|
||||
features.aufsBase = true;
|
||||
features.aufs3 = true;
|
||||
};
|
||||
|
||||
aufs3_6 = rec {
|
||||
name = "aufs3.6";
|
||||
version = "3.6.20121210";
|
||||
@ -216,12 +202,6 @@ rec {
|
||||
features.cifsTimeout = true;
|
||||
};
|
||||
|
||||
cifs_timeout_3_5_7 =
|
||||
{ name = "cifs-timeout";
|
||||
patch = ./cifs-timeout-3.5.7.patch;
|
||||
features.cifsTimeout = true;
|
||||
};
|
||||
|
||||
no_xsave =
|
||||
{ name = "no-xsave";
|
||||
patch = ./no-xsave.patch;
|
||||
@ -233,12 +213,6 @@ rec {
|
||||
patch = ./dell-rfkill.patch;
|
||||
};
|
||||
|
||||
# seems no longer necessary on 3.6
|
||||
perf3_5 =
|
||||
{ name = "perf-3.5";
|
||||
patch = ./perf-3.5.patch;
|
||||
};
|
||||
|
||||
sheevaplug_modules_2_6_35 =
|
||||
{ name = "sheevaplug_modules-2.6.35";
|
||||
patch = ./sheevaplug_modules-2.6.35.patch;
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
http://permalink.gmane.org/gmane.linux.kernel.perf.user/960
|
||||
|
||||
Fix to build perf.
|
||||
|
||||
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
|
||||
index 9f6cebd..d5491f1 100644
|
||||
--- a/tools/perf/util/evsel.c
|
||||
+++ b/tools/perf/util/evsel.c
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "cpumap.h"
|
||||
#include "thread_map.h"
|
||||
#include "target.h"
|
||||
-#include "../../include/linux/perf_event.h"
|
||||
+#include "../../../include/linux/perf_event.h"
|
||||
|
||||
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
|
||||
#define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
|
||||
@ -5967,21 +5967,6 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
|
||||
kernelPatches =
|
||||
[
|
||||
kernelPatches.sec_perm_2_6_24
|
||||
# kernelPatches.aufs3_5
|
||||
kernelPatches.perf3_5
|
||||
kernelPatches.cifs_timeout_3_5_7
|
||||
] ++ lib.optionals (platform.kernelArch == "mips")
|
||||
[ kernelPatches.mips_fpureg_emu
|
||||
kernelPatches.mips_fpu_sigill
|
||||
kernelPatches.mips_ext3_n32
|
||||
];
|
||||
};
|
||||
|
||||
linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
|
||||
kernelPatches =
|
||||
@ -6126,7 +6111,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_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5);
|
||||
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);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user