From 3f7b34eb85d9964a7e575c23f495c2c2642a409c Mon Sep 17 00:00:00 2001 From: "A.I" Date: Mon, 23 Oct 2017 19:39:04 -0700 Subject: [PATCH 1/2] Upgrade buildroot-2017.08.1 - busybox 1.27.2 --- Dockerfile | 2 +- Makefile | 2 +- README.md | 2 +- configs/buildroot.config | 6 +++--- configs/busybox.config | 5 +++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e22e398..bc008c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV SRC_DIR=/build \ BR_ROOT=/build/buildroot RUN mkdir -p ${SRC_DIR} ${OVERLAY} -ENV BR_VERSION 2017.08 +ENV BR_VERSION 2017.08.1 RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.bz2 | tar xj && \ mv buildroot-${BR_VERSION} ${BR_ROOT} diff --git a/Makefile b/Makefile index 53d0c67..16671df 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ KERNEL_VERSION := 4.9.52 -BUSYBOX_VERSION := 1.27.1 +BUSYBOX_VERSION := 1.27.2 OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img SOURCES := Dockerfile .dockerignore \ diff --git a/README.md b/README.md index 6a6c82a..9d92b05 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It's inspired by the following projects. ## Features -- Built with Buildroot 2017.08 with Linux kernel v4.9.52 and glibc. +- Built with Buildroot 2017.08.1 with Linux kernel v4.9.52 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 ea4b169..44a36a7 100644 --- a/configs/buildroot.config +++ b/configs/buildroot.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2017.08 Configuration +# Buildroot 2017.08.1 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_5=y @@ -851,7 +851,7 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y # BR2_PACKAGE_XORG7 is not set # -# midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9, host gcc >= 4.8 +# midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5, host gcc >= 4.8 # # BR2_PACKAGE_XKEYBOARD_CONFIG is not set @@ -1426,7 +1426,7 @@ BR2_PACKAGE_JPEG_SIMD_SUPPORT=y BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y # -# webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9, host gcc >= 4.8 +# webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5, host gcc >= 4.8 # # BR2_PACKAGE_WEBP is not set diff --git a/configs/busybox.config b/configs/busybox.config index c7f1150..46b6a87 100644 --- a/configs/busybox.config +++ b/configs/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.27.1 -# Thu Aug 3 20:38:15 2017 +# Busybox version: 1.27.2 +# Tue Oct 24 03:09:13 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -10,6 +10,7 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set CONFIG_SHOW_USAGE=y From 063261792856aa5c6b860acd5bc56520f7609105 Mon Sep 17 00:00:00 2001 From: "A.I" Date: Mon, 23 Oct 2017 19:39:20 -0700 Subject: [PATCH 2/2] Upgrade kernel to v4.9.58 --- Makefile | 2 +- README.md | 2 +- configs/buildroot.config | 4 ++-- configs/kernel.config | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 16671df..03e5e2b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -KERNEL_VERSION := 4.9.52 +KERNEL_VERSION := 4.9.58 BUSYBOX_VERSION := 1.27.2 OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img diff --git a/README.md b/README.md index 9d92b05..a8125df 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It's inspired by the following projects. ## Features -- Built with Buildroot 2017.08.1 with Linux kernel v4.9.52 and glibc. +- Built with Buildroot 2017.08.1 with Linux kernel v4.9.58 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 44a36a7..6e1b7cc 100644 --- a/configs/buildroot.config +++ b/configs/buildroot.config @@ -355,8 +355,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.9.52" -BR2_LINUX_KERNEL_VERSION="4.9.52" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.58" +BR2_LINUX_KERNEL_VERSION="4.9.58" 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 6e6128e..327af31 100644 --- a/configs/kernel.config +++ b/configs/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.52 Kernel Configuration +# Linux/x86_64 4.9.58 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2482,6 +2482,7 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set