diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-02 08:57:41 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-07 11:22:07 +0000 |
commit | ef877852c9b22ca81986cddffc345730bbae73f9 (patch) | |
tree | 6d8d8573ee3a0b15fe61aecb8aa43b0dafd9dc86 | |
parent | f4fc5ec128e84e7e825148e0d943378aa06789f4 (diff) | |
download | alpine_aports-ef877852c9b22ca81986cddffc345730bbae73f9.tar.bz2 alpine_aports-ef877852c9b22ca81986cddffc345730bbae73f9.tar.xz alpine_aports-ef877852c9b22ca81986cddffc345730bbae73f9.zip |
main/linux-grsec: enable hyper-v drivers
(cherry picked from commit 3196f2ef2839a2d785baf32ac55a527e631ef739)
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 77 |
2 files changed, 66 insertions, 15 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 538324b81d..c7ee2f2fc5 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.14 | 5 | pkgver=2.6.32.14 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=0 | 7 | pkgrel=1 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -157,4 +157,4 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo | |||
157 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 157 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
158 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 158 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
159 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch | 159 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch |
160 | 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" | 160 | 442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" |
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 13e508a9f9..d70107d29b 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.32.9 | 3 | # Linux kernel version: 2.6.32.14 |
4 | # Mon Mar 15 14:11:23 2010 | 4 | # Wed Jun 2 07:39:39 2010 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -133,7 +133,6 @@ CONFIG_HAVE_PERF_EVENTS=y | |||
133 | # Kernel Performance Events And Counters | 133 | # Kernel Performance Events And Counters |
134 | # | 134 | # |
135 | CONFIG_PERF_EVENTS=y | 135 | CONFIG_PERF_EVENTS=y |
136 | # CONFIG_EVENT_PROFILE is not set | ||
137 | CONFIG_PERF_COUNTERS=y | 136 | CONFIG_PERF_COUNTERS=y |
138 | CONFIG_VM_EVENT_COUNTERS=y | 137 | CONFIG_VM_EVENT_COUNTERS=y |
139 | CONFIG_PCI_QUIRKS=y | 138 | CONFIG_PCI_QUIRKS=y |
@@ -143,7 +142,6 @@ CONFIG_PCI_QUIRKS=y | |||
143 | CONFIG_SLUB=y | 142 | CONFIG_SLUB=y |
144 | # CONFIG_SLOB is not set | 143 | # CONFIG_SLOB is not set |
145 | CONFIG_PROFILING=y | 144 | CONFIG_PROFILING=y |
146 | CONFIG_TRACEPOINTS=y | ||
147 | CONFIG_OPROFILE=m | 145 | CONFIG_OPROFILE=m |
148 | # CONFIG_OPROFILE_IBS is not set | 146 | # CONFIG_OPROFILE_IBS is not set |
149 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set | 147 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set |
@@ -305,6 +303,7 @@ CONFIG_HIGHMEM=y | |||
305 | CONFIG_ARCH_FLATMEM_ENABLE=y | 303 | CONFIG_ARCH_FLATMEM_ENABLE=y |
306 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 304 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
307 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 305 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
306 | CONFIG_ILLEGAL_POINTER_VALUE=0 | ||
308 | CONFIG_SELECT_MEMORY_MODEL=y | 307 | CONFIG_SELECT_MEMORY_MODEL=y |
309 | CONFIG_FLATMEM_MANUAL=y | 308 | CONFIG_FLATMEM_MANUAL=y |
310 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 309 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -931,7 +930,6 @@ CONFIG_NET_SCH_FIFO=y | |||
931 | # Network testing | 930 | # Network testing |
932 | # | 931 | # |
933 | CONFIG_NET_PKTGEN=m | 932 | CONFIG_NET_PKTGEN=m |
934 | # CONFIG_NET_DROP_MONITOR is not set | ||
935 | # CONFIG_HAMRADIO is not set | 933 | # CONFIG_HAMRADIO is not set |
936 | CONFIG_CAN=m | 934 | CONFIG_CAN=m |
937 | CONFIG_CAN_RAW=m | 935 | CONFIG_CAN_RAW=m |
@@ -3111,7 +3109,7 @@ CONFIG_DVB_TUNER_DIB0070=m | |||
3111 | CONFIG_DVB_LNBP21=m | 3109 | CONFIG_DVB_LNBP21=m |
3112 | CONFIG_DVB_ISL6405=m | 3110 | CONFIG_DVB_ISL6405=m |
3113 | CONFIG_DVB_ISL6421=m | 3111 | CONFIG_DVB_ISL6421=m |
3114 | CONFIG_DVB_LGS8GL5=m | 3112 | CONFIG_DVB_LGS8GXX=m |
3115 | CONFIG_DAB=y | 3113 | CONFIG_DAB=y |
3116 | CONFIG_USB_DABUSB=m | 3114 | CONFIG_USB_DABUSB=m |
3117 | 3115 | ||
@@ -3939,7 +3937,65 @@ CONFIG_UIO_SERCOS3=m | |||
3939 | # | 3937 | # |
3940 | # TI VLYNQ | 3938 | # TI VLYNQ |
3941 | # | 3939 | # |
3942 | # CONFIG_STAGING is not set | 3940 | CONFIG_STAGING=y |
3941 | # CONFIG_STAGING_EXCLUDE_BUILD is not set | ||
3942 | # CONFIG_ET131X is not set | ||
3943 | # CONFIG_SLICOSS is not set | ||
3944 | # CONFIG_VIDEO_GO7007 is not set | ||
3945 | # CONFIG_VIDEO_CX25821 is not set | ||
3946 | # CONFIG_USB_IP_COMMON is not set | ||
3947 | # CONFIG_W35UND is not set | ||
3948 | # CONFIG_PRISM2_USB is not set | ||
3949 | # CONFIG_ECHO is not set | ||
3950 | # CONFIG_POCH is not set | ||
3951 | # CONFIG_OTUS is not set | ||
3952 | # CONFIG_RT2860 is not set | ||
3953 | # CONFIG_RT2870 is not set | ||
3954 | # CONFIG_RT3090 is not set | ||
3955 | # CONFIG_COMEDI is not set | ||
3956 | # CONFIG_ASUS_OLED is not set | ||
3957 | # CONFIG_PANEL is not set | ||
3958 | # CONFIG_ALTERA_PCIE_CHDMA is not set | ||
3959 | # CONFIG_RTL8187SE is not set | ||
3960 | # CONFIG_RTL8192SU is not set | ||
3961 | # CONFIG_RTL8192E is not set | ||
3962 | # CONFIG_TRANZPORT is not set | ||
3963 | |||
3964 | # | ||
3965 | # Android | ||
3966 | # | ||
3967 | |||
3968 | # | ||
3969 | # Qualcomm MSM Camera And Video | ||
3970 | # | ||
3971 | |||
3972 | # | ||
3973 | # Camera Sensor Selection | ||
3974 | # | ||
3975 | # CONFIG_INPUT_GPIO is not set | ||
3976 | # CONFIG_DST is not set | ||
3977 | # CONFIG_POHMELFS is not set | ||
3978 | # CONFIG_B3DFG is not set | ||
3979 | # CONFIG_IDE_PHISON is not set | ||
3980 | # CONFIG_PLAN9AUTH is not set | ||
3981 | # CONFIG_LINE6_USB is not set | ||
3982 | # CONFIG_DRM_RADEON_KMS is not set | ||
3983 | # CONFIG_USB_SERIAL_QUATECH2 is not set | ||
3984 | # CONFIG_USB_SERIAL_QUATECH_USB2 is not set | ||
3985 | # CONFIG_VT6655 is not set | ||
3986 | # CONFIG_VT6656 is not set | ||
3987 | # CONFIG_FB_UDL is not set | ||
3988 | CONFIG_HYPERV=m | ||
3989 | CONFIG_HYPERV_STORAGE=m | ||
3990 | CONFIG_HYPERV_BLOCK=m | ||
3991 | CONFIG_HYPERV_NET=m | ||
3992 | # CONFIG_VME_BUS is not set | ||
3993 | |||
3994 | # | ||
3995 | # RAR Register Driver | ||
3996 | # | ||
3997 | # CONFIG_RAR_REGISTER is not set | ||
3998 | # CONFIG_IIO is not set | ||
3943 | CONFIG_X86_PLATFORM_DEVICES=y | 3999 | CONFIG_X86_PLATFORM_DEVICES=y |
3944 | CONFIG_ACER_WMI=m | 4000 | CONFIG_ACER_WMI=m |
3945 | CONFIG_ASUS_LAPTOP=m | 4001 | CONFIG_ASUS_LAPTOP=m |
@@ -4240,7 +4296,6 @@ CONFIG_FRAME_WARN=1024 | |||
4240 | CONFIG_DEBUG_FS=y | 4296 | CONFIG_DEBUG_FS=y |
4241 | # CONFIG_HEADERS_CHECK is not set | 4297 | # CONFIG_HEADERS_CHECK is not set |
4242 | # CONFIG_DEBUG_KERNEL is not set | 4298 | # CONFIG_DEBUG_KERNEL is not set |
4243 | CONFIG_STACKTRACE=y | ||
4244 | # CONFIG_DEBUG_BUGVERBOSE is not set | 4299 | # CONFIG_DEBUG_BUGVERBOSE is not set |
4245 | # CONFIG_DEBUG_MEMORY_INIT is not set | 4300 | # CONFIG_DEBUG_MEMORY_INIT is not set |
4246 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | 4301 | CONFIG_ARCH_WANT_FRAME_POINTERS=y |
@@ -4249,7 +4304,6 @@ CONFIG_FRAME_POINTER=y | |||
4249 | # CONFIG_LATENCYTOP is not set | 4304 | # CONFIG_LATENCYTOP is not set |
4250 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 4305 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
4251 | CONFIG_USER_STACKTRACE_SUPPORT=y | 4306 | CONFIG_USER_STACKTRACE_SUPPORT=y |
4252 | CONFIG_NOP_TRACER=y | ||
4253 | CONFIG_HAVE_FUNCTION_TRACER=y | 4307 | CONFIG_HAVE_FUNCTION_TRACER=y |
4254 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 4308 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
4255 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y | 4309 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y |
@@ -4258,10 +4312,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y | |||
4258 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 4312 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
4259 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y | 4313 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y |
4260 | CONFIG_RING_BUFFER=y | 4314 | CONFIG_RING_BUFFER=y |
4261 | CONFIG_EVENT_TRACING=y | ||
4262 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
4263 | CONFIG_RING_BUFFER_ALLOW_SWAP=y | 4315 | CONFIG_RING_BUFFER_ALLOW_SWAP=y |
4264 | CONFIG_TRACING=y | ||
4265 | CONFIG_TRACING_SUPPORT=y | 4316 | CONFIG_TRACING_SUPPORT=y |
4266 | # CONFIG_FTRACE is not set | 4317 | # CONFIG_FTRACE is not set |
4267 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set | 4318 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |
@@ -4570,7 +4621,7 @@ CONFIG_VIRTIO=y | |||
4570 | CONFIG_VIRTIO_RING=y | 4621 | CONFIG_VIRTIO_RING=y |
4571 | CONFIG_VIRTIO_PCI=m | 4622 | CONFIG_VIRTIO_PCI=m |
4572 | CONFIG_VIRTIO_BALLOON=m | 4623 | CONFIG_VIRTIO_BALLOON=m |
4573 | CONFIG_BINARY_PRINTF=y | 4624 | # CONFIG_BINARY_PRINTF is not set |
4574 | 4625 | ||
4575 | # | 4626 | # |
4576 | # Library routines | 4627 | # Library routines |