From 5e859c098ce838beca4fb369283c26a12b836540 Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Thu, 13 Oct 2016 18:48:29 +0300 Subject: [PATCH] Fixed runtime issue with the latest "Links" text browser. Updated all components with their latest stable versions. Minor update on the Felix start-up script. Documentation updates. Note that the scripts still need better documentation, especially the "overlay" related scripts. --- src/.config | 33 ++++++++++++++++++--------------- src/README | 30 +++++++++++++++++++++--------- src/overlay_felix_02_install.sh | 2 +- src/overlay_java.sh | 4 ++-- src/overlay_links_02_build.sh | 1 + 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/.config b/src/.config index 3ee5237e6..15a703c28 100644 --- a/src/.config +++ b/src/.config @@ -1,3 +1,6 @@ +# If this is the first time you build "Minimal Linux Live", then I suggest you +# go through the README file first. + ################################################### # # # This section contains the main source bundles # @@ -8,19 +11,19 @@ # # http://kernel.org # -KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.6.5.tar.xz +KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.8.1.tar.xz # You can find the latest GNU libc source bundles here: # # http://gnu.org/software/libc # -GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.23.tar.bz2 +GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.24.tar.bz2 # You can find the latest BusyBox source bundles here: # # http://busybox.net # -BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.24.2.tar.bz2 +BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.25.1.tar.bz2 # You can find the latest Syslinux source bundles here: # @@ -42,27 +45,26 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0 # # http://links.twibright.com # -LINKS_SOURCE_URL=http://links.twibright.com/download/links-2.12.tar.bz2 +LINKS_SOURCE_URL=http://links.twibright.com/download/links-2.13.tar.bz2 # You can find the latest Dropbear source bundles here: # # http://matt.ucc.asn.au/dropbear/dropbear.html # -DROPBEAR_SOURCE_URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2016.73.tar.bz2 +DROPBEAR_SOURCE_URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-2016.74.tar.bz2 # You can find the latest Apache Felix source bundles here: # # http://felix.apache.org # -FELIX_SOURCE_URL=http://www-us.apache.org/dist/felix/org.apache.felix.main.distribution-5.4.0.tar.gz +FELIX_SOURCE_URL=http://www-us.apache.org/dist/felix/org.apache.felix.main.distribution-5.6.0.tar.gz -# Download Oracle's jdk/jre and set the property with the absolute path to -# the archive. Example: +# You need to manually download Oracle's JRE or JDK and set the property with +# the absolute path to the downloaded archive. Example: # -# JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u91-linux-x64.tar.gz +# JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u102-linux-x64.tar.gz # #JAVA_ARCHIVE=/absolute/path/to/java.archive.tar.gz -#JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u91-linux-x64.tar.gz @@ -141,14 +143,15 @@ COPY_SOURCE_ISO=true # # Currently available overlay software: # -# glibc_full - all core GNU C libraries (useful if other software is included) -# links - text browser -# dropbear - SSH server and client -# java - installs Oracle's JRE or JDK. Manual steps required. +# glibc_full - all core GNU C libraries (useful if other software is included). +# links - text browser. +# dropbear - SSH server and client. +# java - installs Oracle's JRE or JDK. Manual preparations are required. # felix - Apache Felix OSGi framework. # +# Refer to the README file for more information. +# #OVERLAY_BUNDLES=glibc_full,links,dropbear,java,felix -#OVERLAY_BUNDLES=glibc_full,java,felix # This property enables the standard penguin boot logo in the upper left corner # of the screen. The property is used in 'xx_build_kernel.sh'. The default value diff --git a/src/README b/src/README index c073afdd1..69b522b54 100644 --- a/src/README +++ b/src/README @@ -6,37 +6,49 @@ sh build_minimal_linux_live.sh Note that the build process requires proper toolchain already installed and configured. Check the project's website for more information: -http://minimal.linux-bg.org +http://minimal.idzona.com Once you have your ISO image up and running perhaps you'd like to play with the -configuration file '.config' and see what options you have there. For example -you can change the property 'OVERLAY_SOFTWARE'. If you do that you will have +configuration file ".config" and see what options you have there. For example +you can enable the property "OVERLAY_BUNDLES". If you do that you will have additional software being downloaded, built and installed on the ISO image. -Currently available overlay software: +Currently available overlay bundles: - * GLIBC - Set of all core GNU C libraries packaged together. Requires ~3MB +* GLIBC - Set of all core GNU C libraries packaged together. Requires ~3MB additional space. This overlay bundle is not host specific and can always be built. The libraries are useful if you plan to use more software after boot. This overlay bundle depends on the GLIBC build process. - * Links - text based browser. Requires ~1MB additional space. Use the - 'links' command to activate the browser. +* Links - text based browser. Requires ~1MB additional space. Use the + "links" command to activate the browser. This overlay bundle is self sufficient and doesn't require other overlay bundles. - * Dropbear - SSH server/client. Requires ~1MB additional space. The build +* Dropbear - SSH server/client. Requires ~1MB additional space. The build process creates user 'root' with password 'toor'. These are sample commands which demonstrate how to use Dropbear: - + SSH server (Alt + F1): dropbear -E -F SSH client (Alt + F2): dbclient 10.0.2.15 -l root This overlay bundle depends on the GLIBC build process. +* JRE / JDK - Oracle's JRE or JDK. Requires ~366MB additional space for JDK. + This overlay bundle requires some manual preparation steps. Refer + to the "JAVA_ARCHIVE" property in the ".config" file for more + detailed information. + + This overlay bundle depends on the GLIBC build process. + +* Felix OSGi - Apache Felix OSGi framework. Requires ~2MB additional space. Use + the "felix-start" command to run the Apache Felix OSGi framework. + + This overlay bundle depends on the Java overlay bundle. + ### ### ### I only provide the build scripts. It's entirely up to you to configure and diff --git a/src/overlay_felix_02_install.sh b/src/overlay_felix_02_install.sh index 9496b5124..63d5e874b 100755 --- a/src/overlay_felix_02_install.sh +++ b/src/overlay_felix_02_install.sh @@ -24,7 +24,7 @@ cp -r * $SRC_DIR/work/overlay/felix/felix_installed/opt/felix cd $SRC_DIR/work/overlay/felix/felix_installed -ln -s ../opt/felix/bin/felix-start.sh bin/felix-start.sh +ln -s ../opt/felix/bin/felix-start.sh bin/felix-start cp -r $SRC_DIR/work/overlay/felix/felix_installed/* \ $SRC_DIR/work/src/minimal_overlay diff --git a/src/overlay_java.sh b/src/overlay_java.sh index 076ca7b16..9df912357 100755 --- a/src/overlay_java.sh +++ b/src/overlay_java.sh @@ -11,7 +11,7 @@ # # Example: # -# JAVA_ARCHIVE=/home/myself/Downloads/jdk-8u91-linux-x64.tar.gz +# JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u102-linux-x64.tar.gz # # 3) Run this script. Note that the script will fail with error message if the # 'JAVA_ARCHIVE' property is not set or if it points to invalid file. @@ -25,7 +25,7 @@ if [ "$JAVA_ARCHIVE" = "" ] ; then echo "ERROR: configuration property 'JAVA_ARCHIVE' is not set." exit 1 elif [ ! -f "$JAVA_ARCHIVE" ] ; then - echo "ERROR: configuration property 'JAVA_ARCHIVE' points to non existent file." + echo "ERROR: configuration property 'JAVA_ARCHIVE' points to nonexistent file." exit 1 fi diff --git a/src/overlay_links_02_build.sh b/src/overlay_links_02_build.sh index 7058def9f..f6bcb1853 100755 --- a/src/overlay_links_02_build.sh +++ b/src/overlay_links_02_build.sh @@ -28,6 +28,7 @@ echo "Configuring Links..." --disable-utf8 \ --without-ipv6 \ --without-ssl \ + --without-zlib \ --without-x # Set CFLAGS directly in Makefile.