diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-16 07:48:40 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-16 11:24:05 +0000 |
commit | 654fafea2b207191eb4e7d1a6bae88706df90bbc (patch) | |
tree | 0fc8ed4a90b00a6959e0545ce92f7aae68490164 | |
parent | f517dd23b09c891664401ae532e82dc727db52d9 (diff) | |
download | alpine_aports-654fafea2b207191eb4e7d1a6bae88706df90bbc.tar.bz2 alpine_aports-654fafea2b207191eb4e7d1a6bae88706df90bbc.tar.xz alpine_aports-654fafea2b207191eb4e7d1a6bae88706df90bbc.zip |
main/linux-vserver: enable EFI support
ref #361
(cherry picked from commit c164e429b41680759e1947fa9548e20e1985e469)
-rw-r--r-- | main/linux-vserver/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 39 |
2 files changed, 26 insertions, 17 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 39b1453de2..5aab872ef9 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD | |||
@@ -5,7 +5,7 @@ pkgname=linux-${_flavor} | |||
5 | pkgver=2.6.32.15 | 5 | pkgver=2.6.32.15 |
6 | 6 | ||
7 | _kernver=2.6.32 | 7 | _kernver=2.6.32 |
8 | pkgrel=0 | 8 | pkgrel=1 |
9 | pkgdesc="Linux kernel with vserver" | 9 | pkgdesc="Linux kernel with vserver" |
10 | url="http://linux-vserver.org/" | 10 | url="http://linux-vserver.org/" |
11 | depends="mkinitfs linux-firmware" | 11 | depends="mkinitfs linux-firmware" |
@@ -120,4 +120,4 @@ dev() { | |||
120 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 | 120 | md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 |
121 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 | 121 | 5c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2 |
122 | 8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff | 122 | 8680ecd1342691a5974fb08d7d60beb2 patch-2.6.32.15-vs2.3.0.36.29.4.diff |
123 | 42ce36a36e7c71ee54761e56d59d17ed kernelconfig.x86" | 123 | 884ba32b4edb6c51426e826c44063e98 kernelconfig.x86" |
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 6fe9ef4d46..477d6620dd 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/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.8-vs2.3.0.36.29 | 3 | # Linux kernel version: 2.6.32.15-vs2.3.0.36.29.4 |
4 | # Mon Feb 15 09:49:17 2010 | 4 | # Wed Jun 16 07:47:05 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 |
@@ -149,7 +149,6 @@ CONFIG_HAVE_PERF_EVENTS=y | |||
149 | # Kernel Performance Events And Counters | 149 | # Kernel Performance Events And Counters |
150 | # | 150 | # |
151 | CONFIG_PERF_EVENTS=y | 151 | CONFIG_PERF_EVENTS=y |
152 | # CONFIG_EVENT_PROFILE is not set | ||
153 | CONFIG_PERF_COUNTERS=y | 152 | CONFIG_PERF_COUNTERS=y |
154 | CONFIG_VM_EVENT_COUNTERS=y | 153 | CONFIG_VM_EVENT_COUNTERS=y |
155 | CONFIG_PCI_QUIRKS=y | 154 | CONFIG_PCI_QUIRKS=y |
@@ -159,7 +158,6 @@ CONFIG_PCI_QUIRKS=y | |||
159 | CONFIG_SLUB=y | 158 | CONFIG_SLUB=y |
160 | # CONFIG_SLOB is not set | 159 | # CONFIG_SLOB is not set |
161 | CONFIG_PROFILING=y | 160 | CONFIG_PROFILING=y |
162 | CONFIG_TRACEPOINTS=y | ||
163 | CONFIG_OPROFILE=m | 161 | CONFIG_OPROFILE=m |
164 | # CONFIG_OPROFILE_IBS is not set | 162 | # CONFIG_OPROFILE_IBS is not set |
165 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set | 163 | # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set |
@@ -322,6 +320,7 @@ CONFIG_HIGHMEM=y | |||
322 | CONFIG_ARCH_FLATMEM_ENABLE=y | 320 | CONFIG_ARCH_FLATMEM_ENABLE=y |
323 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 321 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
324 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 322 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
323 | CONFIG_ILLEGAL_POINTER_VALUE=0 | ||
325 | CONFIG_SELECT_MEMORY_MODEL=y | 324 | CONFIG_SELECT_MEMORY_MODEL=y |
326 | CONFIG_FLATMEM_MANUAL=y | 325 | CONFIG_FLATMEM_MANUAL=y |
327 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 326 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -951,7 +950,6 @@ CONFIG_NET_SCH_FIFO=y | |||
951 | # Network testing | 950 | # Network testing |
952 | # | 951 | # |
953 | CONFIG_NET_PKTGEN=m | 952 | CONFIG_NET_PKTGEN=m |
954 | # CONFIG_NET_DROP_MONITOR is not set | ||
955 | # CONFIG_HAMRADIO is not set | 953 | # CONFIG_HAMRADIO is not set |
956 | CONFIG_CAN=m | 954 | CONFIG_CAN=m |
957 | CONFIG_CAN_RAW=m | 955 | CONFIG_CAN_RAW=m |
@@ -3132,7 +3130,7 @@ CONFIG_DVB_TUNER_DIB0070=m | |||
3132 | CONFIG_DVB_LNBP21=m | 3130 | CONFIG_DVB_LNBP21=m |
3133 | CONFIG_DVB_ISL6405=m | 3131 | CONFIG_DVB_ISL6405=m |
3134 | CONFIG_DVB_ISL6421=m | 3132 | CONFIG_DVB_ISL6421=m |
3135 | CONFIG_DVB_LGS8GL5=m | 3133 | CONFIG_DVB_LGS8GXX=m |
3136 | CONFIG_DAB=y | 3134 | CONFIG_DAB=y |
3137 | CONFIG_USB_DABUSB=m | 3135 | CONFIG_USB_DABUSB=m |
3138 | 3136 | ||
@@ -4204,8 +4202,24 @@ CONFIG_CIFS_EXPERIMENTAL=y | |||
4204 | # | 4202 | # |
4205 | # Partition Types | 4203 | # Partition Types |
4206 | # | 4204 | # |
4207 | # CONFIG_PARTITION_ADVANCED is not set | 4205 | CONFIG_PARTITION_ADVANCED=y |
4206 | # CONFIG_ACORN_PARTITION is not set | ||
4207 | # CONFIG_OSF_PARTITION is not set | ||
4208 | # CONFIG_AMIGA_PARTITION is not set | ||
4209 | # CONFIG_ATARI_PARTITION is not set | ||
4210 | # CONFIG_MAC_PARTITION is not set | ||
4208 | CONFIG_MSDOS_PARTITION=y | 4211 | CONFIG_MSDOS_PARTITION=y |
4212 | # CONFIG_BSD_DISKLABEL is not set | ||
4213 | # CONFIG_MINIX_SUBPARTITION is not set | ||
4214 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
4215 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
4216 | # CONFIG_LDM_PARTITION is not set | ||
4217 | # CONFIG_SGI_PARTITION is not set | ||
4218 | # CONFIG_ULTRIX_PARTITION is not set | ||
4219 | # CONFIG_SUN_PARTITION is not set | ||
4220 | # CONFIG_KARMA_PARTITION is not set | ||
4221 | CONFIG_EFI_PARTITION=y | ||
4222 | # CONFIG_SYSV68_PARTITION is not set | ||
4209 | CONFIG_NLS=m | 4223 | CONFIG_NLS=m |
4210 | CONFIG_NLS_DEFAULT="iso8859-1" | 4224 | CONFIG_NLS_DEFAULT="iso8859-1" |
4211 | CONFIG_NLS_CODEPAGE_437=m | 4225 | CONFIG_NLS_CODEPAGE_437=m |
@@ -4263,7 +4277,6 @@ CONFIG_FRAME_WARN=1024 | |||
4263 | CONFIG_DEBUG_FS=y | 4277 | CONFIG_DEBUG_FS=y |
4264 | # CONFIG_HEADERS_CHECK is not set | 4278 | # CONFIG_HEADERS_CHECK is not set |
4265 | # CONFIG_DEBUG_KERNEL is not set | 4279 | # CONFIG_DEBUG_KERNEL is not set |
4266 | CONFIG_STACKTRACE=y | ||
4267 | # CONFIG_DEBUG_BUGVERBOSE is not set | 4280 | # CONFIG_DEBUG_BUGVERBOSE is not set |
4268 | # CONFIG_DEBUG_MEMORY_INIT is not set | 4281 | # CONFIG_DEBUG_MEMORY_INIT is not set |
4269 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | 4282 | CONFIG_ARCH_WANT_FRAME_POINTERS=y |
@@ -4272,7 +4285,6 @@ CONFIG_FRAME_POINTER=y | |||
4272 | # CONFIG_LATENCYTOP is not set | 4285 | # CONFIG_LATENCYTOP is not set |
4273 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 4286 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
4274 | CONFIG_USER_STACKTRACE_SUPPORT=y | 4287 | CONFIG_USER_STACKTRACE_SUPPORT=y |
4275 | CONFIG_NOP_TRACER=y | ||
4276 | CONFIG_HAVE_FUNCTION_TRACER=y | 4288 | CONFIG_HAVE_FUNCTION_TRACER=y |
4277 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | 4289 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
4278 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y | 4290 | CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y |
@@ -4281,10 +4293,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y | |||
4281 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | 4293 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
4282 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y | 4294 | CONFIG_HAVE_SYSCALL_TRACEPOINTS=y |
4283 | CONFIG_RING_BUFFER=y | 4295 | CONFIG_RING_BUFFER=y |
4284 | CONFIG_EVENT_TRACING=y | ||
4285 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
4286 | CONFIG_RING_BUFFER_ALLOW_SWAP=y | 4296 | CONFIG_RING_BUFFER_ALLOW_SWAP=y |
4287 | CONFIG_TRACING=y | ||
4288 | CONFIG_TRACING_SUPPORT=y | 4297 | CONFIG_TRACING_SUPPORT=y |
4289 | # CONFIG_FTRACE is not set | 4298 | # CONFIG_FTRACE is not set |
4290 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set | 4299 | # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |
@@ -4481,12 +4490,12 @@ CONFIG_VIRTIO=y | |||
4481 | CONFIG_VIRTIO_RING=y | 4490 | CONFIG_VIRTIO_RING=y |
4482 | CONFIG_VIRTIO_PCI=m | 4491 | CONFIG_VIRTIO_PCI=m |
4483 | CONFIG_VIRTIO_BALLOON=m | 4492 | CONFIG_VIRTIO_BALLOON=m |
4484 | CONFIG_BINARY_PRINTF=y | 4493 | # CONFIG_BINARY_PRINTF is not set |
4485 | 4494 | ||
4486 | # | 4495 | # |
4487 | # Library routines | 4496 | # Library routines |
4488 | # | 4497 | # |
4489 | CONFIG_BITREVERSE=m | 4498 | CONFIG_BITREVERSE=y |
4490 | CONFIG_GENERIC_FIND_FIRST_BIT=y | 4499 | CONFIG_GENERIC_FIND_FIRST_BIT=y |
4491 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 4500 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
4492 | CONFIG_GENERIC_FIND_LAST_BIT=y | 4501 | CONFIG_GENERIC_FIND_LAST_BIT=y |
@@ -4494,7 +4503,7 @@ CONFIG_CRC_CCITT=m | |||
4494 | CONFIG_CRC16=m | 4503 | CONFIG_CRC16=m |
4495 | CONFIG_CRC_T10DIF=m | 4504 | CONFIG_CRC_T10DIF=m |
4496 | CONFIG_CRC_ITU_T=m | 4505 | CONFIG_CRC_ITU_T=m |
4497 | CONFIG_CRC32=m | 4506 | CONFIG_CRC32=y |
4498 | CONFIG_CRC7=m | 4507 | CONFIG_CRC7=m |
4499 | CONFIG_LIBCRC32C=m | 4508 | CONFIG_LIBCRC32C=m |
4500 | CONFIG_ZLIB_INFLATE=y | 4509 | CONFIG_ZLIB_INFLATE=y |