X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Fsupermin-split.sh.in;h=94990dd7c77d98d5c84175ab63765b9ad6642c2a;hp=61df8913cdde1ac245e1184b7112e1977458569e;hb=599f94c9c14c970dcfd7cec8d6898cd3b46af8ca;hpb=2f1a50d81671810256dce0852e6b1e0810ac44af

diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in
index 61df891..94990dd 100755
--- a/appliance/supermin-split.sh.in
+++ b/appliance/supermin-split.sh.in
@@ -51,17 +51,40 @@ for path in $(find -not -name fakeroot.log); do
     dir=$(dirname "$path")
     file=$(basename "$path")
 
+    # For quoting problems with the bash =~ operator, see bash FAQ
+    # question E14 here http://tiswww.case.edu/php/chet/bash/FAQ and
+    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487387#25
+    # (RHBZ#566511).
+    p_etc='^\./etc'
+    p_dev='^\./dev'
+    p_var='^\./var'
+    p_lib_modules='^\./lib/modules/'
+    p_builddir='^\./builddir'
+    p_ld_so='^ld-[.0-9]+\.so$'
+    p_libbfd='^libbfd-.*\.so$'
+    p_libgcc='^libgcc_s-.*\.so\.([0-9]+)$'
+    p_libntfs3g='^libntfs-3g\.so\..*$'
+    p_lib123so='^lib(.*)-[-.0-9]+\.so$'
+    p_lib123so123='^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.'
+    p_libso123='^lib(.*)\.so\.([0-9]+)\.'
+
     # All we're going to keep are the special files /init, the daemon,
     # configuration files (/etc), devices and modifiable stuff (/var).
     if [ "$path" = "./init" -o "$file" = "guestfsd" ]; then
         echo "$path" >&5
 
-    elif [[ "$path" =~ '^\./etc' || "$path" =~ '^./dev' || "$path" =~ '^\./var' ]]; then
+    elif [[ "$path" =~ $p_etc || "$path" =~ $p_dev || "$path" =~ $p_var ]]
+    then
         echo "$path" >&5
 
     # Kernel modules are always copied in from the host, including all
     # the dependency files.
-    elif [[ "$path" =~ '^\./lib/modules/' ]]; then
+    elif [[ "$path" =~ $p_lib_modules ]]; then
+        :
+
+    # On mock/Koji, exclude bogus /builddir directory which for some
+    # reason contains some yum temporary files (RHBZ#566512).
+    elif [[ "$path" =~ $p_builddir ]]; then
         :
 
     elif [ -d "$path" ]; then
@@ -71,19 +94,32 @@ for path in $(find -not -name fakeroot.log); do
 
     # Some libraries need fixed version numbers replaced by wildcards.
 
-    elif [[ "$file" =~ '^ld-[.0-9]+\.so$' ]]; then
+    elif [[ "$file" =~ $p_ld_so ]]; then
         echo "$dir/ld-*.so" >&6
 
+    # Special case for libbfd
+    elif [[ "$file" =~ $p_libbfd ]]; then
+        echo "$dir/libbfd-*.so" >&6
+
+    # Special case for libgcc_s-<gccversion>-<date>.so.N
+    elif [[ "$file" =~ $p_libgcc ]]; then
+        echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6
+
+    # Special case for libntfs-3g.so.*
+    elif [[ "$file" =~ $p_libntfs3g ]]; then
+	[ -n "$libntfs3g_once" ] || echo "$dir/libntfs-3g.so.*" >&6
+	libntfs3g_once=1
+
     # libfoo-1.2.3.so
-    elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so$' ]]; then
+    elif [[ "$file" =~ $p_lib123so ]]; then
         echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6
 
     # libfoo-1.2.3.so.1.2.3 (but NOT '*.so.N')
-    elif [[ "$file" =~ '^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' ]]; then
+    elif [[ "$file" =~ $p_lib123so123 ]]; then
         echo "$dir/lib${BASH_REMATCH[1]}-*.so.${BASH_REMATCH[2]}.*" >&6
 
     # libfoo.so.1.2.3 (but NOT '*.so.N')
-    elif [[ "$file" =~ '^lib(.*)\.so\.([0-9]+)\.' ]]; then
+    elif [[ "$file" =~ $p_libso123 ]]; then
         echo "$dir/lib${BASH_REMATCH[1]}.so.${BASH_REMATCH[2]}.*" >&6
 
     else