Up to 10000.30 (experimental due to SATA autodetection).

Changed files:
    geninitrd-mdadm.patch -> 1.4
    geninitrd-scsi_sync_scan.patch -> 1.4
    geninitrd.spec -> 2.171

diff --git a/geninitrd-mdadm.patch b/geninitrd-mdadm.patch
deleted file mode 100644 (file)
index d792d00..0000000
--- a/geninitrd-mdadm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: mod-md.sh
-===================================================================
---- mod-md.sh  (wersja 11336)
-+++ mod-md.sh  (kopia robocza)
-@@ -10,9 +10,13 @@
- # @access     public
- setup_mod_md() {
-       mdassemble=$(find_tool $initrd_dir/mdassemble /sbin/initrd-mdassemble)
--      if [ ! -x /sbin/mdadm ] || [ ! -x "$mdassemble" ]; then
-+      if [ ! -x "$mdassemble" ]; then
-               USE_MD=no
-       fi
-+      mdadm=$(find_tool /sbin/mdadm $initrd_dir/mdadm /sbin/initrd-mdadm)
-+      if [ ! -x "$mdadm" ]; then
-+              USE_MD=no
-+      fi
- }
- 
- # return true if mdadm is set on $devpath
-@@ -42,7 +46,7 @@
- 
-       if [ -f /etc/mdadm.conf ]; then
-               debug "Finding RAID details using mdadm for rootdev=$1"
--              eval `(/sbin/mdadm -v --examine --scan --config=/etc/mdadm.conf 2> /dev/null;/sbin/mdadm -v --detail --scan --config=/etc/mdadm.conf 2> /dev/null) | awk -v rootdev="$1" '
-+              eval `($mdadm -v --examine --scan --config=/etc/mdadm.conf 2> /dev/null;$mdadm -v --detail --scan --config=/etc/mdadm.conf 2> /dev/null) | awk -v rootdev="$1" '
-               BEGIN {
-                       found = "no";
-                       dev_list = "";
-@@ -143,7 +147,7 @@
- 
-               echo "DEVICE $cr_dev_list" >> "$DESTDIR/etc/mdadm.conf"
-               cr_dev_list_md="$(echo "$cr_dev_list" | xargs | awk ' { gsub(/ +/,",",$0); print $0; }')"
--              cr_md_conf=$(/sbin/mdadm --detail --brief --config=/etc/mdadm.conf $cr_rootdev | awk ' { gsub(/spares=[0-9]+/, "", $0); print $0; }')
-+              cr_md_conf=$($mdadm --detail --brief --config=/etc/mdadm.conf $cr_rootdev | awk ' { gsub(/spares=[0-9]+/, "", $0); print $0; }')
-               if [ -n "$cr_md_conf" ]; then
-                       echo "$cr_md_conf" >> "$DESTDIR/etc/mdadm.conf"
-               else

diff --git a/geninitrd-scsi_sync_scan.patch b/geninitrd-scsi_sync_scan.patch
deleted file mode 100644 (file)
index 0b3e12d..0000000
--- a/geninitrd-scsi_sync_scan.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: geninitrd
-===================================================================
---- geninitrd  (wersja 11227)
-+++ geninitrd  (kopia robocza)
-@@ -618,6 +618,10 @@
-               local usleep=$(eval echo \$MODULE_${genericname}_USLEEP)
-               local firmware=$(eval echo \$MODULE_${genericname}_FIRMWARE)
- 
-+              if [ "$module" = "scsi_mod" -a "$kernel_version_long" -ge "002006030" ]; then
-+                      options="scan=sync $options"
-+              fi
-+
-               if [ -n "$verbose" ]; then
-                       s=""
-                       if [ "$options" ]; then
-@@ -648,10 +652,6 @@
-                       if [ "$(busybox_applet rmmod 2>/dev/null; echo $?)" = 0 ]; then
-                               echo "rmmod scsi_wait_scan" | add_linuxrc
-                       fi
--                      # HACK HACK HACK until we get proper solution like waiting untill rootfs device appears
--                      if [ -z "$usleep" -a "$kernel_version_long" -ge "002006030" ]; then
--                              echo "usleep 15000000" | add_linuxrc
--                      fi
-               fi
- 
-       done

diff --git a/geninitrd.spec b/geninitrd.spec
index 190e8458d6d14cc380f7fd122aa8757e4a330c54..ee7de22af8f1221a5b8df314a860083ce0601693 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -6,18 +6,16 @@
 Summary:       Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
-Version:       10000.20
+Version:       10000.30
 # leave rel 1 for ac
-Release:       5
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: de4e015717e7dc37417a6b687063a49f
+# Source0-md5: 793cd8d78c5e148a9dd8fe9d0cf4ad5a
 Patch0:                %{name}-romfs.patch
 Patch1:                %{name}-gzip-compressor.patch
-Patch2:                %{name}-scsi_sync_scan.patch
-Patch3:                %{name}-tuxonice_on_dm.patch
-Patch4:                %{name}-mdadm.patch
+Patch2:                %{name}-tuxonice_on_dm.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      /usr/bin/ldd
 Requires:      awk
@@ -94,9 +92,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch0 -p1
 %patch1 -p1
 %endif
-%patch2 -p0
-%patch3 -p1
-%patch4 -p0
+%patch2 -p1
 
 %build
 %{__make}