aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-16 07:44:20 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-16 11:23:38 +0000
commit501127d105e0b06820b3d2caa4e283924df4bd1c (patch)
tree23a930d1c30d467f8a33653df858b429da43e00e
parent560f1539d7c8560e389c9289d9db7986adaa7bb0 (diff)
downloadalpine_aports-501127d105e0b06820b3d2caa4e283924df4bd1c.tar.bz2
alpine_aports-501127d105e0b06820b3d2caa4e283924df4bd1c.tar.xz
alpine_aports-501127d105e0b06820b3d2caa4e283924df4bd1c.zip
main/linux-grsec: enable EFI
fixes #361 (cherry picked from commit 6b19453ed2db40f0d9f976385abbc96e72704977)
-rw-r--r--main/linux-grsec/APKBUILD4
-rw-r--r--main/linux-grsec/kernelconfig.x8626
2 files changed, 23 insertions, 7 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 471b3efb8c..955e28e42d 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.15 5pkgver=2.6.32.15
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=6 7pkgrel=7
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -169,4 +169,4 @@ ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch
169b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch 169b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
170a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 170a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
171bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch 171bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch
172442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" 172758c074dc6979167f3113cbf101922ee kernelconfig.x86"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index d70107d29b..5f4cb8c2b4 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.14 3# Linux kernel version: 2.6.32.15
4# Wed Jun 2 07:39:39 2010 4# Wed Jun 16 07:30:34 2010
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -4237,8 +4237,24 @@ CONFIG_CIFS_EXPERIMENTAL=y
4237# 4237#
4238# Partition Types 4238# Partition Types
4239# 4239#
4240# CONFIG_PARTITION_ADVANCED is not set 4240CONFIG_PARTITION_ADVANCED=y
4241# CONFIG_ACORN_PARTITION is not set
4242# CONFIG_OSF_PARTITION is not set
4243# CONFIG_AMIGA_PARTITION is not set
4244# CONFIG_ATARI_PARTITION is not set
4245# CONFIG_MAC_PARTITION is not set
4241CONFIG_MSDOS_PARTITION=y 4246CONFIG_MSDOS_PARTITION=y
4247# CONFIG_BSD_DISKLABEL is not set
4248# CONFIG_MINIX_SUBPARTITION is not set
4249# CONFIG_SOLARIS_X86_PARTITION is not set
4250# CONFIG_UNIXWARE_DISKLABEL is not set
4251# CONFIG_LDM_PARTITION is not set
4252# CONFIG_SGI_PARTITION is not set
4253# CONFIG_ULTRIX_PARTITION is not set
4254# CONFIG_SUN_PARTITION is not set
4255# CONFIG_KARMA_PARTITION is not set
4256CONFIG_EFI_PARTITION=y
4257# CONFIG_SYSV68_PARTITION is not set
4242CONFIG_NLS=m 4258CONFIG_NLS=m
4243CONFIG_NLS_DEFAULT="iso8859-1" 4259CONFIG_NLS_DEFAULT="iso8859-1"
4244CONFIG_NLS_CODEPAGE_437=m 4260CONFIG_NLS_CODEPAGE_437=m
@@ -4626,7 +4642,7 @@ CONFIG_VIRTIO_BALLOON=m
4626# 4642#
4627# Library routines 4643# Library routines
4628# 4644#
4629CONFIG_BITREVERSE=m 4645CONFIG_BITREVERSE=y
4630CONFIG_GENERIC_FIND_FIRST_BIT=y 4646CONFIG_GENERIC_FIND_FIRST_BIT=y
4631CONFIG_GENERIC_FIND_NEXT_BIT=y 4647CONFIG_GENERIC_FIND_NEXT_BIT=y
4632CONFIG_GENERIC_FIND_LAST_BIT=y 4648CONFIG_GENERIC_FIND_LAST_BIT=y
@@ -4634,7 +4650,7 @@ CONFIG_CRC_CCITT=m
4634CONFIG_CRC16=m 4650CONFIG_CRC16=m
4635CONFIG_CRC_T10DIF=m 4651CONFIG_CRC_T10DIF=m
4636CONFIG_CRC_ITU_T=m 4652CONFIG_CRC_ITU_T=m
4637CONFIG_CRC32=m 4653CONFIG_CRC32=y
4638CONFIG_CRC7=m 4654CONFIG_CRC7=m
4639CONFIG_LIBCRC32C=m 4655CONFIG_LIBCRC32C=m
4640CONFIG_ZLIB_INFLATE=y 4656CONFIG_ZLIB_INFLATE=y