From 17b387ddc8a99172c8a21508f394a2d3dab95806 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 8 Apr 2009 08:30:39 +0000 Subject: core/linux-grsec: change arch to Pentium-classic. Enable XEN paravirt support --- core/linux-grsec/APKBUILD | 4 ++-- core/linux-grsec/kernelconfig | 55 ++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 31 deletions(-) (limited to 'core') diff --git a/core/linux-grsec/APKBUILD b/core/linux-grsec/APKBUILD index 8d27cb41..169490c4 100644 --- a/core/linux-grsec/APKBUILD +++ b/core/linux-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec pkgname=linux-$_flavor pkgver=2.6.28.9 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net arch=i486 @@ -34,4 +34,4 @@ dev() { mv "$pkgdir"/boot/System.map "$subpkgdir"/boot/System.map-$_flavor } -md5sums="d35b3562cf4d88cac8b8668c7d36391b kernelconfig" +md5sums="080e5d30c79999d696588f824073803d kernelconfig" diff --git a/core/linux-grsec/kernelconfig b/core/linux-grsec/kernelconfig index 94e4fcd8..41599f41 100644 --- a/core/linux-grsec/kernelconfig +++ b/core/linux-grsec/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28.9 -# Tue Apr 7 14:20:52 2009 +# Wed Apr 8 06:37:18 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -172,17 +172,19 @@ CONFIG_X86_PC=y # CONFIG_X86_RDC321X is not set CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_SAVE_RESTORE=y CONFIG_VMI=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_MEMTEST is not set # CONFIG_M386 is not set # CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set +# CONFIG_M586 is not set +CONFIG_M586TSC=y # CONFIG_M586MMX is not set # CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set @@ -217,6 +219,8 @@ CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -249,8 +253,8 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set @@ -258,7 +262,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -272,7 +277,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y -# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -1202,6 +1207,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y @@ -1580,6 +1586,7 @@ CONFIG_IEEE1394_DV1394=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -1727,7 +1734,6 @@ CONFIG_E1000E=m CONFIG_IP1000=m CONFIG_IGB=m CONFIG_IGB_LRO=y -CONFIG_IGB_DCA=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1749,11 +1755,9 @@ CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m CONFIG_ENIC=m CONFIG_IXGBE=m -CONFIG_IXGBE_DCA=y CONFIG_IXGB=m CONFIG_S2IO=m CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_MLX4_EN=m @@ -1972,6 +1976,7 @@ CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y +CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_FDDI=y CONFIG_DEFXX=m # CONFIG_DEFXX_MMIO is not set @@ -2062,6 +2067,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m CONFIG_INPUT_EVBUG=m +CONFIG_XEN_KBDDEV_FRONTEND=m # # Input Device Drivers @@ -2245,7 +2251,9 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -3118,6 +3126,7 @@ CONFIG_FB_GEODE_GX=m CONFIG_FB_GEODE_GX1=m CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m # CONFIG_FB_MB862XX_PCI_GDC is not set @@ -3704,20 +3713,6 @@ CONFIG_RTC_DRV_WM8350=m # # on-CPU RTC drivers # -CONFIG_DMADEVICES=y - -# -# DMA Devices -# -CONFIG_INTEL_IOATDMA=m -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -CONFIG_NET_DMA=y -CONFIG_DMATEST=m -CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -3729,6 +3724,8 @@ CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SMX=m CONFIG_UIO_SERCOS3=m +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y # CONFIG_STAGING is not set # @@ -4143,6 +4140,7 @@ CONFIG_PAX_NOELFRELOCS=y # Address Space Layout Randomization # CONFIG_PAX_ASLR=y +# CONFIG_PAX_RANDKSTACK is not set CONFIG_PAX_RANDUSTACK=y CONFIG_PAX_RANDMMAP=y @@ -4274,9 +4272,8 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m -CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m -- cgit v1.2.3