rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-fixtftp.patch, NONE, 1.1 anaconda-11.4.0.83-sparc-fixverify.patch, NONE, 1.1 anaconda.spec, 1.695, 1.696

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14854

Modified Files:
	anaconda.spec 
Added Files:
	anaconda-11.4.0.83-sparc-fixtftp.patch 
	anaconda-11.4.0.83-sparc-fixverify.patch 
Log Message:
tftp fix, fix verify for sparc

anaconda-11.4.0.83-sparc-fixtftp.patch:

--- NEW FILE anaconda-11.4.0.83-sparc-fixtftp.patch ---
diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.BAD anaconda-11.4.0.83/scripts/mk-images.sparc
--- anaconda-11.4.0.83/scripts/mk-images.sparc.BAD	2008-12-13 10:45:14.000000000 -0500
+++ anaconda-11.4.0.83/scripts/mk-images.sparc	2008-12-13 10:45:46.000000000 -0500
@@ -84,6 +84,7 @@ makeBootImages() {
 
 	maketftp --kernel $MBD_BOOTTREE/vmlinuz \
 		 --imagename $TOPDESTPATH/images/tftp.img \
+		 --initrdfrom $TOPDESTPATH/images/initrd.img \
 		 --systemmap $MBD_BOOTTREE/System.map
     else
 	echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?"

anaconda-11.4.0.83-sparc-fixverify.patch:

--- NEW FILE anaconda-11.4.0.83-sparc-fixverify.patch ---
diff -up anaconda-11.4.0.83/image.py.BAD anaconda-11.4.0.83/image.py
--- anaconda-11.4.0.83/image.py.BAD	2008-12-15 09:32:51.000000000 -0500
+++ anaconda-11.4.0.83/image.py	2008-12-15 09:34:17.000000000 -0500
@@ -31,6 +31,9 @@ log = logging.getLogger("anaconda")
 # don't.  *sigh*
 if os.uname()[4] == "s390x":
     _arch = "s390x"
+# This is somewhat false, but we need this to pass the verify check.
+elif os.uname()[4] == "sparc64":
+    _arch = "sparcv9"
 else:
     _arch = rhpl.getArch()
 


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- anaconda.spec	11 Dec 2008 21:42:12 -0000	1.695
+++ anaconda.spec	16 Dec 2008 15:33:14 -0000	1.696
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 9
+Release: 10
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -11,6 +11,8 @@
 Source0: anaconda-%{version}.tar.bz2
 Patch0: anaconda-11.4.0.83-more-sparc-fixes.patch
 Patch1: anaconda-11.4.0.83-sparc-upd-instroot-nov9vforglibc.patch
+Patch2: anaconda-11.4.0.83-sparc-fixtftp.patch
+Patch3: anaconda-11.4.0.83-sparc-fixverify.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: sparc64
@@ -155,6 +157,10 @@
 %patch0 -p1
 # Fix upd-instroot to force sparcv9 for glibc and openssl
 %patch1 -p1
+# Fix tftp generation to use an initrd
+%patch2 -p1
+# Fix arch comparison for sparcv9 in verify function
+%patch3 -p1
 
 %build
 %{__make} depend
@@ -217,6 +223,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-10
+- Fix tftp generation to use an initrd
+- Fix arch comparison for sparcv9 in verify function
+
 * Thu Dec 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-9 
 - Fix upd-instroot to force sparcv9 for glibc and openssl
 - drop debugging patch