rpms/kexec-tools/FC-5 kexec-ppc64-ingnore-args-linux.patch, NONE, 1.1 kexec-tools.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13187

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-ppc64-ingnore-args-linux.patch 
Log Message:
adding ppc64 args-linux patch

kexec-ppc64-ingnore-args-linux.patch:
 kexec-elf-ppc64.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE kexec-ppc64-ingnore-args-linux.patch ---
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -93,6 +93,7 @@ int elf_ppc64_load(int argc, char **argv
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
 #define OPT_RAMDISK     (OPT_ARCH_MAX+1)
 #define OPT_DEVICETREEBLOB     (OPT_ARCH_MAX+2)
+#define OPT_ARGS_IGNORE		(OPT_ARCH_MAX+3)
 
 	static const struct option options[] = {
 		KEXEC_ARCH_OPTIONS
@@ -101,6 +102,7 @@ int elf_ppc64_load(int argc, char **argv
 		{ "ramdisk",            1, NULL, OPT_RAMDISK },
 		{ "initrd",             1, NULL, OPT_RAMDISK },
 		{ "devicetreeblob",     1, NULL, OPT_DEVICETREEBLOB },
+		{ "args-linux",		0, NULL, OPT_ARGS_IGNORE },
 		{ 0,                    0, NULL, 0 },
 	};
 
@@ -134,6 +136,8 @@ int elf_ppc64_load(int argc, char **argv
 		case OPT_DEVICETREEBLOB:
 			devicetreeblob = optarg;
 			break;
+		case OPT_ARGS_IGNORE:
+			break;
 		}
 	}
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kexec-tools.spec	8 Mar 2006 20:39:23 -0000	1.18
+++ kexec-tools.spec	22 Jun 2006 17:33:37 -0000	1.19
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 16
+Release: 17
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -28,6 +28,7 @@
 #
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
 #
+Patch301: kexec-ppc64-ingnore-args-linux.patch
 
 Patch501: kexec-tools-1.101-Makefile.patch
 
@@ -43,6 +44,7 @@
 rm -f ../kexec-tools-1.101.spec
 %patch1 -p1
 %patch101 -p1
+%patch301 -p1
 %patch501 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
@@ -96,6 +98,9 @@
 %doc TODO
 
 %changelog
+* Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-17
+- Add patch to allow ppc64 to ignore args-linux option
+
 * Wed Mar 08 2006 Bill Nottingham <notting at redhat.com> - 1.101-16
 - fix scriptlet - call chkconfig --add, change the default in the
   script itself (#183633)