From 18afd9811df8b03b3400ba9c4be4614ce0b48470 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Sun, 26 Nov 2017 20:30:58 +0100
Subject: [PATCH 01/27] Added glibc_libresolv bundle

---
 src/minimal_overlay/bundles/dhcp/bundle.sh    |  1 -
 src/minimal_overlay/bundles/dhcp/mll_deps     |  1 +
 .../bundles/glibc_libresolv/bundle.sh         | 31 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/minimal_overlay/bundles/dhcp/mll_deps
 create mode 100755 src/minimal_overlay/bundles/glibc_libresolv/bundle.sh

diff --git a/src/minimal_overlay/bundles/dhcp/bundle.sh b/src/minimal_overlay/bundles/dhcp/bundle.sh
index 0dc58176d..d06521dca 100755
--- a/src/minimal_overlay/bundles/dhcp/bundle.sh
+++ b/src/minimal_overlay/bundles/dhcp/bundle.sh
@@ -22,7 +22,6 @@ install -m755 "$SRC_DIR/05_rc.dhcp" "$DESTDIR/etc/05_rc.dhcp"
 
 # These libraries are necessary for the DNS resolving.
 install -d -m755 "$DESTDIR/lib"
-install -m755 "$SYSROOT/lib/libresolv.so.2" "$DESTDIR/lib/libresolv.so.2"
 install -m755 "$SYSROOT/lib/libnss_dns.so.2" "$DESTDIR/lib/libnss_dns.so.2"
 install -m755 "$SYSROOT/lib/libnss_files.so.2" "$DESTDIR/lib/libnss_files.so.2"
 strip -g "$DESTDIR/lib/*" 2>/dev/null
diff --git a/src/minimal_overlay/bundles/dhcp/mll_deps b/src/minimal_overlay/bundles/dhcp/mll_deps
new file mode 100644
index 000000000..db12d49ef
--- /dev/null
+++ b/src/minimal_overlay/bundles/dhcp/mll_deps
@@ -0,0 +1 @@
+glibc_libresolv
diff --git a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
new file mode 100755
index 000000000..c8f945ea0
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../common.sh
+
+if [ ! -d $SYSROOT ] ; then
+  echo "Cannot continue - GLIBC is missing. Please buld GLIBC first."
+  exit 1
+fi
+
+cd $WORK_DIR/overlay/$BUNDLE_NAME
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libresolv.so.2 $DESTDIR/lib/
+ln -s libresolv.so.2 $DESTDIR/lib/libresolv.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 937bc65cdc210f0eea2c5946956ad4cf2a15f839 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 20:35:29 +0100
Subject: [PATCH 02/27] Fixed glibc_libresolv cd error

---
 src/minimal_overlay/bundles/glibc_libresolv/bundle.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
index c8f945ea0..e5c93cd35 100755
--- a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
@@ -9,6 +9,7 @@ if [ ! -d $SYSROOT ] ; then
   exit 1
 fi
 
+mkdir -p "$WORK_DIR/overlay/$BUNDLE_NAME"
 cd $WORK_DIR/overlay/$BUNDLE_NAME
 
 DESTDIR="$PWD/${BUNDLE_NAME}_installed"

From 77767722d19c86faf2b547937211dc2a2ccdc8f9 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:23:01 +0100
Subject: [PATCH 03/27] Added glibc_libnss_dns bundle

---
 .../bundles/glibc_libnss_dns/bundle.sh        | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libnss_dns/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libnss_dns/bundle.sh b/src/minimal_overlay/bundles/glibc_libnss_dns/bundle.sh
new file mode 100755
index 000000000..744733d9f
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libnss_dns/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libnss_dns.so.2 $DESTDIR/lib/
+ln -s libnss_dns.so.2 $DESTDIR/lib/libnss_dns.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 1fcc7026a54c13443b3536d27944a1b4a8104e67 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:30:30 +0100
Subject: [PATCH 04/27] Rewrote glibc_libresolv

---
 .../bundles/glibc_libresolv/bundle.sh         | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
index e5c93cd35..cf2ad0413 100755
--- a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
@@ -9,24 +9,34 @@ if [ ! -d $SYSROOT ] ; then
   exit 1
 fi
 
-mkdir -p "$WORK_DIR/overlay/$BUNDLE_NAME"
-cd $WORK_DIR/overlay/$BUNDLE_NAME
+echo "Preparing the overlay $BUNDLE_NAME folder. This may take a while..."
+rm -rf $WORK_DIR/overlay/$BUNDLE_NAME
+mkdir -p $WORK_DIR/overlay/$BUNDLE_NAME/lib
 
-DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+cd $SYSROOT/lib
 
-rm -rf $DESTDIR
+find . -name "libresolv*" -type l -exec cp {} $WORK_DIR/overlay/$BUNDLE_NAME/lib \;
+echo "All libraries have been copied."
 
-mkdir -p $DESTDIR/lib
-cp $SYSROOT/lib/libresolv.so.2 $DESTDIR/lib/
-ln -s libresolv.so.2 $DESTDIR/lib/libresolv.so
+cd $WORK_DIR/overlay/$BUNDLE_NAME/lib
 
-echo "Reducing $BUNDLE_NAME size"
-strip -g $DESTDIR/lib/*
+for FILE_DEL in `ls *.so`
+do
+  FILE_KEEP=`ls $FILE_DEL.*`
 
-ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+  if [ ! "$FILE_KEEP" = "" ] ; then
+    # We remove the shorter file and replace it with symbolic link.
+    rm $FILE_DEL
+    ln -s $FILE_KEEP $FILE_DEL
+  fi
+done
+echo "Duplicate libraries have been replaced with soft links."
 
-cp -r $DESTDIR/* $ROOTFS
+strip -g *
+echo "All libraries have been optimized for size."
 
-echo "$BUNDLE_NAME has been installed."
+cp -r $WORK_DIR/overlay/$BUNDLE_NAME/lib $WORK_DIR/src/minimal_overlay/rootfs
+
+echo "All $BUNDLE_NAME libraries have been installed."
 
 cd $SRC_DIR

From 2f89407e60140589c0d760fef6f5089143387e77 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:39:02 +0100
Subject: [PATCH 05/27] Revert "Rewrote glibc_libresolv"

The older code is a lot less complicated
This reverts commit 1fcc7026a54c13443b3536d27944a1b4a8104e67.
---
 .../bundles/glibc_libresolv/bundle.sh         | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
index cf2ad0413..e5c93cd35 100755
--- a/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libresolv/bundle.sh
@@ -9,34 +9,24 @@ if [ ! -d $SYSROOT ] ; then
   exit 1
 fi
 
-echo "Preparing the overlay $BUNDLE_NAME folder. This may take a while..."
-rm -rf $WORK_DIR/overlay/$BUNDLE_NAME
-mkdir -p $WORK_DIR/overlay/$BUNDLE_NAME/lib
+mkdir -p "$WORK_DIR/overlay/$BUNDLE_NAME"
+cd $WORK_DIR/overlay/$BUNDLE_NAME
 
-cd $SYSROOT/lib
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
 
-find . -name "libresolv*" -type l -exec cp {} $WORK_DIR/overlay/$BUNDLE_NAME/lib \;
-echo "All libraries have been copied."
+rm -rf $DESTDIR
 
-cd $WORK_DIR/overlay/$BUNDLE_NAME/lib
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libresolv.so.2 $DESTDIR/lib/
+ln -s libresolv.so.2 $DESTDIR/lib/libresolv.so
 
-for FILE_DEL in `ls *.so`
-do
-  FILE_KEEP=`ls $FILE_DEL.*`
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
 
-  if [ ! "$FILE_KEEP" = "" ] ; then
-    # We remove the shorter file and replace it with symbolic link.
-    rm $FILE_DEL
-    ln -s $FILE_KEEP $FILE_DEL
-  fi
-done
-echo "Duplicate libraries have been replaced with soft links."
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
 
-strip -g *
-echo "All libraries have been optimized for size."
+cp -r $DESTDIR/* $ROOTFS
 
-cp -r $WORK_DIR/overlay/$BUNDLE_NAME/lib $WORK_DIR/src/minimal_overlay/rootfs
-
-echo "All $BUNDLE_NAME libraries have been installed."
+echo "$BUNDLE_NAME has been installed."
 
 cd $SRC_DIR

From 1d263b2c2e8869ccd9b02140799d643766bd9a50 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:43:47 +0100
Subject: [PATCH 06/27] Added glibc_libnss_files bundle

---
 .../bundles/glibc_libnss_files/bundle.sh      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libnss_files/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libnss_files/bundle.sh b/src/minimal_overlay/bundles/glibc_libnss_files/bundle.sh
new file mode 100755
index 000000000..4d8f534e0
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libnss_files/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libnss_files.so.2 $DESTDIR/lib/
+ln -s libnss_files.so.2 $DESTDIR/lib/libnss_files.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 37af044fdfdae74bb175436250c38aa57d1bb00b Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:43:56 +0100
Subject: [PATCH 07/27] Updated dhcp dependencies

---
 src/minimal_overlay/bundles/dhcp/bundle.sh | 6 ------
 src/minimal_overlay/bundles/dhcp/mll_deps  | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/minimal_overlay/bundles/dhcp/bundle.sh b/src/minimal_overlay/bundles/dhcp/bundle.sh
index d06521dca..dfa2e465a 100755
--- a/src/minimal_overlay/bundles/dhcp/bundle.sh
+++ b/src/minimal_overlay/bundles/dhcp/bundle.sh
@@ -20,10 +20,4 @@ install -d -m755 "$DESTDIR/etc/autorun"
 install -m755 "$SRC_DIR/01_network.sh" "$DESTDIR/etc/autorun/01_network.sh"
 install -m755 "$SRC_DIR/05_rc.dhcp" "$DESTDIR/etc/05_rc.dhcp"
 
-# These libraries are necessary for the DNS resolving.
-install -d -m755 "$DESTDIR/lib"
-install -m755 "$SYSROOT/lib/libnss_dns.so.2" "$DESTDIR/lib/libnss_dns.so.2"
-install -m755 "$SYSROOT/lib/libnss_files.so.2" "$DESTDIR/lib/libnss_files.so.2"
-strip -g "$DESTDIR/lib/*" 2>/dev/null
-
 echo "dhcp scripts and libraries have been installed"
diff --git a/src/minimal_overlay/bundles/dhcp/mll_deps b/src/minimal_overlay/bundles/dhcp/mll_deps
index db12d49ef..e45c7245c 100644
--- a/src/minimal_overlay/bundles/dhcp/mll_deps
+++ b/src/minimal_overlay/bundles/dhcp/mll_deps
@@ -1 +1,3 @@
 glibc_libresolv
+glibc_libnss_dns
+glibc_libnss_files

From 4b7445a62988b93066f840d415f65534f48f61bb Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:48:58 +0100
Subject: [PATCH 08/27] Added glibc_libBrokenLocale

---
 .../bundles/glibc_libBrokenLocale/bundle.sh   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh b/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh
new file mode 100755
index 000000000..e4f41d970
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libBrokenLocale.so.1 $DESTDIR/lib/
+ln -s libBrokenLocale.so.2 $DESTDIR/lib/libBrokenLocale.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 67b52049e1d809566388c262e76de4e2d19f1a98 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:50:04 +0100
Subject: [PATCH 09/27] Added glibc_libanl

---
 .../bundles/glibc_libanl/bundle.sh            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libanl/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libanl/bundle.sh b/src/minimal_overlay/bundles/glibc_libanl/bundle.sh
new file mode 100755
index 000000000..ae2712921
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libanl/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libanl.so.1 $DESTDIR/lib/
+ln -s libanl.so.1 $DESTDIR/lib/libanl.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 9f40cc7cb5a884f09ab174c4004c00545ea47e8a Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:53:05 +0100
Subject: [PATCH 10/27] Added glibc_libc

---
 .../bundles/glibc_libc/bundle.sh              | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libc/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libc/bundle.sh b/src/minimal_overlay/bundles/glibc_libc/bundle.sh
new file mode 100755
index 000000000..454df752b
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libc/bundle.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libc.so.6 $DESTDIR/lib/
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 019b88bb85faae2221d6f5f0f3e50361c154c8b9 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:53:59 +0100
Subject: [PATCH 11/27] Added glibc_libcidn

---
 .../bundles/glibc_libcidn/bundle.sh           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libcidn/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libcidn/bundle.sh b/src/minimal_overlay/bundles/glibc_libcidn/bundle.sh
new file mode 100755
index 000000000..187c3bda1
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libcidn/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libcidn.so.1 $DESTDIR/lib/
+ln -s libcidn.so.1 $DESTDIR/lib/libcidn.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From ac79993c46fc0d0a02408ae6858dff7576b14690 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:54:57 +0100
Subject: [PATCH 12/27] Added glibc_libcrypt

---
 .../bundles/glibc_libcrypt/bundle.sh          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libcrypt/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libcrypt/bundle.sh b/src/minimal_overlay/bundles/glibc_libcrypt/bundle.sh
new file mode 100755
index 000000000..c0ef4f2b4
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libcrypt/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libcrypt.so.1 $DESTDIR/lib/
+ln -s libcrypt.so.1 $DESTDIR/lib/libcrypt.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 1859a5f0afc2c595878a83ec9fb0b5464dbea137 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:56:02 +0100
Subject: [PATCH 13/27] Added glibc_libdl

---
 .../bundles/glibc_libdl/bundle.sh             | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libdl/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libdl/bundle.sh b/src/minimal_overlay/bundles/glibc_libdl/bundle.sh
new file mode 100755
index 000000000..701b303cd
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libdl/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libdl.so.2 $DESTDIR/lib/
+ln -s libdl.so.2 $DESTDIR/lib/libdl.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 7eddacb4da28797312379457ae030b59fb7a7916 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:56:49 +0100
Subject: [PATCH 14/27] Added glibc_libm

---
 .../bundles/glibc_libm/bundle.sh              | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libm/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libm/bundle.sh b/src/minimal_overlay/bundles/glibc_libm/bundle.sh
new file mode 100755
index 000000000..11b58b888
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libm/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libm.so.6 $DESTDIR/lib/
+ln -s libm.so.6 $DESTDIR/lib/libm.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From ab77ed8243d83a83d4271977a70a2373b985f29b Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:58:25 +0100
Subject: [PATCH 15/27] Added glibc_libnsl

---
 .../bundles/glibc_libnsl/bundle.sh            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libnsl/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libnsl/bundle.sh b/src/minimal_overlay/bundles/glibc_libnsl/bundle.sh
new file mode 100755
index 000000000..8c4543915
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libnsl/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libnsl.so.1 $DESTDIR/lib/
+ln -s libnsl.so.1 $DESTDIR/lib/libnsl.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 5e6ce2b540d99e5873c93f028d46920744e5f2f4 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 21:59:24 +0100
Subject: [PATCH 16/27] Added glibc_libnss_db

---
 .../bundles/glibc_libnss_db/bundle.sh         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libnss_db/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libnss_db/bundle.sh b/src/minimal_overlay/bundles/glibc_libnss_db/bundle.sh
new file mode 100755
index 000000000..8db76e092
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libnss_db/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libnss_db.so.2 $DESTDIR/lib/
+ln -s libnss_db.so.2 $DESTDIR/lib/libnss_db.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 509c3a02f92362b79de65b8e64d53e60a2da4cd5 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:00:26 +0100
Subject: [PATCH 17/27] Added glibc_libnss_hesiod

---
 .../bundles/glibc_libnss_hesiod/bundle.sh     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libnss_hesiod/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libnss_hesiod/bundle.sh b/src/minimal_overlay/bundles/glibc_libnss_hesiod/bundle.sh
new file mode 100755
index 000000000..451156570
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libnss_hesiod/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libnss_hesiod.so.2 $DESTDIR/lib/
+ln -s libnss_hesiod.so.2 $DESTDIR/lib/libnss_hesiod.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 4f30b3fc5a5c35a3b6741098d876959420b69fab Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:02:03 +0100
Subject: [PATCH 18/27] Added glibc_libpthread

---
 .../bundles/glibc_libpthread/bundle.sh        | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libpthread/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh b/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh
new file mode 100755
index 000000000..5436cd87b
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libpthread.so.0 $DESTDIR/lib/
+ln -s libpthread.so.0 $DESTDIR/lib/libpthread.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 14b9b2f9709cdb9575e68aca95debd5f883fb8ac Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:02:50 +0100
Subject: [PATCH 19/27] Added glibc_librt

---
 .../bundles/glibc_librt/bundle.sh             | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_librt/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_librt/bundle.sh b/src/minimal_overlay/bundles/glibc_librt/bundle.sh
new file mode 100755
index 000000000..ee33939ef
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_librt/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/librt.so.1 $DESTDIR/lib/
+ln -s librt.so.1 $DESTDIR/lib/librt.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 0477062a2f82931278fcd9c6260c4efb36b9ce80 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:03:52 +0100
Subject: [PATCH 20/27] Added glibc_libthread_db

---
 .../bundles/glibc_libthread_db/bundle.sh      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libthread_db/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libthread_db/bundle.sh b/src/minimal_overlay/bundles/glibc_libthread_db/bundle.sh
new file mode 100755
index 000000000..9a69a4708
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libthread_db/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libthread_db.so.1 $DESTDIR/lib/
+ln -s libthread_db.so.1 $DESTDIR/lib/libthread_db.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 0da731b4d9f8ca8593c26aaf0a77cf3a6b26370f Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:06:02 +0100
Subject: [PATCH 21/27] Added glibc_ld-linux

---
 .../bundles/glibc_ld-linux/bundle.sh          | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh b/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh
new file mode 100755
index 000000000..ede046d13
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/ld-linux.so.2 $DESTDIR/lib/
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 62a106ac84d34bbd22be119d56da65974016f8a8 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:12:14 +0100
Subject: [PATCH 22/27] Replaced glibc_full with a meta-bundle and updated
 dependencies

---
 .../bundles/dropbear/02_build.sh              |  8 ----
 src/minimal_overlay/bundles/dropbear/mll_deps |  4 ++
 .../bundles/glibc_full/bundle.sh              | 40 -------------------
 .../bundles/glibc_full/mll_deps               | 18 +++++++++
 4 files changed, 22 insertions(+), 48 deletions(-)
 create mode 100644 src/minimal_overlay/bundles/glibc_full/mll_deps

diff --git a/src/minimal_overlay/bundles/dropbear/02_build.sh b/src/minimal_overlay/bundles/dropbear/02_build.sh
index 5eb2605d4..2cf0e1c1d 100755
--- a/src/minimal_overlay/bundles/dropbear/02_build.sh
+++ b/src/minimal_overlay/bundles/dropbear/02_build.sh
@@ -28,14 +28,6 @@ make -j $NUM_JOBS
 echo "Installing Dropbear..."
 make -j $NUM_JOBS install DESTDIR="$DESTDIR"
 
-mkdir -p $DESTDIR/lib
-
-# Copy all dependent GLIBC libraries.
-cp $SYSROOT/lib/libnsl.so.1 $DESTDIR/lib
-cp $SYSROOT/lib/libnss_compat.so.2 $DESTDIR/lib
-cp $SYSROOT/lib/libutil.so.1 $DESTDIR/lib
-cp $SYSROOT/lib/libcrypt.so.1 $DESTDIR/lib
-
 mkdir -p $DESTDIR/etc/dropbear
 
 # Create Dropbear SSH configuration BEGIN
diff --git a/src/minimal_overlay/bundles/dropbear/mll_deps b/src/minimal_overlay/bundles/dropbear/mll_deps
index b68c5b8fa..397bf3af9 100644
--- a/src/minimal_overlay/bundles/dropbear/mll_deps
+++ b/src/minimal_overlay/bundles/dropbear/mll_deps
@@ -1 +1,5 @@
 glibc_full
+glibc_libnsl
+glibc_libnss_compat
+glibc_libutil
+glibc_libcrypt
diff --git a/src/minimal_overlay/bundles/glibc_full/bundle.sh b/src/minimal_overlay/bundles/glibc_full/bundle.sh
index 92aed01fa..33735ae1e 100755
--- a/src/minimal_overlay/bundles/glibc_full/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_full/bundle.sh
@@ -1,42 +1,2 @@
 #!/bin/sh
-
-SRC_DIR=$(pwd)
-
-. ../../common.sh
-
-if [ ! -d $SYSROOT ] ; then
-  echo "Cannot continue - GLIBC is missing. Please buld GLIBC first."
-  exit 1
-fi
-
-echo "Preparing the overlay glibc folder. This may take a while..."
-rm -rf $WORK_DIR/overlay/$BUNDLE_NAME
-mkdir -p $WORK_DIR/overlay/$BUNDLE_NAME/lib
-
-cd $SYSROOT
-
-find . -type l -exec cp {} $WORK_DIR/overlay/$BUNDLE_NAME/lib \;
-echo "All libraries have been copied."
-
-cd $WORK_DIR/overlay/$BUNDLE_NAME/lib
-
-for FILE_DEL in `ls *.so`
-do
-  FILE_KEEP=`ls $FILE_DEL.*`
-
-  if [ ! "$FILE_KEEP" = "" ] ; then
-    # We remove the shorter file and replace it with symbolic link.
-    rm $FILE_DEL
-    ln -s $FILE_KEEP $FILE_DEL
-  fi
-done
-echo "Duplicate libraries have been replaced with soft links."
-
-strip -g *
-echo "All libraries have been optimized for size."
-
-cp -r $WORK_DIR/overlay/$BUNDLE_NAME/lib $WORK_DIR/src/minimal_overlay/rootfs
-
 echo "All GNU C libraries have been installed."
-
-cd $SRC_DIR
diff --git a/src/minimal_overlay/bundles/glibc_full/mll_deps b/src/minimal_overlay/bundles/glibc_full/mll_deps
new file mode 100644
index 000000000..944f208bb
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_full/mll_deps
@@ -0,0 +1,18 @@
+glibc_ld-linux
+glibc_libBrokenLocale
+glibc_libanl
+glibc_libc
+glibc_libcidn
+glibc_libcrypt
+glibc_libdl
+glibc_libm
+glibc_libnsl
+glibc_libnss_db
+glibc_libnss_dns
+glibc_libnss_files
+glibc_libnss_hesiod
+glibc_libpthread
+glibc_libresolv
+glibc_librt
+glibc_libthread_db
+glibc_libutil

From 1f07ec778bb932ff9829fe1a7285f49f51e69f8e Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:12:32 +0100
Subject: [PATCH 23/27] Added glibc_libutil

---
 .../bundles/glibc_libutil/bundle.sh           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 src/minimal_overlay/bundles/glibc_libutil/bundle.sh

diff --git a/src/minimal_overlay/bundles/glibc_libutil/bundle.sh b/src/minimal_overlay/bundles/glibc_libutil/bundle.sh
new file mode 100755
index 000000000..a7c85d629
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_libutil/bundle.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SRC_DIR=$(pwd)
+
+. ../../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
+
+DESTDIR="$PWD/${BUNDLE_NAME}_installed"
+
+rm -rf $DESTDIR
+
+mkdir -p $DESTDIR/lib
+cp $SYSROOT/lib/libutil.so.1 $DESTDIR/lib/
+ln -s libutil.so.1 $DESTDIR/lib/libutil.so
+
+echo "Reducing $BUNDLE_NAME size"
+strip -g $DESTDIR/lib/*
+
+ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
+
+cp -r $DESTDIR/* $ROOTFS
+
+echo "$BUNDLE_NAME has been installed."
+
+cd $SRC_DIR

From 142f58c76a61cc3cfd45d359fc6adc86606528cd Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 27 Nov 2017 22:17:28 +0100
Subject: [PATCH 24/27] Fixed 2 typos

---
 src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh | 2 +-
 src/minimal_overlay/bundles/glibc_libpthread/bundle.sh      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh b/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh
index e4f41d970..8d9e66917 100755
--- a/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libBrokenLocale/bundle.sh
@@ -18,7 +18,7 @@ rm -rf $DESTDIR
 
 mkdir -p $DESTDIR/lib
 cp $SYSROOT/lib/libBrokenLocale.so.1 $DESTDIR/lib/
-ln -s libBrokenLocale.so.2 $DESTDIR/lib/libBrokenLocale.so
+ln -s libBrokenLocale.so.1 $DESTDIR/lib/libBrokenLocale.so
 
 echo "Reducing $BUNDLE_NAME size"
 strip -g $DESTDIR/lib/*
diff --git a/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh b/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh
index 5436cd87b..f01b513d6 100755
--- a/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libpthread/bundle.sh
@@ -18,7 +18,6 @@ rm -rf $DESTDIR
 
 mkdir -p $DESTDIR/lib
 cp $SYSROOT/lib/libpthread.so.0 $DESTDIR/lib/
-ln -s libpthread.so.0 $DESTDIR/lib/libpthread.so
 
 echo "Reducing $BUNDLE_NAME size"
 strip -g $DESTDIR/lib/*

From 74a2048082fded1003fbb7cd611fa95dc080dd45 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Tue, 28 Nov 2017 20:27:51 +0100
Subject: [PATCH 25/27] Fixed dropbear dependencies

---
 src/minimal_overlay/bundles/dropbear/mll_deps | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/minimal_overlay/bundles/dropbear/mll_deps b/src/minimal_overlay/bundles/dropbear/mll_deps
index 397bf3af9..3a4e1b7fc 100644
--- a/src/minimal_overlay/bundles/dropbear/mll_deps
+++ b/src/minimal_overlay/bundles/dropbear/mll_deps
@@ -1,4 +1,3 @@
-glibc_full
 glibc_libnsl
 glibc_libnss_compat
 glibc_libutil

From 8d4e490f6608013748a8c4c1cae02596a8aa931c Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Tue, 28 Nov 2017 20:51:36 +0100
Subject: [PATCH 26/27] Replaced glibc_libc and glibc_ld-linux with
 metapackages Their provided by the initramfs, no need to waste disk space

---
 .../bundles/glibc_ld-linux/bundle.sh          | 30 +------------------
 .../bundles/glibc_libc/bundle.sh              | 30 +------------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh b/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh
index ede046d13..6196fe87e 100755
--- a/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_ld-linux/bundle.sh
@@ -1,31 +1,3 @@
 #!/bin/sh
 
-SRC_DIR=$(pwd)
-
-. ../../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
-
-DESTDIR="$PWD/${BUNDLE_NAME}_installed"
-
-rm -rf $DESTDIR
-
-mkdir -p $DESTDIR/lib
-cp $SYSROOT/lib/ld-linux.so.2 $DESTDIR/lib/
-
-echo "Reducing $BUNDLE_NAME size"
-strip -g $DESTDIR/lib/*
-
-ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
-
-cp -r $DESTDIR/* $ROOTFS
-
-echo "$BUNDLE_NAME has been installed."
-
-cd $SRC_DIR
+echo "$BUNDLE_NAME is provided by the initramfs"
diff --git a/src/minimal_overlay/bundles/glibc_libc/bundle.sh b/src/minimal_overlay/bundles/glibc_libc/bundle.sh
index 454df752b..6196fe87e 100755
--- a/src/minimal_overlay/bundles/glibc_libc/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libc/bundle.sh
@@ -1,31 +1,3 @@
 #!/bin/sh
 
-SRC_DIR=$(pwd)
-
-. ../../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
-
-DESTDIR="$PWD/${BUNDLE_NAME}_installed"
-
-rm -rf $DESTDIR
-
-mkdir -p $DESTDIR/lib
-cp $SYSROOT/lib/libc.so.6 $DESTDIR/lib/
-
-echo "Reducing $BUNDLE_NAME size"
-strip -g $DESTDIR/lib/*
-
-ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
-
-cp -r $DESTDIR/* $ROOTFS
-
-echo "$BUNDLE_NAME has been installed."
-
-cd $SRC_DIR
+echo "$BUNDLE_NAME is provided by the initramfs"

From af4818a95a49b32d7673919d259214489cdb71e9 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Tue, 28 Nov 2017 21:03:10 +0100
Subject: [PATCH 27/27] Replaced glibc_libm with a meta-package Its provided by
 the initramfs

---
 .../bundles/glibc_libm/bundle.sh              | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_libm/bundle.sh b/src/minimal_overlay/bundles/glibc_libm/bundle.sh
index 11b58b888..6196fe87e 100755
--- a/src/minimal_overlay/bundles/glibc_libm/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_libm/bundle.sh
@@ -1,32 +1,3 @@
 #!/bin/sh
 
-SRC_DIR=$(pwd)
-
-. ../../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
-
-DESTDIR="$PWD/${BUNDLE_NAME}_installed"
-
-rm -rf $DESTDIR
-
-mkdir -p $DESTDIR/lib
-cp $SYSROOT/lib/libm.so.6 $DESTDIR/lib/
-ln -s libm.so.6 $DESTDIR/lib/libm.so
-
-echo "Reducing $BUNDLE_NAME size"
-strip -g $DESTDIR/lib/*
-
-ROOTFS="$WORK_DIR/src/minimal_overlay/rootfs"
-
-cp -r $DESTDIR/* $ROOTFS
-
-echo "$BUNDLE_NAME has been installed."
-
-cd $SRC_DIR
+echo "$BUNDLE_NAME is provided by the initramfs"