Bundles volatile config proof-of-concept

src/minimal_overlay/bundles/ncurses/.config

@@ -10,5 +10,5 @@
 #
 #   https://ftp.gnu.org/pub/gnu/ncurses/
 #
-NCURSES_SOURCE_URL=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz
+NCURSES_SOURCE_URL=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$NCURSES_VERSION.tar.gz
 

src/minimal_overlay/bundles/ncurses/01_get.sh

@@ -3,6 +3,7 @@
 set -e
 
 . ../../common.sh
+. ../../../settings
 
 # Read the common configuration properties.
 DOWNLOAD_URL=`read_property NCURSES_SOURCE_URL`

src/minimal_overlay/bundles/ncurses/02_build.sh

@@ -3,11 +3,12 @@
 set -e
 
 . ../../common.sh
+. ../../../settings
 
 cd $WORK_DIR/overlay/$BUNDLE_NAME
 
 # Change to the ncurses source directory which ls finds, e.g. 'ncurses-6.0'.
-cd $(ls -d ncurses-*)
+cd $(ls -d ncurses-$NCURSES_VERSION)
 
 if [ -f Makefile ] ; then
   echo "Preparing '$BUNDLE_NAME' work area. This may take a while."

src/minimal_overlay/bundles/pkg_config/.config

@@ -0,0 +1 @@
+PKG_CONFIG_SOURCE_URL=https://pkgconfig.freedesktop.org/releases/pkg-config-$PKG_CONFIG_VERSION.tar.gz

src/minimal_overlay/bundles/pkg_config/01_get.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+. ../../common.sh
+. ../../../settings
+
+# Read the 'pkg_config' download URL from '.config'.
+DOWNLOAD_URL=`read_property PKG_CONFIG_SOURCE_URL`
+
+# Grab everything after the last '/' character.
+ARCHIVE_FILE=${DOWNLOAD_URL##*/}
+
+# Download 'pkg_config' source archive in the 'source/overlay' directory.
+download_source $DOWNLOAD_URL $OVERLAY_SOURCE_DIR/$ARCHIVE_FILE
+
+# Extract all 'coreutils' sources in the 'work/overlay/pkg_config' directory.
+extract_source $OVERLAY_SOURCE_DIR/$ARCHIVE_FILE pkg_config
+
+cd $SRC_DIR

src/minimal_overlay/bundles/pkg_config/02_build.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+. ../../common.sh
+. ../../../settings
+
+cd `ls -d $OVERLAY_WORK_DIR/$BUNDLE_NAME/pkg-config-$PKG_CONFIG_VERSION`
+
+make_clean
+
+rm -rf $DEST_DIR
+
+echo "Configuring '$BUNDLE_NAME'."
+CFLAGS="$CFLAGS" ./configure \
+  --prefix=/usr \
+  --with-internal-glib
+
+echo "Building '$BUNDLE_NAME'."
+make_target
+
+echo "Installing '$BUNDLE_NAME'."
+make_target install DESTDIR=$DEST_DIR
+
+echo "Reducing '$BUNDLE_NAME' size."
+reduce_size $DEST_DIR/usr/bin
+
+install_to_overlay
+
+echo "Bundle '$BUNDLE_NAME' has been installed."
+
+cd $SRC_DIR

src/minimal_overlay/bundles/pkg_config/bundle.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+. ../../common.sh
+
+./01_get.sh
+./02_build.sh
+
+cd $SRC_DIR

src/minimal_overlay/bundles/util_linux/.config

@@ -6,4 +6,4 @@
 #
 #   https://www.kernel.org/pub/linux/utils/util-linux/
 #
-UTIL_LINUX_SOURCE_URL=https://kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz
+UTIL_LINUX_SOURCE_URL=https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v$(echo $UTIL_LINUX_VERSION | cut -d '-' -f 1 | cut -d '.' -f 1-2)/util-linux-$UTIL_LINUX_VERSION.tar.xz

src/minimal_overlay/bundles/util_linux/01_get.sh

@@ -3,6 +3,7 @@
 set -e
 
 . ../../common.sh
+. ../../../settings
 
 # Read the common configuration properties.
 DOWNLOAD_URL=`read_property UTIL_LINUX_SOURCE_URL`

src/minimal_overlay/bundles/util_linux/02_build.sh

@@ -3,11 +3,12 @@
 set -e
 
 . ../../common.sh
+. ../../../settings
 
 cd $WORK_DIR/overlay/$BUNDLE_NAME
 
 # Change to the util-linux source directory which ls finds, e.g. 'util-linux-2.34'.
-cd $(ls -d util-linux-*)
+cd $(ls -d util-linux-$UTIL_LINUX_VERSION)
 
 if [ -f Makefile ] ; then
   echo "Preparing '$BUNDLE_NAME' work area. This may take a while."
@@ -21,6 +22,7 @@ mkdir -p $DEST_DIR/usr/share/doc/util-linux
 mkdir -p $DEST_DIR/bin
 
 echo "Configuring '$BUNDLE_NAME'."
+./autogen.sh && \
 CFLAGS="$CFLAGS" ./configure \
   ADJTIME_PATH=/var/lib/hwclock/adjtime   \
   --prefix=$DEST_DIR \
@@ -34,16 +36,20 @@ CFLAGS="$CFLAGS" ./configure \
   --disable-pylibmount \
   --disable-static     \
   --disable-makeinstall-chown \
-  --without-python     \
-  --without-systemd    \
-  --without-systemdsystemunitdir
+  #--enable-libblkid \
+  #--enable-libuuid \
+  #--enable-libsmartcols \
+  #--without-python     \
+  #--without-systemd    \
+  #--without-systemdsystemunitdir
 
 echo "Building '$BUNDLE_NAME'."
 make -j $NUM_JOBS
 
 echo "Installing '$BUNDLE_NAME'."
 make -j $NUM_JOBS install
 
+
 echo "Reducing '$BUNDLE_NAME' size."
 reduce_size $DEST_DIR/bin
 

src/minimal_overlay/common.sh

@@ -36,11 +36,13 @@ read_property() (
 
   if [ ! "$prop_name" = "" ] ; then
     # Search in the main '.config' file.
-    prop_value="`grep -i ^${prop_name}= $CONFIG | cut -f2- -d'=' | xargs`"
+    value_def=`grep -i ^${prop_name}= $CONFIG | cut -f2- -d'=' | xargs`
+    prop_value=`eval echo $value_def`
 
     if [ -f $SRC_DIR/.config ] ; then
       # Search in the local '.config' file.
-      prop_value_local="`grep -i ^${prop_name}= $SRC_DIR/.config | cut -f2- -d'=' | xargs`"
+      value_def_local=`grep -i ^${prop_name}= $SRC_DIR/.config | cut -f2- -d'=' | xargs`
+      prop_value_local=`eval echo $value_def_local`
 
       if [ ! "$prop_value_local" = "" ] ; then
         # Override the original value with the local value.
@@ -49,7 +51,7 @@ read_property() (
     fi
   fi
 
-  echo "$prop_value"
+  echo $prop_value
 )
 
 # Read commonly used configuration properties.

src/settings

@@ -1,4 +1,7 @@
-KERNEL_VERSION=6.6.17
-GLIBC_VERSION=2.38
+KERNEL_VERSION=6.7.5
+GLIBC_VERSION=2.39
 BUSYBOX_VERSION=1.36.1
-ADD_BUNDLES=dhcp,mll_hello,mll_logo,mll_source,glibc_full
+ADD_BUNDLES=dhcp,util_linux
+UTIL_LINUX_VERSION=2.39.3
+NCURSES_VERSION=6.3
+PKG_CONFIG_VERSION=0.29.2