rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-smalltftp.patch, NONE, 1.1 anaconda.spec, 1.699, 1.700

[Tom Callaway]

Author: spot

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

Modified Files:
	anaconda.spec 
Added Files:
	anaconda-11.4.0.83-sparc-smalltftp.patch 
Log Message:
Make the tftp image smaller by restricting the modules heavily (on sparc)

anaconda-11.4.0.83-sparc-smalltftp.patch:

--- NEW FILE anaconda-11.4.0.83-sparc-smalltftp.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	2009-02-11 14:59:20.000000000 -0500
+++ anaconda-11.4.0.83/scripts/mk-images.sparc	2009-02-11 14:59:38.000000000 -0500
@@ -17,7 +17,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SPARCMODS="openpromfs sermouse qlogicpti pluto fcal soc socal esp fc4 aic7xxx sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300"
+# modules that are needed.  this is the generic "needed for every arch" stuff
+TFTPCOMMONMODS="fat vfat nfs sunrpc lockd cramfs loop squashfs ipv6"
+TFTPUSBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage"
+INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
+TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $CRYPTOMODS"
+SPARCCOMMONMODS="openpromfs sermouse"
+SPARCSCSIMODS="qlogicpti pluto fcal soc socal esp fc4 aic7xxx sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300 pata_cmd64x pata_ali"
+SPARCNETMODS="cassini e100 e1000 e1000e sunbmac sungem sunhme sunlance sunqe sunvnet tg3 tulip"
+SPARCMODS="$SPARCCOMMONMODS $SPARCSCSIMODS $SPARCNETMODS"
+
 TILO=$IMGPATH/usr/bin/tilo
 SILO=$IMGPATH/usr/sbin/silo
 
@@ -73,6 +82,12 @@ makeBootImages() {
 	--loaderbin loader \
 	--modules "$INITRDMODS $SPARCMODS"
     [ $? = 0 ] || exit 1
+    echo "Building special tftpinitrd.img"
+    makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
+	--initrdsize 8192 \
+	--loaderbin loader \
+	--modules "$TFTPINITRDMODS $SPARCMODS"
+    [ $? = 0 ] || exit 1
     if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/second.b ]; then
 	echo "Building boot dir for silo"
 	MBD_BOOTTREE=$TOPDESTPATH/boot
@@ -84,8 +99,10 @@ makeBootImages() {
 
 	maketftp --kernel $MBD_BOOTTREE/vmlinuz \
 		 --imagename $TOPDESTPATH/images/tftp.img \
-		 --initrdfrom $TOPDESTPATH/images/initrd.img \
+		 --initrdfrom $TOPDESTPATH/images/tftpinitrd.img \
 		 --systemmap $MBD_BOOTTREE/System.map
+        echo "Deleting $TOPDESTPATH/images/tftpinitrd.img , we only want this for the tftp image creation"
+        rm -rf $TOPDESTPATH/images/tftpinitrd.img
     else
 	echo "I can't find SILO in $IMGPATH/usr/lib/anaconda-runtime/boot ?!?"
 	exit 1


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- anaconda.spec	2 Feb 2009 20:22:56 -0000	1.699
+++ anaconda.spec	11 Feb 2009 20:05:48 -0000	1.700
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 13
+Release: 14
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -15,6 +15,7 @@
 Patch3: anaconda-11.4.0.83-sparc-fixverify.patch
 Patch4: anaconda-11.4.0.83-raid-headers.patch
 Patch5: anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch
+Patch6: anaconda-11.4.0.83-sparc-smalltftp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: sparc64
@@ -167,6 +168,8 @@
 %patch4 -p1
 # Get rid of sun disk specific getMinimumsector routines
 %patch5 -p1
+# Make the tftp image smaller by restricting the modules heavily (on sparc)
+%patch6 -p1
 
 %build
 %{__make} depend
@@ -229,6 +232,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-14
+- Make the tftp image smaller by restricting the modules heavily (on sparc)
+
 * Mon Feb  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-13
 - back out anaconda-11.4.0.83-sparc-getMinimumSector.patch
   that code is almost never right on sparc, so we also back it out where