From ec0406ee84e25b6a236abb86fdeacdffe1ba4266 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 25 Jun 2012 20:11:44 +0200
Subject: remove dummy files in sqfs

---
 inc/build.initramfs.sh     |  2 +-
 inc/env.setup-sqfs-base.sh | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/build.initramfs.sh b/inc/build.initramfs.sh
index 629ded1..59ca302 100755
--- a/inc/build.initramfs.sh
+++ b/inc/build.initramfs.sh
@@ -14,7 +14,7 @@ SYSLINUX=${ROOT_DIR}/share/contrib/syslinux/latest
 ########################################################## CREATE # SQFS #####
 cd ${ROOT_DIR}/build
   rm -f tmp.sqfs
-  mksquashfs sqfs-base tmp.sqfs -comp xz -b 1M
+  mksquashfs sqfs-base tmp.sqfs -comp xz -b 1M -e $(cd sqfs-base && ls -1 .osib_*)
   mkdir cpio-base/mnt
   mv -v tmp.sqfs cpio-base/mnt/openslx.sqfs
 cd -
diff --git a/inc/env.setup-sqfs-base.sh b/inc/env.setup-sqfs-base.sh
index df27355..8c87c6a 100755
--- a/inc/env.setup-sqfs-base.sh
+++ b/inc/env.setup-sqfs-base.sh
@@ -7,13 +7,16 @@ ROOT_DIR=$(readlink -f $(dirname $(readlink -f $0))/..)
 mkdir -p ${ROOT_DIR}/build/sqfs-base
 cd ${ROOT_DIR}/build/sqfs-base
 
-tar xf ${BUILDROOT_OUT_PATH}/rootfs.tar
+if [ ! -f .osib_unpacked ]; then
+  tar xf ${BUILDROOT_OUT_PATH}/rootfs.tar
+  touch .osib_unpacked
+fi
 
 rm run
 
 tar xzf ${ROOT_DIR}/share/files/dev.tgz
 
-if [ ! -f .moved_libs ]; then
+if [ ! -f .osib_moved_libs ]; then
   for f in $(find {lib,usr/lib} |grep "\.so\(\..*\|$\)"); do
     targetdir=$(dirname $f)
     if [ ! -d openslx/$targetdir ]; then
@@ -22,25 +25,25 @@ if [ ! -f .moved_libs ]; then
     fi
     mv $f openslx/$f
   done
-  touch .moved_libs
+  touch .osib_moved_libs
 fi
 
-if [ ! -f .create_ld_links ]; then
+if [ ! -f .osib_create_ld_links ]; then
     echo "create ld-*.so links from /lib"
     for f in $(ls -1 openslx/lib/ld*); do
        ln -sf "../$f" "lib/$(basename $f)"
     done
-    touch .create_ld_links
+    touch .osib_create_ld_links
 fi
 
 
-if [ ! -f .moved_bins ]; then
+if [ ! -f .osib_moved_bins ]; then
     for d in $(find {bin,sbin,usr/bin,usr/sbin,usr/local/bin,usr/local/sbin} -type d); do
       #echo $d
       mkdir -p "openslx/$d"
       mv $d/* openslx/$d/
     done
-    touch .moved_bins
+    touch .osib_moved_bins
 fi
 
 ln -sf /usr/lib/systemd/systemd init
-- 
cgit v1.2.3-55-g7522