From 9b4c4d0ec5b178bfcb599fa0b2ca6008628aab94 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Wed, 5 Jul 2017 22:18:47 +0200
Subject: [PATCH] Fixed glibc_full bundle minor fix to links bundle

---
 .../bundles/glibc_full/bundle.sh              | 21 +++++++------------
 src/minimal_overlay/bundles/links/02_build.sh |  3 +--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/minimal_overlay/bundles/glibc_full/bundle.sh b/src/minimal_overlay/bundles/glibc_full/bundle.sh
index 4d64d1578..010e104f4 100755
--- a/src/minimal_overlay/bundles/glibc_full/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_full/bundle.sh
@@ -2,26 +2,23 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
-if [ ! -d $MAIN_SRC_DIR/work/glibc/glibc_prepared ] ; then
+if [ ! -d $WORK_DIR/glibc/glibc_prepared ] ; 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 $MAIN_SRC_DIR/work/overlay/glibc
-mkdir -p $MAIN_SRC_DIR/work/overlay/glibc/lib
+rm -rf $WORK_DIR/overlay/glibc
+mkdir -p $WORK_DIR/overlay/glibc/lib
 
-cd $MAIN_SRC_DIR/work/glibc/glibc_prepared/lib
+cd $WORK_DIR/glibc/glibc_prepared/lib
 
-find . -type l -exec cp {} $MAIN_SRC_DIR/work/overlay/glibc/lib \;
+find . -type l -exec cp {} $WORK_DIR/overlay/glibc/lib \;
 echo "All libraries have been copied."
 
-cd $MAIN_SRC_DIR/work/overlay/glibc/lib
+cd $WORK_DIR/overlay/glibc/lib
 
 for FILE_DEL in $(ls *.so)
 do
@@ -38,10 +35,8 @@ echo "Duplicate libraries have been replaced with soft links."
 strip -g *
 echo "All libraries have been optimized for size."
 
-cp -r $MAIN_SRC_DIR/work/overlay/glibc/lib \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/glibc/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/links/02_build.sh b/src/minimal_overlay/bundles/links/02_build.sh
index 646e94334..4d77ce1e4 100755
--- a/src/minimal_overlay/bundles/links/02_build.sh
+++ b/src/minimal_overlay/bundles/links/02_build.sh
@@ -12,8 +12,7 @@ DESTDIR="$PWD/links_installed"
 cd $(ls -d links-*)
 
 echo "Preparing Links work area. This may take a while..."
-# distclean to also clear configure files
-make -j $NUM_JOBS distclean
+make -j $NUM_JOBS clean
 
 rm -rf $DESTDIR