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] 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