loolwsd/loolwsd-systemplate-setup | 130 +++++++++++++-------------------------
1 file changed, 45 insertions(+), 85 deletions(-)
New commits:
commit 6b767bc5ee76deb85e2a50e4d2188796dd055074
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jan 14 18:14:35 2016 +0100
loolwsd: loolwsd-systemplate-setup: remove OS X support attempt
diff --git a/loolwsd/loolwsd-systemplate-setup
b/loolwsd/loolwsd-systemplate-setup
index cce7b96..f8da121 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -18,87 +18,51 @@ INSTDIR=`cd $INSTDIR && /bin/pwd`
cd / || exit 1
(
- # Produce a list of file names, one per line, that will be copied
- # into the template tree of system files for the chroot jails.
-
- if [ `uname -s` = Linux ]; then
-
- # First essential files and shared objects
- find etc/passwd etc/group etc/hosts \
- etc/resolv.conf \
- lib/ld-* lib64/ld-* \
- lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
- lib/libattr* lib/*-linux-gnu/libattr* \
- etc/ld.so.* \
- lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
- var/cache/fontconfig \
- etc/fonts \
- etc/localtime \
- usr/lib/locale/en_US.utf8 \
- usr/lib/locale/C.UTF-8 \
- usr/lib/locale/locale_archive \
- usr/share/zoneinfo/* \
- usr/share/liblangtag \
- usr/lib/libpng* usr/lib64/libpng* \
- -type f
-
- find etc/fonts \
- lib/ld-* lib64/ld-* \
- lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
- lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
- lib/libattr* lib/*-linux-gnu/libattr* \
- usr/lib/libpng* usr/lib64/libpng* \
- -type l
-
- # Go through the LO shared objects and check what system libraries
- # they link to.
- find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' |
- while read file; do
- ldd $file 2>/dev/null
- done |
- grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u |
sed -e 's,^/,,'
-
- # Go through the loolkit
- find $POCODIR /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,^/,,'
-
- else
- find usr/lib/dyld \
- usr/lib/*.dylib \
- usr/lib/system/*.dylib \
- System/Library/Frameworks/Accelerate.framework \
- System/Library/Frameworks/ApplicationServices.framework \
- System/Library/Frameworks/CFNetwork.framework \
- System/Library/Frameworks/Carbon.framework \
- System/Library/Frameworks/CoreFoundation.framework \
- System/Library/Frameworks/CoreGraphics.framework \
- System/Library/Frameworks/CoreServices.framework \
- System/Library/Frameworks/CoreText.framework \
- System/Library/Frameworks/DiskArbitration.framework \
- System/Library/Frameworks/Foundation.framework \
- System/Library/Frameworks/ImageIO.framework \
- System/Library/Frameworks/IOKit.framework \
- System/Library/Frameworks/IOSurface.framework \
- System/Library/Frameworks/NetFS.framework \
- System/Library/Frameworks/OpenDirectory.framework \
- System/Library/Frameworks/Security.framework \
- System/Library/Frameworks/SystemConfiguration.framework \
- System/Library/PrivateFrameworks/DataDetectorsCore.framework \
- System/Library/PrivateFrameworks/MultitouchSupport.framework \
- System/Library/PrivateFrameworks/NetAuth.framework \
- System/Library/PrivateFrameworks/login.framework \
- -type f
-
- find $INSTDIR -name '*.dylib' |
- while read file; do
- otool -L $file 2>/dev/null
- done |
- sed -e 's/^[ ]//' | grep -E '^/(lib|usr/lib)/' | cut -d' ' -f1 |
sort -u | sed -e 's,^/,,'
- fi
+# Produce a list of file names, one per line, that will be copied
+# into the template tree of system files for the chroot jails.
+
+# First essential files and shared objects
+find etc/passwd etc/group etc/hosts \
+ etc/resolv.conf \
+ lib/ld-* lib64/ld-* \
+ lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
+ lib/libattr* lib/*-linux-gnu/libattr* \
+ etc/ld.so.* \
+ lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
+ var/cache/fontconfig \
+ etc/fonts \
+ etc/localtime \
+ usr/lib/locale/en_US.utf8 \
+ usr/lib/locale/C.UTF-8 \
+ usr/lib/locale/locale_archive \
+ usr/share/zoneinfo/* \
+ usr/share/liblangtag \
+ usr/lib/libpng* usr/lib64/libpng* \
+ -type f
+
+find etc/fonts \
+ lib/ld-* lib64/ld-* \
+ lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
+ lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
+ lib/libattr* lib/*-linux-gnu/libattr* \
+ usr/lib/libpng* usr/lib64/libpng* \
+ -type l
+
+# Go through the LO shared objects and check what system libraries
+# they link to.
+find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' |
+while read file; do
+ ldd $file 2>/dev/null
+done |
+grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e
's,^/,,'
+
+# Go through the loolkit
+find $POCODIR /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.
commit 3a53c864b47689c4baad4dc2af071e0ba3d0c917
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jan 14 18:11:06 2016 +0100
loolwsd: loolwsd-systemplate-setup: add libpng*
diff --git a/loolwsd/loolwsd-systemplate-setup
b/loolwsd/loolwsd-systemplate-setup
index 9f386b9..cce7b96 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -39,6 +39,7 @@ cd / || exit 1
usr/lib/locale/locale_archive \
usr/share/zoneinfo/* \
usr/share/liblangtag \
+ usr/lib/libpng* usr/lib64/libpng* \
-type f
find etc/fonts \
@@ -46,6 +47,7 @@ cd / || exit 1
lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
lib/libattr* lib/*-linux-gnu/libattr* \
+ usr/lib/libpng* usr/lib64/libpng* \
-type l
# Go through the LO shared objects and check what system libraries
commit 37f5132e9ed275e1c8a9436d3176c20aaf91d898
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jan 14 18:01:51 2016 +0100
loolwsd: loolwsd-systemplate-setup: remove redundancy
diff --git a/loolwsd/loolwsd-systemplate-setup
b/loolwsd/loolwsd-systemplate-setup
index 2fc0871..9f386b9 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -30,7 +30,7 @@ cd / || exit 1
lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
lib/libattr* lib/*-linux-gnu/libattr* \
etc/ld.so.* \
- lib/libnss_* lib64/libnss_* \
+ lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
var/cache/fontconfig \
etc/fonts \
etc/localtime \
@@ -39,21 +39,15 @@ cd / || exit 1
usr/lib/locale/locale_archive \
usr/share/zoneinfo/* \
usr/share/liblangtag \
- lib/*-linux-gnu/libnss* \
-type f
find etc/fonts \
- lib/libnss_* \
lib/ld-* lib64/ld-* \
- lib64/libnss_* \
- lib/*-linux-gnu/libnss* \
+ lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
lib/libattr* lib/*-linux-gnu/libattr* \
-type l
- find lib/libnss_* lib64/libnss_* -type l
- find lib/*-linux-gnu/libnss* -type l
-
# Go through the LO shared objects and check what system libraries
# they link to.
find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' |
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
