diff --git a/Makefile b/Makefile index f05094f..405aad5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -KERNEL_VERSION := 4.14.111 +KERNEL_VERSION := 4.14.118 BUSYBOX_VERSION := 1.29.3 OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img diff --git a/README.md b/README.md index 87083a1..b98e8d3 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It's inspired by the following projects. - [DhyveOS](https://github.com/nlf/dhyve-os) ## Features -- Built with Buildroot 2019.02.2 with Linux kernel v4.14.111 and glibc. +- Built with Buildroot 2019.02.2 with Linux kernel v4.14.118 and glibc. - Strip down the Linux kernel modules and drivers - Busybox + the following utilities from Buildroot - sudo, bash, wget, xz, sntp, logrotate diff --git a/configs/buildroot.config b/configs/buildroot.config index 8aad3e9..4e126e0 100644 --- a/configs/buildroot.config +++ b/configs/buildroot.config @@ -384,8 +384,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.111" -BR2_LINUX_KERNEL_VERSION="4.14.111" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.118" +BR2_LINUX_KERNEL_VERSION="4.14.118" BR2_LINUX_KERNEL_PATCH="/build/patches/linux" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set diff --git a/configs/kernel.config b/configs/kernel.config index 26dac63..c765115 100644 --- a/configs/kernel.config +++ b/configs/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.14.111 Kernel Configuration +# Linux/x86_64 4.14.118 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1790,6 +1790,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_DEVMEM is not set # CONFIG_DEVKMEM is not set @@ -1837,7 +1838,6 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set # CONFIG_RAW_DRIVER is not set diff --git a/patches/linux/0001-Fix-random-fix-crng_ready-test-patch.patch b/patches/linux/0001-Fix-random-fix-crng_ready-test-patch.patch index 44b7e2f..19dbfea 100644 --- a/patches/linux/0001-Fix-random-fix-crng_ready-test-patch.patch +++ b/patches/linux/0001-Fix-random-fix-crng_ready-test-patch.patch @@ -1,4 +1,4 @@ -From 2bbaec5d3f60c304828f145036093555fee425a4 Mon Sep 17 00:00:00 2001 +From 8403a04803750896aa5a49ee4c94f31f8a992693 Mon Sep 17 00:00:00 2001 From: "A.I" Date: Thu, 3 May 2018 23:47:55 -0700 Subject: [PATCH] Fix "random: fix crng_ready() test" patch diff --git a/patches/linux/0002-Revert-x86-Kconfig-Select-SCHED_SMT-if-SMP-enabled.patch b/patches/linux/0002-Revert-x86-Kconfig-Select-SCHED_SMT-if-SMP-enabled.patch index 17c3f21..f75c333 100644 --- a/patches/linux/0002-Revert-x86-Kconfig-Select-SCHED_SMT-if-SMP-enabled.patch +++ b/patches/linux/0002-Revert-x86-Kconfig-Select-SCHED_SMT-if-SMP-enabled.patch @@ -1,4 +1,4 @@ -From fdac1fef1e8cda0940fe71f3bdaaec8c217ca9a9 Mon Sep 17 00:00:00 2001 +From 9401841d985e25bc981cac39ec978f6664ce1e4b Mon Sep 17 00:00:00 2001 From: "A.I" Date: Sun, 30 Dec 2018 10:41:24 -0800 Subject: [PATCH] Revert "x86/Kconfig: Select SCHED_SMT if SMP enabled"