From c736467394708c26d7165a2176d2565f11b54f48 Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Wed, 29 Nov 2017 22:06:36 +0200 Subject: [PATCH] Replaced all '...' with single '.' in all scripts. --- src/00_clean.sh | 2 +- src/01_get_kernel.sh | 2 +- src/02_build_kernel.sh | 6 +++--- src/03_get_glibc.sh | 2 +- src/04_build_glibc.sh | 10 +++++----- src/05_prepare_sysroot.sh | 4 ++-- src/06_get_busybox.sh | 2 +- src/07_build_busybox.sh | 10 +++++----- src/08_prepare_bundles.sh | 2 +- src/10_pack_rootfs.sh | 2 +- src/minimal_overlay/bundles/cf_cli/01_get.sh | 2 +- src/minimal_overlay/bundles/cf_cli/02_install.sh | 2 +- src/minimal_overlay/bundles/coreutils/01_get.sh | 2 +- .../bundles/coreutils/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/dialog/01_get.sh | 2 +- src/minimal_overlay/bundles/dialog/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/dropbear/01_get.sh | 2 +- src/minimal_overlay/bundles/dropbear/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/felix/01_get.sh | 2 +- src/minimal_overlay/bundles/felix/02_install.sh | 2 +- src/minimal_overlay/bundles/fio/01_get.sh | 2 +- src/minimal_overlay/bundles/fio/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/kbd/01_get.sh | 2 +- src/minimal_overlay/bundles/kbd/02_build.sh | 10 +++++----- .../bundles/kexec-tools/01_get.sh | 2 +- .../bundles/kexec-tools/02_build.sh | 6 +++--- src/minimal_overlay/bundles/libevent/01_get.sh | 2 +- src/minimal_overlay/bundles/libevent/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/links/01_get.sh | 2 +- src/minimal_overlay/bundles/links/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/lua/01_get.sh | 2 +- src/minimal_overlay/bundles/lua/02_build.sh | 8 ++++---- src/minimal_overlay/bundles/make/01_get.sh | 2 +- src/minimal_overlay/bundles/make/02_build.sh | 10 +++++----- .../bundles/mll_utils/01_prepare.sh | 2 +- .../bundles/mll_utils/02_disk_erase.sh | 2 +- src/minimal_overlay/bundles/nano/01_get.sh | 2 +- src/minimal_overlay/bundles/nano/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/ncurses/01_get.sh | 2 +- src/minimal_overlay/bundles/ncurses/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/openjdk/01_get.sh | 2 +- src/minimal_overlay/bundles/static_get/01_get.sh | 2 +- .../bundles/static_get/02_install.sh | 2 +- src/minimal_overlay/bundles/stress/01_get.sh | 2 +- src/minimal_overlay/bundles/stress/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/util_linux/01_get.sh | 2 +- .../bundles/util_linux/02_build.sh | 10 +++++----- src/minimal_overlay/bundles/vim/01_get.sh | 2 +- src/minimal_overlay/bundles/vim/02_build.sh | 16 ++++++++-------- src/minimal_overlay/bundles/zlib/01_get.sh | 2 +- src/minimal_overlay/bundles/zlib/02_build.sh | 10 +++++----- src/minimal_overlay/overlay_build.sh | 4 ++-- src/minimal_overlay/overlay_clean.sh | 2 +- src/minimal_rootfs/etc/02_overlay.sh | 2 +- src/minimal_rootfs/etc/03_init.sh | 2 +- src/minimal_rootfs/etc/inittab | 4 ++-- src/minimal_rootfs/init | 2 +- 57 files changed, 134 insertions(+), 134 deletions(-) diff --git a/src/00_clean.sh b/src/00_clean.sh index 3912f58ea..d227298f7 100755 --- a/src/00_clean.sh +++ b/src/00_clean.sh @@ -3,7 +3,7 @@ set -e echo "*** CLEAN BEGIN ***" -echo "Cleaning up the main work area. This may take a while..." +echo "Cleaning up the main work area. This may take a while." rm -rf work mkdir work mkdir -p source diff --git a/src/01_get_kernel.sh b/src/01_get_kernel.sh index 8366f07d7..0ba4e8b4f 100755 --- a/src/01_get_kernel.sh +++ b/src/01_get_kernel.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted kernel. -echo "Removing kernel work area. This may take a while..." +echo "Removing kernel work area. This may take a while." rm -rf ../work/kernel mkdir ../work/kernel diff --git a/src/02_build_kernel.sh b/src/02_build_kernel.sh index e6f029153..09eb9e04d 100755 --- a/src/02_build_kernel.sh +++ b/src/02_build_kernel.sh @@ -26,7 +26,7 @@ mkdir kernel_installed cd $(ls -d linux-*) # Cleans up the kernel sources, including configuration files. -echo "Preparing kernel work area..." +echo "Preparing kernel work area." make mrproper -j $NUM_JOBS # Read the 'USE_PREDEFINED_KERNEL_CONFIG' property from '.config' @@ -104,7 +104,7 @@ fi # Compile the kernel with optimization for 'parallel jobs' = 'number of processors'. # Good explanation of the different kernels: # http://unix.stackexchange.com/questions/5518/what-is-the-difference-between-the-following-kernel-makefile-terms-vmlinux-vmlinux -echo "Building kernel..." +echo "Building kernel." make \ CFLAGS="$CFLAGS" \ bzImage -j $NUM_JOBS @@ -115,7 +115,7 @@ cp arch/x86/boot/bzImage \ # Install kernel headers which are used later when we build and configure the # GNU C library (glibc). -echo "Generating kernel headers..." +echo "Generating kernel headers." make \ INSTALL_HDR_PATH=$SRC_DIR/work/kernel/kernel_installed \ headers_install -j $NUM_JOBS diff --git a/src/03_get_glibc.sh b/src/03_get_glibc.sh index c65fdb850..de410f7ba 100755 --- a/src/03_get_glibc.sh +++ b/src/03_get_glibc.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted glibc. -echo "Removing glibc work area. This may take a while..." +echo "Removing glibc work area. This may take a while." rm -rf ../work/glibc mkdir ../work/glibc diff --git a/src/04_build_glibc.sh b/src/04_build_glibc.sh index a1518a470..951e8b25c 100755 --- a/src/04_build_glibc.sh +++ b/src/04_build_glibc.sh @@ -27,12 +27,12 @@ GLIBC_SRC=$(pwd) cd .. # Prepare the work area, e.g. 'work/glibc/glibc_objects'. -echo "Preparing glibc object area. This may take a while..." +echo "Preparing glibc object area. This may take a while." rm -rf glibc_objects mkdir glibc_objects # Prepare the install area, e.g. 'work/glibc/glibc_installed'. -echo "Preparing glibc install area. This may take a while..." +echo "Preparing glibc install area. This may take a while." rm -rf glibc_installed mkdir glibc_installed GLIBC_INSTALLED=$(pwd)/glibc_installed @@ -46,7 +46,7 @@ cd glibc_objects # to be in '/lib64'. Kernel headers are taken from our already prepared kernel # header area (see xx_build_kernel.sh). Packages 'gd' and 'selinux' are disabled # for better build compatibility with the host system. -echo "Configuring glibc..." +echo "Configuring glibc." $GLIBC_SRC/configure \ --prefix= \ --with-headers=$KERNEL_INSTALLED/include \ @@ -56,11 +56,11 @@ $GLIBC_SRC/configure \ CFLAGS="$CFLAGS" # Compile glibc with optimization for "parallel jobs" = "number of processors". -echo "Building glibc..." +echo "Building glibc." make -j $NUM_JOBS # Install glibc in the installation area, e.g. 'work/glibc/glibc_installed'. -echo "Installing glibc..." +echo "Installing glibc." make install \ DESTDIR=$GLIBC_INSTALLED \ -j $NUM_JOBS diff --git a/src/05_prepare_sysroot.sh b/src/05_prepare_sysroot.sh index 501f1e7ea..e8e4c5c96 100755 --- a/src/05_prepare_sysroot.sh +++ b/src/05_prepare_sysroot.sh @@ -6,11 +6,11 @@ SRC_DIR=$(pwd) cd work -echo "Cleaning existing sysroot. This may take a while..." +echo "Cleaning existing sysroot. This may take a while." rm -rf sysroot rm -rf sysroot.specs -echo "Preparing glibc. This may take a while..." +echo "Preparing glibc. This may take a while." cp -r glibc/glibc_installed sysroot cd sysroot diff --git a/src/06_get_busybox.sh b/src/06_get_busybox.sh index f1daa8e12..f4a172463 100755 --- a/src/06_get_busybox.sh +++ b/src/06_get_busybox.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted busybox. -echo "Removing BusyBox work area. This may take a while..." +echo "Removing BusyBox work area. This may take a while." rm -rf ../work/busybox mkdir ../work/busybox diff --git a/src/07_build_busybox.sh b/src/07_build_busybox.sh index f7595b6b0..6f8114260 100755 --- a/src/07_build_busybox.sh +++ b/src/07_build_busybox.sh @@ -25,7 +25,7 @@ rm -rf busybox_installed cd $(ls -d busybox-*) # Remove previously generated artifacts. -echo "Preparing BusyBox work area. This may take a while..." +echo "Preparing BusyBox work area. This may take a while." make distclean -j $NUM_JOBS # Read the 'USE_PREDEFINED_BUSYBOX_CONFIG' property from '.config' @@ -42,12 +42,12 @@ if [ "$USE_PREDEFINED_BUSYBOX_CONFIG" = "true" ] ; then cp -f $SRC_DIR/minimal_config/busybox.config .config else # Create default configuration file. - echo "Generating default BusyBox configuration..." + echo "Generating default BusyBox configuration." make defconfig -j $NUM_JOBS # The 'inetd' applet fails to compile because we use the glibc installation area as # main pointer to the kernel headers (see 05_prepare_glibc.sh) and some headers are - # not resolved. The easiest solution is to ignore this particular applet. + # not resolved. The easiest solution is to ignore this particular applet. sed -i "s/.*CONFIG_INETD.*/CONFIG_INETD=n/" .config fi @@ -62,13 +62,13 @@ sed -i "s/.*CONFIG_SYSROOT.*/CONFIG_SYSROOT=$SYSROOT_ESCAPED/" .config CFLAGS="$(grep -i ^CFLAGS .config | cut -f2 -d'=')" # Compile busybox with optimization for "parallel jobs" = "number of processors". -echo "Building BusyBox..." +echo "Building BusyBox." make \ EXTRA_CFLAGS="$CFLAGS" \ busybox -j $NUM_JOBS # Create the symlinks for busybox. The file 'busybox.links' is used for this. -echo "Generating BusyBox based initramfs area..." +echo "Generating BusyBox based initramfs area." make \ CONFIG_PREFIX="../busybox_installed" \ install -j $NUM_JOBS diff --git a/src/08_prepare_bundles.sh b/src/08_prepare_bundles.sh index a09899465..03d61a9f6 100755 --- a/src/08_prepare_bundles.sh +++ b/src/08_prepare_bundles.sh @@ -13,7 +13,7 @@ rm -rf $SRC_DIR/work/overlay* OVERLAY_BUNDLES="$(grep -i ^OVERLAY_BUNDLES .config | cut -f2 -d'=')" if [ ! "$OVERLAY_BUNDLES" = "" ] ; then - echo "Generating additional overlay bundles. This may take a while..." + echo "Generating additional overlay bundles. This may take a while." cd minimal_overlay ./overlay_build.sh cd $SRC_DIR diff --git a/src/10_pack_rootfs.sh b/src/10_pack_rootfs.sh index b06f2f09c..84e48398b 100755 --- a/src/10_pack_rootfs.sh +++ b/src/10_pack_rootfs.sh @@ -7,7 +7,7 @@ SRC_DIR=$(pwd) cd work -echo "Packing initramfs. This may take a while..." +echo "Packing initramfs. This may take a while." # Remove the old 'initramfs' archive if it exists. rm -f rootfs.cpio.xz diff --git a/src/minimal_overlay/bundles/cf_cli/01_get.sh b/src/minimal_overlay/bundles/cf_cli/01_get.sh index b570e36ce..f11fc4a87 100755 --- a/src/minimal_overlay/bundles/cf_cli/01_get.sh +++ b/src/minimal_overlay/bundles/cf_cli/01_get.sh @@ -28,7 +28,7 @@ else fi # Delete folder with previously prepared cloud foundry cli. -echo "Removing cloud foundry cli work area. This may take a while..." +echo "Removing cloud foundry cli work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/cf_cli/02_install.sh b/src/minimal_overlay/bundles/cf_cli/02_install.sh index 4a85c9e02..e78fd7c57 100755 --- a/src/minimal_overlay/bundles/cf_cli/02_install.sh +++ b/src/minimal_overlay/bundles/cf_cli/02_install.sh @@ -4,7 +4,7 @@ set -e . ../../common.sh -echo "Removing old cloud foundry artifacts. This may take a while..." +echo "Removing old cloud foundry artifacts. This may take a while." rm -rf $DEST_DIR mkdir -p $DEST_DIR/opt/$BUNDLE_NAME mkdir -p $DEST_DIR/bin diff --git a/src/minimal_overlay/bundles/coreutils/01_get.sh b/src/minimal_overlay/bundles/coreutils/01_get.sh index dfecd17f1..c97953b3c 100755 --- a/src/minimal_overlay/bundles/coreutils/01_get.sh +++ b/src/minimal_overlay/bundles/coreutils/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted coreutils. -echo "Removing coreutils work area. This may take a while..." +echo "Removing coreutils work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/coreutils/02_build.sh b/src/minimal_overlay/bundles/coreutils/02_build.sh index ef06446d9..fd50d763f 100755 --- a/src/minimal_overlay/bundles/coreutils/02_build.sh +++ b/src/minimal_overlay/bundles/coreutils/02_build.sh @@ -9,22 +9,22 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the coreutils source directory which ls finds, e.g. 'coreutils-8.28'. cd $(ls -d coreutils-*) -echo "Preparing coreutils work area. This may take a while..." +echo "Preparing coreutils work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring coreutils..." +echo "Configuring coreutils." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building coreutils..." +echo "Building coreutils." make -j $NUM_JOBS -echo "Installing coreutils..." +echo "Installing coreutils." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing coreutils size..." +echo "Reducing coreutils size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/dialog/01_get.sh b/src/minimal_overlay/bundles/dialog/01_get.sh index 1dc7f0041..3ae095bd7 100755 --- a/src/minimal_overlay/bundles/dialog/01_get.sh +++ b/src/minimal_overlay/bundles/dialog/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted dialog. -echo "Removing dialog work area. This may take a while..." +echo "Removing dialog work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/dialog/02_build.sh b/src/minimal_overlay/bundles/dialog/02_build.sh index cb16e60cc..0dbbad66b 100755 --- a/src/minimal_overlay/bundles/dialog/02_build.sh +++ b/src/minimal_overlay/bundles/dialog/02_build.sh @@ -9,23 +9,23 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the dialog source directory which ls finds, e.g. 'dialog-1.3-20170509'. cd $(ls -d dialog-*) -echo "Preparing dialog work area. This may take a while..." +echo "Preparing dialog work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR # Configure dialog -echo "Configuring dialog..." +echo "Configuring dialog." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building dialog..." +echo "Building dialog." make -j $NUM_JOBS -echo "Installing dialog..." +echo "Installing dialog." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing dialog size..." +echo "Reducing dialog size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/usr/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/dropbear/01_get.sh b/src/minimal_overlay/bundles/dropbear/01_get.sh index d9a73a265..6f4c9dd04 100755 --- a/src/minimal_overlay/bundles/dropbear/01_get.sh +++ b/src/minimal_overlay/bundles/dropbear/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted Dropbear. -echo "Removing Dropbear work area. This may take a while..." +echo "Removing Dropbear work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/dropbear/02_build.sh b/src/minimal_overlay/bundles/dropbear/02_build.sh index eacbf5060..5a41d457f 100755 --- a/src/minimal_overlay/bundles/dropbear/02_build.sh +++ b/src/minimal_overlay/bundles/dropbear/02_build.sh @@ -9,21 +9,21 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the Dropbear source directory which ls finds, e.g. 'dropbear-2016.73'. cd $(ls -d dropbear-*) -echo "Preparing Dropbear work area. This may take a while..." +echo "Preparing Dropbear work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring Dropbear..." +echo "Configuring Dropbear." ./configure \ --prefix=/usr \ --disable-zlib \ --disable-loginfunc CFLAGS="$CFLAGS" -echo "Building Dropbear..." +echo "Building Dropbear." make -j $NUM_JOBS -echo "Installing Dropbear..." +echo "Installing Dropbear." make -j $NUM_JOBS install DESTDIR="$DEST_DIR" mkdir -p $DEST_DIR/etc/dropbear @@ -54,7 +54,7 @@ mkdir -p $DEST_DIR/root # Create Dropbear SSH configuration END -echo "Reducing Dropbear size..." +echo "Reducing Dropbear size." strip -g \ $DEST_DIR/usr/bin/* \ $DEST_DIR/usr/sbin/* \ diff --git a/src/minimal_overlay/bundles/felix/01_get.sh b/src/minimal_overlay/bundles/felix/01_get.sh index 148efc67a..835897201 100755 --- a/src/minimal_overlay/bundles/felix/01_get.sh +++ b/src/minimal_overlay/bundles/felix/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted Felix. -echo "Removing Apache Felix work area. This may take a while..." +echo "Removing Apache Felix work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/felix/02_install.sh b/src/minimal_overlay/bundles/felix/02_install.sh index ed2253c38..a86e7ef3c 100755 --- a/src/minimal_overlay/bundles/felix/02_install.sh +++ b/src/minimal_overlay/bundles/felix/02_install.sh @@ -4,7 +4,7 @@ set -e . ../../common.sh -echo "Removing old Apache Felix artifacts. This may take a while..." +echo "Removing old Apache Felix artifacts. This may take a while." rm -rf $DEST_DIR mkdir -p $DEST_DIR/opt/felix mkdir -p $DEST_DIR/bin diff --git a/src/minimal_overlay/bundles/fio/01_get.sh b/src/minimal_overlay/bundles/fio/01_get.sh index e2e49a75a..0bbfb6998 100755 --- a/src/minimal_overlay/bundles/fio/01_get.sh +++ b/src/minimal_overlay/bundles/fio/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted fio. -echo "Removing fio work area. This may take a while..." +echo "Removing fio work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/fio/02_build.sh b/src/minimal_overlay/bundles/fio/02_build.sh index 743c7e338..f86dc191b 100755 --- a/src/minimal_overlay/bundles/fio/02_build.sh +++ b/src/minimal_overlay/bundles/fio/02_build.sh @@ -9,22 +9,22 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the fio source directory which ls finds, e.g. 'fio-3.2'. cd $(ls -d fio-*) -echo "Preparing fio work area. This may take a while..." +echo "Preparing fio work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring fio..." +echo "Configuring fio." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building fio..." +echo "Building fio." make -j $NUM_JOBS -echo "Installing fio..." +echo "Installing fio." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing fio size..." +echo "Reducing fio size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/kbd/01_get.sh b/src/minimal_overlay/bundles/kbd/01_get.sh index b85a0601f..1e3f57438 100755 --- a/src/minimal_overlay/bundles/kbd/01_get.sh +++ b/src/minimal_overlay/bundles/kbd/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted kbd. -echo "Removing kbd work area. This may take a while..." +echo "Removing kbd work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/kbd/02_build.sh b/src/minimal_overlay/bundles/kbd/02_build.sh index 08502174e..f9c115287 100755 --- a/src/minimal_overlay/bundles/kbd/02_build.sh +++ b/src/minimal_overlay/bundles/kbd/02_build.sh @@ -9,23 +9,23 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the kbd source directory which ls finds, e.g. 'kbd-2.04'. cd $(ls -d kbd-*) -echo "Preparing kbd work area. This may take a while..." +echo "Preparing kbd work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring kbd..." +echo "Configuring kbd." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr \ --disable-vlock # vlock requires PAM -echo "Building kbd..." +echo "Building kbd." make -j $NUM_JOBS -echo "Installing kbd..." +echo "Installing kbd." make -j $NUM_JOBS install DESTDIR="$DEST_DIR" -echo "Reducing kbd size..." +echo "Reducing kbd size." strip -g \ $DEST_DIR/usr/bin/* \ $DEST_DIR/usr/sbin/* \ diff --git a/src/minimal_overlay/bundles/kexec-tools/01_get.sh b/src/minimal_overlay/bundles/kexec-tools/01_get.sh index ec86cbbd0..a526e28b6 100755 --- a/src/minimal_overlay/bundles/kexec-tools/01_get.sh +++ b/src/minimal_overlay/bundles/kexec-tools/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted kexec-tools. -echo "Removing kexec-tools work area. This may take a while..." +echo "Removing kexec-tools work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/kexec-tools/02_build.sh b/src/minimal_overlay/bundles/kexec-tools/02_build.sh index 9a2b43919..70d49eecf 100755 --- a/src/minimal_overlay/bundles/kexec-tools/02_build.sh +++ b/src/minimal_overlay/bundles/kexec-tools/02_build.sh @@ -9,11 +9,11 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the kexec-tools source directory which ls finds, e.g. 'kexec-tools-2.0.15'. cd $(ls -d kexec-tools-*) -echo "Preparing kexec-tools work area. This may take a while..." +echo "Preparing kexec-tools work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Building kexec-tools..." +echo "Building kexec-tools." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr \ --without-lzama @@ -22,7 +22,7 @@ make -j $NUM_JOBS make -j $NUM_JOBS install DESTDIR="$DEST_DIR" -echo "Reducing kexec-tools size..." +echo "Reducing kexec-tools size." strip -g $DEST_DIR/usr/bin/* \ $DEST_DIR/usr/lib/* 2>/dev/null diff --git a/src/minimal_overlay/bundles/libevent/01_get.sh b/src/minimal_overlay/bundles/libevent/01_get.sh index a9af10116..d4bcec03c 100755 --- a/src/minimal_overlay/bundles/libevent/01_get.sh +++ b/src/minimal_overlay/bundles/libevent/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted libevent. -echo "Removing libevent work area. This may take a while..." +echo "Removing libevent work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/libevent/02_build.sh b/src/minimal_overlay/bundles/libevent/02_build.sh index b091afea9..db3111cf5 100755 --- a/src/minimal_overlay/bundles/libevent/02_build.sh +++ b/src/minimal_overlay/bundles/libevent/02_build.sh @@ -9,21 +9,21 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the libevent source directory which ls finds, e.g. 'libevent-2.1.8-stable'. cd $(ls -d libevent-*) -echo "Preparing libevent work area. This may take a while..." +echo "Preparing libevent work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring libevent..." +echo "Configuring libevent." CFLAGS="$CFLAGS" ./configure -echo "Building libevent..." +echo "Building libevent." make -j $NUM_JOBS -echo "Installing libevent..." +echo "Installing libevent." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing libevent size..." +echo "Reducing libevent size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/usr/local/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/links/01_get.sh b/src/minimal_overlay/bundles/links/01_get.sh index 9fdab9cbf..7e350d23f 100755 --- a/src/minimal_overlay/bundles/links/01_get.sh +++ b/src/minimal_overlay/bundles/links/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted Links. -echo "Removing Links work area. This may take a while..." +echo "Removing Links work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/links/02_build.sh b/src/minimal_overlay/bundles/links/02_build.sh index e1bb620c9..1fc537e31 100755 --- a/src/minimal_overlay/bundles/links/02_build.sh +++ b/src/minimal_overlay/bundles/links/02_build.sh @@ -9,12 +9,12 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the Links source directory which ls finds, e.g. 'links-2.12'. cd $(ls -d links-*) -echo "Preparing Links work area. This may take a while..." +echo "Preparing Links work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring Links..." +echo "Configuring Links." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr \ --disable-graphics \ @@ -24,13 +24,13 @@ CFLAGS="$CFLAGS" ./configure \ --without-zlib \ --without-x -echo "Building Links..." +echo "Building Links." make -j $NUM_JOBS -echo "Installing Links..." +echo "Installing Links." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing Links size..." +echo "Reducing Links size." strip -g $DEST_DIR/usr/bin/* mkdir -p "$OVERLAY_ROOTFS/usr/bin" diff --git a/src/minimal_overlay/bundles/lua/01_get.sh b/src/minimal_overlay/bundles/lua/01_get.sh index 9d069072e..8825844e4 100755 --- a/src/minimal_overlay/bundles/lua/01_get.sh +++ b/src/minimal_overlay/bundles/lua/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted Lua. -echo "Removing Lua work area. This may take a while..." +echo "Removing Lua work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/lua/02_build.sh b/src/minimal_overlay/bundles/lua/02_build.sh index 55c1dfd41..8ddcef3bb 100755 --- a/src/minimal_overlay/bundles/lua/02_build.sh +++ b/src/minimal_overlay/bundles/lua/02_build.sh @@ -11,18 +11,18 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the Lua source directory which ls finds, e.g. 'lua-5.3.4'. cd $(ls -d lua-*) -echo "Preparing Lua work area. This may take a while..." -# we install lua to /usr and not to /usr/local so we need to fix luaconf.h so lua can find modules, etc ... +echo "Preparing Lua work area. This may take a while." +# we install lua to /usr and not to /usr/local so we need to fix luaconf.h so lua can find modules, etc. sed -i 's/#define LUA_ROOT.*/#define LUA_ROOT \"\/usr\/\"/' src/luaconf.h make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Building Lua..." +echo "Building Lua." make -j $NUM_JOBS posix CFLAGS="$CFLAGS" make -j $NUM_JOBS install INSTALL_TOP="$DEST_DIR/usr" -echo "Reducing Lua size..." +echo "Reducing Lua size." strip -g $DEST_DIR/usr/bin/* 2>/dev/null mkdir -p $OVERLAY_ROOTFS/usr/ diff --git a/src/minimal_overlay/bundles/make/01_get.sh b/src/minimal_overlay/bundles/make/01_get.sh index 6b680cfb4..be3aaa6ad 100755 --- a/src/minimal_overlay/bundles/make/01_get.sh +++ b/src/minimal_overlay/bundles/make/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted make. -echo "Removing make work area. This may take a while..." +echo "Removing make work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/make/02_build.sh b/src/minimal_overlay/bundles/make/02_build.sh index 95f71da32..1c4664d3d 100755 --- a/src/minimal_overlay/bundles/make/02_build.sh +++ b/src/minimal_overlay/bundles/make/02_build.sh @@ -9,25 +9,25 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the make source directory which ls finds, e.g. 'make-8.28'. cd $(ls -d make-*) -echo "Preparing make work area. This may take a while..." +echo "Preparing make work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring make..." +echo "Configuring make." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building make..." +echo "Building make." make -j $NUM_JOBS -echo "Installing make..." +echo "Installing make." make -j $NUM_JOBS install DESTDIR=$DEST_DIR mkdir -p $DEST_DIR/lib cp $SYSROOT/lib/libdl.so.2 $DEST_DIR/lib/ -echo "Reducing make size..." +echo "Reducing make size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/mll_utils/01_prepare.sh b/src/minimal_overlay/bundles/mll_utils/01_prepare.sh index 994e1ef1d..0c7012b74 100755 --- a/src/minimal_overlay/bundles/mll_utils/01_prepare.sh +++ b/src/minimal_overlay/bundles/mll_utils/01_prepare.sh @@ -4,7 +4,7 @@ set -e . ../../common.sh -echo "Preparing the Minimal Linux Live utilities folder. This may take a while..." +echo "Preparing the Minimal Linux Live utilities folder. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir -p $WORK_DIR/overlay/$BUNDLE_NAME/sbin diff --git a/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh b/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh index 6c720ff92..ca3c20288 100755 --- a/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh +++ b/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh @@ -69,7 +69,7 @@ if [ ! "\$2" = "" ] ; then fi for n in \$(seq \$NUM_LOOPS) ; do - echo " Windows update \$n of \$NUM_LOOPS is being installed. Please wait..." + echo " Windows update \$n of \$NUM_LOOPS is being installed. Please wait." dd if=/dev/urandom of=/dev/\$1 bs=1024b conv=notrunc > /dev/null 2>\&1 done diff --git a/src/minimal_overlay/bundles/nano/01_get.sh b/src/minimal_overlay/bundles/nano/01_get.sh index 6cbf71b98..dfc3e7ca8 100755 --- a/src/minimal_overlay/bundles/nano/01_get.sh +++ b/src/minimal_overlay/bundles/nano/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted nano. -echo "Removing nano work area. This may take a while..." +echo "Removing nano work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/nano/02_build.sh b/src/minimal_overlay/bundles/nano/02_build.sh index 133b14a26..05c5915a3 100755 --- a/src/minimal_overlay/bundles/nano/02_build.sh +++ b/src/minimal_overlay/bundles/nano/02_build.sh @@ -9,23 +9,23 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the nano source directory which ls finds, e.g. 'nano-2.8.7'. cd $(ls -d nano-*) -echo "Preparing nano work area. This may take a while..." +echo "Preparing nano work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring nano..." +echo "Configuring nano." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr \ LDFLAGS=-L$DEST_DIR/usr/include -echo "Building nano..." +echo "Building nano." make -j $NUM_JOBS -echo "Installing nano..." +echo "Installing nano." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing nano size..." +echo "Reducing nano size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/ncurses/01_get.sh b/src/minimal_overlay/bundles/ncurses/01_get.sh index 4757ceddd..d8f16a657 100755 --- a/src/minimal_overlay/bundles/ncurses/01_get.sh +++ b/src/minimal_overlay/bundles/ncurses/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted ncurses. -echo "Removing ncurses work area. This may take a while..." +echo "Removing ncurses work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/ncurses/02_build.sh b/src/minimal_overlay/bundles/ncurses/02_build.sh index e4c9f6977..084406e9b 100755 --- a/src/minimal_overlay/bundles/ncurses/02_build.sh +++ b/src/minimal_overlay/bundles/ncurses/02_build.sh @@ -9,7 +9,7 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the ncurses source directory which ls finds, e.g. 'ncurses-6.0'. cd $(ls -d ncurses-*) -echo "Preparing ncurses work area. This may take a while..." +echo "Preparing ncurses work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR @@ -19,7 +19,7 @@ sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in # http://www.linuxfromscratch.org/lfs/view/development/chapter06/ncurses.html # Configure Ncurses -echo "Configuring Ncurses..." +echo "Configuring ncurses." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr \ --with-termlib \ @@ -42,10 +42,10 @@ CFLAGS="$CFLAGS" ./configure \ # CPPFLAGS fixes a bug with Ubuntu 16.04 # https://trac.sagemath.org/ticket/19762 -echo "Building ncurses..." +echo "Building ncurses." make -j $NUM_JOBS -echo "Installing ncurses..." +echo "Installing ncurses." make -j $NUM_JOBS install DESTDIR=$DEST_DIR # Symnlink wide character libraries @@ -55,7 +55,7 @@ ln -s libncurses.so.5 libncurses.so ln -s libtinfow.so.5 libtinfo.so.5 ln -s libtinfo.so.5 libtinfo.so -echo "Reducing ncurses size..." +echo "Reducing ncurses size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/usr/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/openjdk/01_get.sh b/src/minimal_overlay/bundles/openjdk/01_get.sh index b7ab37f3f..1b3a25ee8 100755 --- a/src/minimal_overlay/bundles/openjdk/01_get.sh +++ b/src/minimal_overlay/bundles/openjdk/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted Felix. -echo "Removing Open JDK work area. This may take a while..." +echo "Removing Open JDK work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/static_get/01_get.sh b/src/minimal_overlay/bundles/static_get/01_get.sh index b4bbf1362..9fd50400b 100755 --- a/src/minimal_overlay/bundles/static_get/01_get.sh +++ b/src/minimal_overlay/bundles/static_get/01_get.sh @@ -26,7 +26,7 @@ else fi # Delete folder with previously prepared static-get. -echo "Removing static-get work area. This may take a while..." +echo "Removing static-get work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/static_get/02_install.sh b/src/minimal_overlay/bundles/static_get/02_install.sh index 9cb86e751..12b565b94 100755 --- a/src/minimal_overlay/bundles/static_get/02_install.sh +++ b/src/minimal_overlay/bundles/static_get/02_install.sh @@ -4,7 +4,7 @@ set -e . ../../common.sh -echo "Removing old static-get artifacts. This may take a while..." +echo "Removing old static-get artifacts. This may take a while." rm -rf $DEST_DIR mkdir -p $DEST_DIR/opt/$BUNDLE_NAME mkdir -p $DEST_DIR/bin diff --git a/src/minimal_overlay/bundles/stress/01_get.sh b/src/minimal_overlay/bundles/stress/01_get.sh index 189b70dec..f403fc702 100755 --- a/src/minimal_overlay/bundles/stress/01_get.sh +++ b/src/minimal_overlay/bundles/stress/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted stress. -echo "Removing stress work area. This may take a while..." +echo "Removing stress work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/stress/02_build.sh b/src/minimal_overlay/bundles/stress/02_build.sh index 4a8e2e795..1ffafa650 100755 --- a/src/minimal_overlay/bundles/stress/02_build.sh +++ b/src/minimal_overlay/bundles/stress/02_build.sh @@ -11,22 +11,22 @@ DESTDIR="$PWD/stress_installed" # Change to the stress source directory which ls finds, e.g. 'stress-1.0.4'. cd $(ls -d stress-*) -echo "Preparing stress work area. This may take a while..." +echo "Preparing stress work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring stress..." +echo "Configuring stress." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building stress..." +echo "Building stress." make -j $NUM_JOBS -echo "Installing stress..." +echo "Installing stress." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing stress size..." +echo "Reducing stress size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/util_linux/01_get.sh b/src/minimal_overlay/bundles/util_linux/01_get.sh index 2506e9fd5..8cd576bc7 100755 --- a/src/minimal_overlay/bundles/util_linux/01_get.sh +++ b/src/minimal_overlay/bundles/util_linux/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted util-linux. -echo "Removing util-linux work area. This may take a while..." +echo "Removing util-linux work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/util_linux/02_build.sh b/src/minimal_overlay/bundles/util_linux/02_build.sh index 14d6a9479..534ed3249 100755 --- a/src/minimal_overlay/bundles/util_linux/02_build.sh +++ b/src/minimal_overlay/bundles/util_linux/02_build.sh @@ -9,12 +9,12 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the util-linux source directory which ls finds, e.g. 'util-linux-2.31'. cd $(ls -d util-linux-*) -echo "Preparing util-linux work area. This may take a while..." +echo "Preparing util-linux work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring util-linux..." +echo "Configuring util-linux." CFLAGS="$CFLAGS" ./configure \ ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-2.31 \ @@ -30,13 +30,13 @@ CFLAGS="$CFLAGS" ./configure \ --without-systemd \ --without-systemdsystemunitdir -echo "Building util-linux..." +echo "Building util-linux." make -j $NUM_JOBS -echo "Installing util-linux..." +echo "Installing util-linux." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Reducing util-linux size..." +echo "Reducing util-linux size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/vim/01_get.sh b/src/minimal_overlay/bundles/vim/01_get.sh index 7344e76a2..b4ae13fad 100755 --- a/src/minimal_overlay/bundles/vim/01_get.sh +++ b/src/minimal_overlay/bundles/vim/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted vim. -echo "Removing vim work area. This may take a while..." +echo "Removing vim work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/vim/02_build.sh b/src/minimal_overlay/bundles/vim/02_build.sh index 72b0220ee..ebf9d71ad 100755 --- a/src/minimal_overlay/bundles/vim/02_build.sh +++ b/src/minimal_overlay/bundles/vim/02_build.sh @@ -9,25 +9,25 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the vim source directory which ls finds, e.g. 'vim-8.0.1298'. cd $(ls -d vim-*) -echo "Preparing vim work area. This may take a while..." +echo "Preparing vim work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Setting vimrc location..." +echo "Setting vimrc location." echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h -echo "Configuring vim..." +echo "Configuring vim." CFLAGS="$CFLAGS" ./configure \ --prefix=/usr -echo "Building vim..." +echo "Building vim." make -j $NUM_JOBS -echo "Installing vim..." +echo "Installing vim." make -j $NUM_JOBS install DESTDIR=$DEST_DIR -echo "Generating vimrc..." +echo "Generating vimrc." mkdir -p $DEST_DIR/etc cat > $DES_TDIR/etc/vimrc << "EOF" " Begin /etc/vimrc @@ -41,12 +41,12 @@ set background=dark " End /etc/vimrc EOF -echo "Symlinking vim to vi..." +echo "Symlinking vim to vi." ln -sv vim $DEST_DIR/usr/bin/vi mkdir -p $DEST_DIR/bin ln -sv vim $DEST_DIR/bin/vi -echo "Reducing vim size..." +echo "Reducing vim size." strip -g $DEST_DIR/usr/bin/* cp -r $DEST_DIR/* $OVERLAY_ROOTFS diff --git a/src/minimal_overlay/bundles/zlib/01_get.sh b/src/minimal_overlay/bundles/zlib/01_get.sh index 2a845d617..addc0ce4f 100755 --- a/src/minimal_overlay/bundles/zlib/01_get.sh +++ b/src/minimal_overlay/bundles/zlib/01_get.sh @@ -29,7 +29,7 @@ else fi # Delete folder with previously extracted ZLIB. -echo "Removing ZLIB work area. This may take a while..." +echo "Removing ZLIB work area. This may take a while." rm -rf $WORK_DIR/overlay/$BUNDLE_NAME mkdir $WORK_DIR/overlay/$BUNDLE_NAME diff --git a/src/minimal_overlay/bundles/zlib/02_build.sh b/src/minimal_overlay/bundles/zlib/02_build.sh index 0cd84a834..ef72990fe 100755 --- a/src/minimal_overlay/bundles/zlib/02_build.sh +++ b/src/minimal_overlay/bundles/zlib/02_build.sh @@ -9,22 +9,22 @@ cd $WORK_DIR/overlay/$BUNDLE_NAME # Change to the Links source directory which ls finds, e.g. 'zlib-1.2.11'. cd $(ls -d zlib-*) -echo "Preparing ZLIB work area. This may take a while..." +echo "Preparing ZLIB work area. This may take a while." make -j $NUM_JOBS clean rm -rf $DEST_DIR -echo "Configuring ZLIB..." +echo "Configuring ZLIB." CFLAGS="$CFLAGS" ./configure \ --prefix=$DEST_DIR -echo "Building ZLIB..." +echo "Building ZLIB." make -j $NUM_JOBS -echo "Installing ZLIB..." +echo "Installing ZLIB." make -j $NUM_JOBS install -echo "Reducing ZLIB size..." +echo "Reducing ZLIB size." strip -g $DEST_DIR/lib/* mkdir -p "$OVERLAY_ROOTFS/lib" diff --git a/src/minimal_overlay/overlay_build.sh b/src/minimal_overlay/overlay_build.sh index fa8b1f980..30d8e878b 100755 --- a/src/minimal_overlay/overlay_build.sh +++ b/src/minimal_overlay/overlay_build.sh @@ -55,7 +55,7 @@ do elif [ -d $MAIN_SRC_DIR/work/overlay/$BUNDLE_DEP ] ; then echo "Overlay bundle '$BUNDLE_DEP' has already been prepared." else - echo "Preparing overlay bundle '$BUNDLE_DEP'..." + echo "Preparing overlay bundle '$BUNDLE_DEP'." cd $SRC_DIR ./overlay_build.sh --skip-clean $BUNDLE_DEP echo "Overlay bundle '$BUNDLE_DEP' has been prepared." @@ -73,7 +73,7 @@ do cd $BUNDLE_DIR - echo "Building overlay bundle '$BUNDLE'..." + echo "Building overlay bundle '$BUNDLE'." $BUNDLE_SCRIPT cd $SRC_DIR diff --git a/src/minimal_overlay/overlay_clean.sh b/src/minimal_overlay/overlay_clean.sh index d6af5aeb2..01ea8ec36 100755 --- a/src/minimal_overlay/overlay_clean.sh +++ b/src/minimal_overlay/overlay_clean.sh @@ -4,7 +4,7 @@ set -e SRC_DIR=$(pwd) -echo "Cleaning up the overlay work area. This may take a while..." +echo "Cleaning up the overlay work area. This may take a while." rm -rf ../work/overlay rm -rf ../work/overlay_rootfs diff --git a/src/minimal_rootfs/etc/02_overlay.sh b/src/minimal_rootfs/etc/02_overlay.sh index e83de560a..78ca29ba3 100755 --- a/src/minimal_rootfs/etc/02_overlay.sh +++ b/src/minimal_rootfs/etc/02_overlay.sh @@ -169,7 +169,7 @@ echo -e "Mount locations \\e[94m/dev\\e[0m, \\e[94m/sys\\e[0m, \\e[94m/tmp\\e[0m echo "Switching from initramfs root area to overlayfs root area." exec switch_root /mnt /etc/03_init.sh -echo "(/etc/02_overlay.sh) - there is a serious bug..." +echo "(/etc/02_overlay.sh) - there is a serious bug." # Wait until any key has been pressed. read -n1 -s diff --git a/src/minimal_rootfs/etc/03_init.sh b/src/minimal_rootfs/etc/03_init.sh index 2d55b75b4..3a1acc162 100755 --- a/src/minimal_rootfs/etc/03_init.sh +++ b/src/minimal_rootfs/etc/03_init.sh @@ -59,7 +59,7 @@ else fi fi -echo "(/etc/03_init.sh) - there is a serious bug..." +echo "(/etc/03_init.sh) - there is a serious bug." # Wait until any key has been pressed. read -n1 -s diff --git a/src/minimal_rootfs/etc/inittab b/src/minimal_rootfs/etc/inittab index dc098e98e..c106927cc 100644 --- a/src/minimal_rootfs/etc/inittab +++ b/src/minimal_rootfs/etc/inittab @@ -1,8 +1,8 @@ ::sysinit:/etc/04_bootscript.sh ::restart:/sbin/init -::shutdown:echo -e "\nSync all file buffers..." +::shutdown:echo -e "\nSyncing all file buffers." ::shutdown:sync -::shutdown:echo "Unmount all filesystems..." +::shutdown:echo "Unmounting all filesystems." ::shutdown:umount -a -r ::shutdown:echo -e "\n \\e[1mSee you soon!\\e[0m\n" ::shutdown:sleep 1 diff --git a/src/minimal_rootfs/init b/src/minimal_rootfs/init index 1dbb86aa5..2cfb40b04 100755 --- a/src/minimal_rootfs/init +++ b/src/minimal_rootfs/init @@ -51,7 +51,7 @@ fi # the script '/etc/03_init.sh' as the new init process. exec /etc/02_overlay.sh -echo "(/init) - you can never see this unless there is a serious bug..." +echo "(/init) - you can never see this unless there is a serious bug." # Wait until any key has been pressed. read -n1 -s