Accepting request 137435 from home:elvigia:branches:Kernel:kdump

*** Please forward to 12.2 Updates as appropiate *****

- Since the /usr merge, the mkinitrd bits are broken
  since tools have changed locations.
- Recommend nfs-client and cifs-utils too.

OBS-URL: https://build.opensuse.org/request/show/137435
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=42
This commit is contained in:
Petr Tesařík 2012-10-26 15:55:05 +00:00 committed by Git OBS Bridge
parent 05a7507619
commit 4be4f8bd91
3 changed files with 24 additions and 2 deletions

14
kdump-usrmerge.patch Normal file
View File

@ -0,0 +1,14 @@
--- init/boot-kdump.sh.orig
+++ init/boot-kdump.sh
@@ -17,9 +17,9 @@
#
#%stage: setup
#%depends: mount network
-#%programs: /bin/makedumpfile /bin/awk /bin/gawk /bin/grep /sbin/kdumptool /sbin/showmount /sbin/mount.cifs mount.nfs
+#%programs: /bin/makedumpfile /usr/bin/awk /usr/bin/gawk /bin/grep /usr/sbin/kdumptool /usr/sbin/showmount /sbin/mount.cifs mount.nfs
#%if: "$use_kdump"
-#%udevmodules: cifs nls_utf8 reiserfs xfs ext2 ext3
+#%udevmodules: cifs nls_utf8 reiserfs xfs ext2 ext3 ext4 btrfs
#
# If KDUMP_IMMEDIATE_REBOOT is false, then open a shell. If it's true, then

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Oct 7 22:16:04 UTC 2012 - crrodriguez@opensuse.org
- Since the /usr merge, the mkinitrd bits are broken
since tools have changed locations.
- Recommend nfs-client and cifs-utils too.
-------------------------------------------------------------------
Wed Apr 11 03:45:19 UTC 2012 - jeffm@suse.com.

View File

@ -48,7 +48,7 @@ Patch2: kdump-format-list
Patch3: kdump-save-log
Patch4: kdump-add-none-format
Patch5: kdump-udev-rule
Patch6: kdump-usrmerge.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
Provides: kdump-helpers = 0.2.4
@ -56,6 +56,7 @@ Obsoletes: kdump-helpers <= 0.2.4
# update should detect the split-off from kexec-tools
Provides: kexec-tools:/etc/init.d/kdump
Requires: kexec-tools
Recommends: nfs-client cifs-utils
PreReq: coreutils sed
ExcludeArch: s390 s390x ppc
@ -88,7 +89,7 @@ Authors:
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6
%build
export CFLAGS="%optflags"
export CXXFLAGS="%optflags"