diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-27 09:03:51 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-27 09:03:51 +0000 |
commit | 51e88757d944832beadb24398ca7f50a8cac5ee3 (patch) | |
tree | 21fce2bc8aebffde1c4547c062aca2aa9e86c4ea | |
parent | cc1923bda32a938d7c8704f9410ac3cf543c00ef (diff) | |
download | alpine_aports-51e88757d944832beadb24398ca7f50a8cac5ee3.tar.bz2 alpine_aports-51e88757d944832beadb24398ca7f50a8cac5ee3.tar.xz alpine_aports-51e88757d944832beadb24398ca7f50a8cac5ee3.zip |
main/linux-grsec: disable all staging drivers except hyper-v
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 84665e374a..a144f1f351 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.35.7 | 5 | pkgver=2.6.35.7 |
6 | _kernver=2.6.35 | 6 | _kernver=2.6.35 |
7 | pkgrel=2 | 7 | pkgrel=3 |
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" |
@@ -145,4 +145,4 @@ md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 | |||
145 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch | 145 | 0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch |
146 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch | 146 | 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch |
147 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch | 147 | 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch |
148 | f6b46f11945c77d01679c87e95d512ee kernelconfig.x86" | 148 | 16d6b950b8c8d9c9e6b43eb76cd090f4 kernelconfig.x86" |
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index a8abd7f623..750db81bb5 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.35.7 | 3 | # Linux kernel version: 2.6.35.7 |
4 | # Tue Oct 26 10:47:49 2010 | 4 | # Wed Oct 27 08:38:30 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 |
@@ -4265,9 +4265,7 @@ CONFIG_STAGING=y | |||
4265 | # CONFIG_IDE_PHISON is not set | 4265 | # CONFIG_IDE_PHISON is not set |
4266 | # CONFIG_LINE6_USB is not set | 4266 | # CONFIG_LINE6_USB is not set |
4267 | # CONFIG_DRM_VMWGFX is not set | 4267 | # CONFIG_DRM_VMWGFX is not set |
4268 | CONFIG_DRM_NOUVEAU=m | 4268 | # CONFIG_DRM_NOUVEAU is not set |
4269 | CONFIG_DRM_NOUVEAU_BACKLIGHT=y | ||
4270 | CONFIG_DRM_NOUVEAU_DEBUG=y | ||
4271 | 4269 | ||
4272 | # | 4270 | # |
4273 | # I2C encoder or helper chips | 4271 | # I2C encoder or helper chips |