[Libreoffice-commits] online.git: loolwsd-systemplate-setup

Henry Castro hcastro at collabora.com
Thu Jan 5 21:04:57 UTC 2017


 loolwsd-systemplate-setup |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 6e7f8b860d498a668741ec5984f3dd97de32dbd2
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Jan 5 17:05:08 2017 -0400

    script: remove POCO libraries from systemplate
    
    This is no longer need it

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 9a47b40..8bb4187 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -6,7 +6,6 @@ test $# -eq 2 || { echo "Usage: $0 <chroot template directory for system libs to
 
 CHROOT=$1
 INSTDIR=$2
-POCOLIBDIRS="/usr/local/lib /opt/poco/lib"
 
 test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
 
@@ -56,14 +55,6 @@ while read file; do
 done |
 grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's,^/,,'
 
-# Poco libraries and their dependencies
-find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
-find $POCOLIBDIRS /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
-while read file; do
-    echo $file
-    ldd $file 2>/dev/null
-done |
-grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's,^/,,'
 ) |
 
 # Can't use -l because then symlinks won't be handled well enough.
@@ -71,7 +62,6 @@ grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's
 cpio -p -d -L $CHROOT
 
 mkdir -p $CHROOT/tmp
-mkdir -p $CHROOT/usr/bin/
 
 # /usr/share/fonts needs to be taken care of separately because the
 # directory time stamps must be preserved for fontconfig to trust


More information about the Libreoffice-commits mailing list