From 52e3938d1f759371d5d45caebcc6a0cb5fdea32d Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Mon, 25 Mar 2019 16:20:01 +0200 Subject: [PATCH] kernel=5.0.4; Busybox build has been fixed => explicitly linked with GLIBC from sysroot. --- README.md | 4 ++-- src/.config | 4 ++-- src/07_build_busybox.sh | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c229660e5..3ed27ae2e 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,9 @@ This is a screenshot of the current development version of Minimal Linux Live: ### Current development state -As of **16-Mar-2019**: +As of **25-Mar-2019**: -* Linux kernel 5.0.2 (stable) +* Linux kernel 5.0.4 (stable) * GNU C Library 2.27 (stable) * BusyBox 1.30.1 (stable) * Stable build on default Ubuntu 18.04.2 installation with applied system updates. diff --git a/src/.config b/src/.config index e3171a7a2..d6236808d 100644 --- a/src/.config +++ b/src/.config @@ -11,13 +11,13 @@ # # http://kernel.org # -KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v5.x/linux-5.0.2.tar.xz +KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v5.x/linux-5.0.4.tar.xz # You can find the latest GNU C library source bundles here: # # http://gnu.org/software/libc # -GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.27.tar.bz2 +GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.29.tar.bz2 # You can find the latest BusyBox source bundles here: # diff --git a/src/07_build_busybox.sh b/src/07_build_busybox.sh index 4b6e3e138..f59a93e76 100755 --- a/src/07_build_busybox.sh +++ b/src/07_build_busybox.sh @@ -39,10 +39,12 @@ fi # Now we tell BusyBox to use the sysroot area. sed -i "s|.*CONFIG_SYSROOT.*|CONFIG_SYSROOT=\"$SYSROOT\"|" .config +# Configure the compiler flags and explicitly link Busybox with GLIBC from sysroot. +sed -i "s|.*CONFIG_EXTRA_CFLAGS.*|CONFIG_EXTRA_CFLAGS=\"$CFLAGS -L$SYSROOT/lib\"|" .config + # Compile busybox with optimization for "parallel jobs" = "number of processors". echo "Building BusyBox." make \ - EXTRA_CFLAGS="$CFLAGS" \ busybox -j $NUM_JOBS # Create the symlinks for busybox. The file 'busybox.links' is used for this.