diff options
Diffstat (limited to 'source/compat32-tools/convertpkg-compat32')
-rwxr-xr-x | source/compat32-tools/convertpkg-compat32 | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source/compat32-tools/convertpkg-compat32 b/source/compat32-tools/convertpkg-compat32 index 9960527..08d52f8 100755 --- a/source/compat32-tools/convertpkg-compat32 +++ b/source/compat32-tools/convertpkg-compat32 @@ -180,9 +180,17 @@ if [ -d usr/lib64 -o -d lib64 ]; then fi # -# Take special care of gtk+2, gdk-pixbuf2, pango and udev when stripping things! +# Take special care of the following packages when stripping things: +# gdk-pixbuf2, gtk+2, gtk+3, mesa, pango, samba, udev # +# Stuff we need to keep, we move into KDEP/ and move it back later: +mkdir KEEP +if [ "$PKGNAM" = "mesa" ]; +then + cp -a --parents usr/share/vulkan/icd.d KEEP/ +fi + # Remove stuff we only want from the 64-bit package: if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gtk+3" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then @@ -337,12 +345,20 @@ if [ "$PKGNAM" = "qt" -o "$PKGNAM" = "qt3" -o "$PKGNAM" = "qt5" ]; then fi +# Move everything we saved to KEEP/ back into the package: +if [ $(find KEEP/ | wc -l) -gt 1 ]; +then + rsync -a KEEP/ ./ + rm -rf KEEP +fi + # Keep documentation we might be required to keep, or is just polite: if [ -d usr/doc ]; then find usr/doc -type f ! -iname "Copyright*" -a ! -iname "COPYING*" -a ! -iname "AUTHORS*" -a ! -iname "LICENSE*" -a ! -iname "GPL*" -a ! -iname "LGPL*" -a ! -iname "THANKS*" | xargs -d '\n' rm -f find usr/doc -type d -depth | xargs -d '\n' rmdir --ignore-fail-on-non-empty fi +# Handle the slack-desc file: if [ ! -z $SLACKDESC ]; then echo "Using externally provided slack-desc ($SLACKDESC)..." cat $SLACKDESC > install/slack-desc |