From ee589472facc3f24fd1d4459230a46fdc9acf935 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 4 Sep 2014 13:53:40 -0700 Subject: [PATCH] coreos-kernel: roll forward to 3.16 again, minus KASLR Our Xen boot failure appears to be related to enabling KASLR and helpuflly the 'nokaslr' command line option does not help. Disable the feature entirely until the bugs are shaken out. --- ...os-kernel-3.16.1.ebuild => coreos-kernel-3.16.1-r1.ebuild} | 2 +- .../sys-kernel/coreos-kernel/files/x86_64_defconfig-3.16.1 | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.16.1.ebuild => coreos-kernel-3.16.1-r1.ebuild} (96%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1-r1.ebuild index 2d84b459bc..8742e0c88a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.16.1-r1.ebuild @@ -13,5 +13,5 @@ DESCRIPTION="CoreOS kernel" HOMEPAGE="http://www.kernel.org" SRC_URI="" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.16.1 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.16.1 index 558e3d6feb..166c0678fd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.16.1 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/x86_64_defconfig-3.16.1 @@ -516,9 +516,7 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y -CONFIG_RANDOMIZE_BASE=y -CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000 -CONFIG_X86_NEED_RELOCS=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set