From 544aa7edf79d13970c3a20122487afd97a7d25f9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 22 Jul 2015 15:57:50 -0700 Subject: [PATCH 1/2] coreos-kernel: upgrade to 4.0.9 --- ...coreos-kernel-4.0.7-r4.ebuild => coreos-kernel-4.0.9.ebuild} | 2 +- .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...reos-sources-4.0.7-r2.ebuild => coreos-sources-4.0.9.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.0.7-r4.ebuild => coreos-kernel-4.0.9.ebuild} (86%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.0.7-r2.ebuild => coreos-sources-4.0.9.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.9.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.9.ebuild index cd4500b7a3..ad6f2587f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.7-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.0.9.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r2" +COREOS_SOURCE_REVISION="" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index f7997a707f..9839d3dcff 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 -DIST patch-4.0.7.xz 186264 SHA256 c6deb2cda4d87fc2e09442e31f3e6e70e54962744c3a4d2653a8fda381442de0 SHA512 94c9ae61d665bdb06b2558b4e473777c13cb77e00c4b6cab326d10372f64bb8a9550f8bc2e2d3e1bf2a4ddf2adf1f3546a93e727aeb6b8792057017276dd9683 WHIRLPOOL cf53e324283f59111e368b740e78fd1ecbc5aec06d71b6abce6f5bfb9c9ab3ceb671fa93452250819f92627dc4d3d23f1eb32d36788135ff158f70da0c11a426 +DIST patch-4.0.9.xz 226564 SHA256 842cb3abf053e809b23e615020f3d0730220660f0e71f259dce69510364965f1 SHA512 59cfaba028cf9d669ceac25f967945963330736059f38c01f584d3379e2ac243df3f89836e4815014f6799816746bba49a35915ccc4a66250bb95536d9b9e9f5 WHIRLPOOL 9e59979125dbbfef3ba972be4987606a8ba0ce24ed7cadf216c3b339036dbfc3a071f66fc12b6d0acd41d5ad53e71607d3e01d658f4fa59ebe70767d0e5cbc62 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.9.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.7-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.0.9.ebuild From 98d75649dc0032ff31fb50ff18137f600792efd9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 22 Jul 2015 15:58:18 -0700 Subject: [PATCH 2/2] coreos-kernel: disable audit logging We don't currently ship auditd so loads of junk gets dumped to dmesg. --- .../sys-kernel/coreos-kernel/files/amd64_defconfig-4.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.0 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.0 index bdb2880d97..8bad3406d9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.0 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/files/amd64_defconfig-4.0 @@ -97,7 +97,7 @@ CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="init=/usr/lib/systemd/systemd rootflags=rw mount.usrflags=ro" +CONFIG_CMDLINE="init=/usr/lib/systemd/systemd rootflags=rw mount.usrflags=ro audit=0" CONFIG_HIBERNATION=y # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set