diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-12-17 20:08:15 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-12-17 20:08:15 +0000 |
| commit | 2b5d78d26ce2ad2e5aa7f3bc610656bf178e8f91 (patch) | |
| tree | 0542aa1bec0533c7b3e3149ddc53e615b0ad8458 /compat32-tools | |
| parent | 2a784fb63fbfedc1ae63737f863296d242247684 (diff) | |
| download | multilib-2b5d78d26ce2ad2e5aa7f3bc610656bf178e8f91.tar.gz multilib-2b5d78d26ce2ad2e5aa7f3bc610656bf178e8f91.tar.xz | |
Add code to deal with udev
Thanks to phenixia2003
Diffstat (limited to 'compat32-tools')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index e7e12eb..41042a3 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -3,7 +3,7 @@ # $Id$ # Copyright (c) 2009 Frederick Emmott <fred@slackware.com> -# Copyright (c) 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright (c) 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, NL # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -17,6 +17,10 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Contributions to the udev cleanup code by phenixia2003. + +# --------------------------------------------------------------------------- + # Convert a 32-bit Slackware package (s390 or x86) # to a compatibility package for a 64bit multilib Slackware. @@ -176,7 +180,7 @@ if [ -d usr/lib64 -o -d lib64 ]; then fi # -# Take special care of gtk+2 , gdk-pixbuf2 and pango when stripping things! +# Take special care of gtk+2, gdk-pixbuf2, pango and udev when stripping things! # # Remove stuff we only want from the 64-bit package: @@ -198,11 +202,22 @@ elif [ -d usr/bin ]; then mv ./32 usr/bin/ fi +if [ "$PKGNAM" = "udev" ]; then + # These are part of the 64-bit package: + rm -rf lib/firmware + rm -rf lib/udev + # Only in Slackware 13.37: + rm -rf usr/lib/ConsoleKit + # Only in Slackware 14.0: + rm -rf lib/modprobe.d + rm -rf run +fi + # Strip doinst.sh from everything we can't use: if [ "$PKGNAM" = "gtk+2" -o "$PKGNAM" = "gdk-pixbuf2" -o "$PKGNAM" = "pango" ]; then # Get rid of symlinks in bin and doc directory: - cat install/doinst.sh | grep -v '( cd usr/bin' | grep -v '( cd usr/doc' \ + cat install/doinst.sh | grep -v '( cd usr/bin' | grep -v '( cd usr/doc' \ > install/doinst.sh.2 cat install/doinst.sh.2 > install/doinst.sh rm -f install/doinst.sh.2 @@ -211,6 +226,16 @@ then echo "config etc/gtk-2.0/im-multipress.conf.new" \ >> install/doinst.sh fi +elif [ "$PKGNAM" = "udev" ]; then + # Get rid of symlinks in sbin and lib directory, and all the other + # non-symlinking stuff: + cat install/doinst.sh \ + | grep '( cd ' \ + | grep -v '( cd sbin' | grep -v '( cd lib/udev' \ + | grep -v '( cd usr/lib/ConsoleKit/run-seat.d' \ + > install/doinst.sh.2 + cat install/doinst.sh.2 > install/doinst.sh + rm -f install/doinst.sh.2 elif [ -f install/doinst.sh ]; then # Check for a 'config()' section: if grep -q 'config()' install/doinst.sh ; then |