X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap-to-supermin.sh;h=b6a2fd9daffc02ee05edaf797429116739a01e42;hb=15c230a50d78435716b701a68709b3576118f27b;hp=7a2b48baab1fc26f7c085ed7176e1d37f619611b;hpb=6cf624b0e0318b57725dec5712c9aba13a8ba740;p=febootstrap.git

diff --git a/febootstrap-to-supermin.sh b/febootstrap-to-supermin.sh
index 7a2b48b..b6a2fd9 100755
--- a/febootstrap-to-supermin.sh
+++ b/febootstrap-to-supermin.sh
@@ -77,46 +77,83 @@ while read path <&7; 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]+)\.'
+
     # Ignore fakeroot.log.
     if [ "$path" = "./fakeroot.log" ]; then
 	:
 
-    # Kernel modules are always copied in from the host, including all
-    # the dependency information files.
-    elif [[ "$path" =~ '^\./lib/modules/' ]]; then
-	:
-
-    # All we're going to keep are the special files /init, the daemon,
+    # All we're going to keep are the special files /init,
     # configuration files (/etc), devices and modifiable stuff (/var).
     elif [ "$path" = "./init" ]; then
         echo "$path" >&5
 
-    elif [[ "$path" =~ '^\./etc' || "$path" =~ '^./dev' || "$path" =~ '^\./var' ]]; then
+    # Get timezone configuration from local system.
+    elif [ "$path" = "./etc/localtime" ]; then
+        echo "$path" >&6
+
+    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 information files.
+    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
+        :
+
     # Always write directory names to both output files.
     elif [ -d "$path" ]; then
         echo "$path" >&5
         echo "$path" >&6
 
     # 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" =~ '^libbfd-.*\.so$' ]]; then
+    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