Merge branch 'master' into feature_install_and_preos

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>

hacking/v3-busybox/copy_bin_with_libs.sh

@@ -2,34 +2,54 @@
 # Nico Schottelius
 # Fri May  1 17:31:50 CEST 2015
 
-# [18:09] wurzel:.cdist-ruag% ldd /usr/bin/ls | sed -e 's/=>//' -e 's/(.*//' | awk '{ if(NF == 2) { print $2 } else { print $1 } }'
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
+if [ "$#" -ne 1 ]; then
+    echo "$0 dir-out"
+    exit 1
+fi
+
+
+out_dir=$1
+
 #bin_list="udevadm bash fdisk mount syslinux umount rm mv"
 bin_list="udevadm fdisk"
 
 libs=$(mktemp /tmp/cdist-preos-libs.XXXXXXXXXXXXX)
 
-for bin in bin_list; do
+mkdir -p "$out_dir/bin" "$out_dir/lib"
+
+(   
+    for bin in $bin_list; do
+        src=$(which "$bin")
+        cp "$src" "$out_dir/bin"
+    
+        ldd "$src" | sed -e 's/=>//' -e 's/(.*//' | awk '{ if(NF == 2) { print $2 } else { print $1 } }'
+    done
+) | sort | uniq > "$libs"
 
 
-done
+while read lib; do
+    if echo $lib | grep '^/'; then
+        # echo "Copying fqdn lib $lib ..."
+        cp "$lib" "$out_dir/lib"
+    else
+        echo "How to copy $lib ?"
+    fi
+done < "$libs"
+
 
 rm -f "$libs"
 
-# lfs
-## ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
-
 exit 0
 
 
 bin=$1
 
-list=""
-new_list=$(objdump -p /usr/bin/ls | awk '$1 ~ /NEEDED/ { print $2 }')
-
-[18:16] wurzel:.cdist-ruag% ldconfig -p | grep 'libBrokenLocale.so.1$' | sed 's/.* => //'
+# Not used alternatives
+# new_list=$(objdump -p /usr/bin/ls | awk '$1 ~ /NEEDED/ { print $2 }')
+# ldconfig -p | grep 'libBrokenLocale.so.1$' | sed 's/.* => //'
 
 
 for new_item in $new_list; do