- Use fixed /etc/hosts, scsi_dh_modules and ibft_hostname to

reduce build-compare noise

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=328

libguestfs.changes

@@ -6,7 +6,8 @@ Mon Nov 24 17:02:33 UTC 2014 - ohering@suse.de
 -------------------------------------------------------------------
 Mon Nov 24 16:52:12 UTC 2014 - ohering@suse.de
 
-- Use fixed /etc/hosts and ibft_hostname to reduce build-compare noise
+- Use fixed /etc/hosts, scsi_dh_modules and ibft_hostname to
+  reduce build-compare noise
 
 -------------------------------------------------------------------
 Thu Oct 16 13:26:13 CEST 2014 - ohering@suse.de

libguestfs.mkinitrd.1110.patch

@@ -3,8 +3,9 @@
  mkinitrd/scripts/setup-network.sh    |   11 +++-
  mkinitrd/scripts/setup-prepare.sh    |   94 ++++++++++++++++++++++++++++-------
  mkinitrd/scripts/setup-progs.sh      |    4 -
+ mkinitrd/scripts/setup-scsi_dh.sh    |    2 
  mkinitrd/scripts/setup-sharedlibs.sh |   60 +++++++++++++---------
- 5 files changed, 125 insertions(+), 46 deletions(-)
+ 6 files changed, 126 insertions(+), 47 deletions(-)
 
 Index: 1110/mkinitrd/scripts/setup-ibft.sh
 ===================================================================
@@ -265,6 +266,25 @@ Index: 1110/mkinitrd/scripts/setup-progs.sh
  
  [ -e "bin/sh" ] || ln -s /bin/bash bin/sh
  
+Index: 1110/mkinitrd/scripts/setup-scsi_dh.sh
+===================================================================
+--- 1110.orig/mkinitrd/scripts/setup-scsi_dh.sh
++++ 1110/mkinitrd/scripts/setup-scsi_dh.sh
+@@ -1,13 +1,13 @@
+ #!/bin/bash
+ #
+ #%stage: device
+ #
+ # Include all scsi_dh_* modules and load them on boot (bnc#727428 et al)
+ 
+ scsi_dh_modules=
+-for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko"); do
++for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko" | sort); do
+ 	i=${i%.ko}
+ 	scsi_dh_modules="$scsi_dh_modules ${i##*/}"
+ done
+ 
+ save_var scsi_dh_modules
 Index: 1110/mkinitrd/scripts/setup-sharedlibs.sh
 ===================================================================
 --- 1110.orig/mkinitrd/scripts/setup-sharedlibs.sh

libguestfs.mkinitrd.1220.patch

@@ -3,8 +3,9 @@
  mkinitrd/scripts/setup-network.sh    |   11 ++-
  mkinitrd/scripts/setup-prepare.sh    |  126 +++++++++++++++++++++--------------
  mkinitrd/scripts/setup-progs.sh      |   17 ----
+ mkinitrd/scripts/setup-scsi_dh.sh    |    2 
  mkinitrd/scripts/setup-sharedlibs.sh |   60 +++++++++-------
- 5 files changed, 125 insertions(+), 91 deletions(-)
+ 6 files changed, 126 insertions(+), 92 deletions(-)
 
 Index: 1220/mkinitrd/scripts/setup-ibft.sh
 ===================================================================
@@ -290,6 +291,25 @@ Index: 1220/mkinitrd/scripts/setup-progs.sh
  
  [ -e "bin/sh" ] || ln -s /bin/bash bin/sh
  
+Index: 1220/mkinitrd/scripts/setup-scsi_dh.sh
+===================================================================
+--- 1220.orig/mkinitrd/scripts/setup-scsi_dh.sh
++++ 1220/mkinitrd/scripts/setup-scsi_dh.sh
+@@ -1,13 +1,13 @@
+ #!/bin/bash
+ #
+ #%stage: device
+ #
+ # Include all scsi_dh_* modules and load them on boot (bnc#727428 et al)
+ 
+ scsi_dh_modules=
+-for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko"); do
++for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko"| sort); do
+ 	i=${i%.ko}
+ 	scsi_dh_modules="$scsi_dh_modules ${i##*/}"
+ done
+ 
+ save_var scsi_dh_modules
 Index: 1220/mkinitrd/scripts/setup-sharedlibs.sh
 ===================================================================
 --- 1220.orig/mkinitrd/scripts/setup-sharedlibs.sh

libguestfs.mkinitrd.1310.patch

@@ -1,7 +1,8 @@
 ---
  mkinitrd/scripts/setup-ibft.sh    |    2 +-
  mkinitrd/scripts/setup-network.sh |   11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
+ mkinitrd/scripts/setup-scsi_dh.sh |    2 +-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
 
 Index: 1310/mkinitrd/scripts/setup-ibft.sh
 ===================================================================
@@ -73,3 +74,26 @@ Index: 1310/mkinitrd/scripts/setup-network.sh
  if [ -f /etc/udev/rules.d/70-persistent-net.rules ] ; then
      cp /etc/udev/rules.d/70-persistent-net.rules $tmp_mnt/etc/udev/rules.d
  fi
+Index: 1310/mkinitrd/scripts/setup-scsi_dh.sh
+===================================================================
+--- 1310.orig/mkinitrd/scripts/setup-scsi_dh.sh
++++ 1310/mkinitrd/scripts/setup-scsi_dh.sh
+@@ -1,17 +1,17 @@
+ #!/bin/bash
+ #
+ #%stage: device
+ #
+ # Include all scsi_dh_* modules and load them on boot (bnc#727428 et al)
+ 
+ scsi_dh_modules=
+ if test -d $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler
+ then
+-	for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko")
++	for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko" | sort)
+ 	do
+ 		i=${i%.ko}
+ 		scsi_dh_modules="$scsi_dh_modules ${i##*/}"
+ 	done
+ fi
+ 
+ save_var scsi_dh_modules