diff --git a/README.md b/README.md index 5ec173c9d..8dd1b5ac3 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,12 @@ This is a screenshot of the current development version of Minimal Linux Live: ### Current development state -As of **23-Jun-2018**: +As of **16-Mar-2019**: -* Linux kernel 4.17.2 (stable) +* Linux kernel 5.0.2 (stable) * GNU C Library 2.27 (stable) -* BusyBox 1.28.4 (stable) -* Stable build on default Ubuntu 18.04 installation with applied system updates. +* BusyBox 1.30.1 (stable) +* Stable build on default Ubuntu 18.04.2 installation with applied system updates. ### Future improvements diff --git a/src/.config b/src/.config index ad85bab30..e3171a7a2 100644 --- a/src/.config +++ b/src/.config @@ -11,7 +11,7 @@ # # http://kernel.org # -KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.20.1.tar.xz +KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v5.x/linux-5.0.2.tar.xz # You can find the latest GNU C library source bundles here: # @@ -23,7 +23,7 @@ GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.27.tar.bz2 # # http://busybox.net # -BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.29.3.tar.bz2 +BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.30.1.tar.bz2 # You can find the latest Syslinux source bundles here: # diff --git a/src/09_generate_rootfs.sh b/src/09_generate_rootfs.sh index c9d4cd5f7..0fac13b12 100755 --- a/src/09_generate_rootfs.sh +++ b/src/09_generate_rootfs.sh @@ -41,6 +41,7 @@ fi # BusyBox has direct dependencies on these libraries. cp $SYSROOT/lib/libm.so.6 $ROOTFS/lib cp $SYSROOT/lib/libc.so.6 $ROOTFS/lib +cp $SYSROOT/lib/libresolv.so.2 $ROOTFS/lib # Copy all necessary 'glibc' libraries to '/lib' END. diff --git a/src/README b/src/README index 8af0d2a8a..58d9ccb6f 100644 --- a/src/README +++ b/src/README @@ -10,7 +10,7 @@ configured. Check the project website for more information: For Ubuntu and other Debian based operating systems you can use the following command in order to resolve the required build dependencies: - sudo apt install wget make gawk gcc bc libelf-dev xorriso + sudo apt install wget make gawk gcc bc bison flex xorriso libelf-dev libssl-dev Once you have your ISO image up and running perhaps you'd like to examine the configuration file '.config' and see what options you have there. For example, diff --git a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh index b3285ffae..9fc9de8db 100755 --- a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh +++ b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh @@ -4,30 +4,4 @@ set -e . ../../common.sh -if [ ! -d $SYSROOT ] ; then - echo "Cannot continue - GLIBC is missing. Please buld GLIBC first." - exit 1 -fi - -mkdir -p "$WORK_DIR/overlay/$BUNDLE_NAME" -cd $WORK_DIR/overlay/$BUNDLE_NAME - -rm -rf $DEST_DIR - -mkdir -p $DEST_DIR/lib -cp $SYSROOT/lib/libresolv.so.2 $DEST_DIR/lib/ -ln -s libresolv.so.2 $DEST_DIR/lib/libresolv.so - -echo "Reducing '$BUNDLE_NAME' size." -set +e -strip -g $DEST_DIR/lib/* -set -e - -# With '--remove-destination' all possibly existing soft links in -# '$OVERLAY_ROOTFS' will be overwritten correctly. -cp -r --remove-destination $DEST_DIR/* \ - $OVERLAY_ROOTFS - -echo "Bundle '$BUNDLE_NAME' has been installed." - -cd $SRC_DIR +echo "Bundle '$BUNDLE_NAME' is provided by the initramfs."