rpms/kexec-tools/devel kexec-tools-1.101-Makefile.patch, 1.2, 1.3 kexec-tools-1.101-ia64-fixup.patch, 1.3, 1.4 kexec-tools.spec, 1.29, 1.30

Wed Jul 5 19:54:52 UTC 2006

Author: nhorman

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

Modified Files:
	kexec-tools-1.101-Makefile.patch 
	kexec-tools-1.101-ia64-fixup.patch kexec-tools.spec 
Log Message:
fixing up other arch builds

kexec-tools-1.101-Makefile.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: kexec-tools-1.101-Makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-Makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- kexec-tools-1.101-Makefile.patch	5 Jul 2006 19:20:43 -0000	1.2
+++ kexec-tools-1.101-Makefile.patch	5 Jul 2006 19:54:50 -0000	1.3
@@ -1,11 +1,11 @@
---- kexec-tools-1.101/Makefile.orig	2006-07-05 15:18:20.000000000 -0400
-+++ kexec-tools-1.101/Makefile	2006-07-05 15:19:18.000000000 -0400
+--- kexec-tools-1.101/Makefile.orig	2006-07-05 15:42:41.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-05 15:43:09.000000000 -0400
 @@ -44,7 +44,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
  
  MAN_PAGES:= kexec/kexec.8
  BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
 -BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
-+BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
++BINARIES_x86_64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
  BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
  
+ TARGETS:=$(BINARIES) $(MAN_PAGES)

kexec-tools-1.101-ia64-fixup.patch:
 kexec-ia64.c |   24 ------------------------
 1 files changed, 24 deletions(-)

Index: kexec-tools-1.101-ia64-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-ia64-fixup.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:20:43 -0000	1.3
+++ kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:54:50 -0000	1.4
@@ -38,85 +38,3 @@
  		/* For compatibility with older patches 
  		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
  		 */
---- kexec-tools-1.101/Makefile.orig	2006-07-05 15:16:35.000000000 -0400
-+++ kexec-tools-1.101/Makefile	2006-07-05 15:17:18.000000000 -0400
-@@ -45,6 +45,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
- MAN_PAGES:= kexec/kexec.8
- BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
-+BINARIES_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
- 
- TARGETS:=$(BINARIES) $(MAN_PAGES)
-@@ -89,6 +90,9 @@ endif
- ifeq ($(ARCH),x86_64)
- include kexec_test/Makefile
- endif
-+ifeq ($(ARCH),ia64)
-+include kexec_test/Makefile.ia64
-+endif
- 
- GENERATED_SRCS:= ./configure
- SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec
---- /dev/null	2006-06-30 11:19:59.592541712 -0400
-+++ kexec-tools-1.101/kexec_test/Makefile.ia64	2006-07-05 15:16:54.000000000 -0400
-@@ -0,0 +1,30 @@
-+#
-+# kexec_test Debugging payload to be certain the infrastructure works
-+#
-+RELOC:=0x10000
-+KEXEC_TEST_S_SRCS:= kexec_test/kexec_test_ia64.S
-+KEXEC_TEST_S_TEMPS:=$(patsubst %.S, $(OBJDIR)/%.s, $(KEXEC_TEST_S_SRCS))
-+KEXEC_TEST_S_OBJS:=$(patsubst $(OBJDIR)/%.s, $(OBJDIR)/%.o, $(KEXEC_TEST_S_TEMPS))
-+KEXEC_TEST_S_DEPS:=$(patsubst %.S, $(OBJDIR)/%.d, $(KEXEC_TEST_S_SRCS))
-+KEXEC_TEST_SRCS:= $(KEXEC_TEST_S_SRCS)
-+KEXEC_TEST_OBJS:= $(KEXEC_TEST_S_OBJS)
-+KEXEC_TEST_DEPS:= $(KEXEC_TEST_S_DEPS)
-+KEXEC_TEST:=$(PKGLIBDIR)/kexec_test
-+
-+include $(KEXEC_TEST_DEPS)
-+
-+$(KEXEC_TEST_S_DEPS): $(OBJDIR)/%.d: %.S
-+	mkdir -p $(@D)
-+	$(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
-+
-+$(KEXEC_TEST_S_TEMPS): $(OBJDIR)/%.s: %.S 
-+	mkdir -p $(@D)
-+	$(CPP) $(CPPFLAGS) -DRELOC=$(RELOC) $< > $@
-+
-+$(KEXEC_TEST_S_OBJS): $(OBJDIR)/%.o: $(OBJDIR)/%.s 
-+	mkdir -p $(@D)
-+	$(AS) -o $@ $<
-+
-+$(KEXEC_TEST): $(KEXEC_TEST_OBJS) 
-+	mkdir -p $(@D)
-+	$(LD) -m elf64_ia64 -e _start -Ttext $(RELOC) $(KEXEC_TEST_OBJS) -o $@
---- /dev/null	2006-06-30 11:19:59.592541712 -0400
-+++ kexec-tools-1.101/kexec_test/kexec_test_ia64.S	2006-07-05 15:16:54.000000000 -0400
-@@ -0,0 +1,26 @@
-+/*
-+ * kexec: Linux boots Linux
-+ *
-+ * Copyright (C) 2003,2004  Eric Biederman (ebiederm at xmission.com)
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation (version 2 of the License).
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+	.text
-+	.globl _start
-+_start:
-+	# Jump to self
-+	br.few _start
-+
-+


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kexec-tools.spec	5 Jul 2006 19:20:43 -0000	1.29
+++ kexec-tools.spec	5 Jul 2006 19:54:50 -0000	1.30
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 24%{dist}
+Release: 25%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -89,8 +89,9 @@
 /sbin/*
 %config(noreplace,missingok) /etc/sysconfig/kdump
 %config /etc/rc.d/init.d/kdump
-
+%ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
+%endif
 %doc News
 %doc COPYING
 %doc TODO


