rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-evensmallertftp.patch, NONE, 1.1 anaconda.spec, 1.702, 1.703
Tom Callaway
spot at fedoraproject.org
Wed Mar 11 20:27:33 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7049
Modified Files:
anaconda.spec
Added Files:
anaconda-11.4.0.83-sparc-evensmallertftp.patch
Log Message:
try to make the sparc tftp initrd even smaller
anaconda-11.4.0.83-sparc-evensmallertftp.patch:
--- NEW FILE anaconda-11.4.0.83-sparc-evensmallertftp.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-03-11 15:55:44.000000000 -0400
+++ anaconda-11.4.0.83/scripts/mk-images.sparc 2009-03-11 16:22:28.000000000 -0400
@@ -20,16 +20,55 @@
# modules that are needed. this is the generic "needed for every arch" stuff
TFTPCOMMONMODS="nfs sunrpc lockd cramfs loop squashfs ipv6"
TFTPUSBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage"
+TFTPFSMODS="ext2 ext3 ext4dev lock_nolock cifs"
INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
-TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $CRYPTOMODS"
+TFTPINITRDMODS="$TFTPCOMMONMODS $TFTPUSBMODS $IDEMODS $SCSIMODS $TFTPFSMODS $LVMMODS $CRYPTOMODS"
SPARCCOMMONMODS="openpromfs sermouse"
-SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx qla2100 qla2200 qla2300 pata_cmd64x pata_ali"
+SPARCSCSIMODS="qlogicpti esp sym53c8xx qlogicisp mptbase mptscsih mptfc mptsas qla2xxx pata_cmd64x pata_ali"
SPARCNETMODS="cassini e1000 e1000e sunbmac sungem sunhme sunlance sunqe sunvnet tg3 tulip"
SPARCMODS="$SPARCCOMMONMODS $SPARCSCSIMODS $SPARCNETMODS"
TILO=$IMGPATH/usr/bin/tilo
SILO=$IMGPATH/usr/sbin/silo
+# This is a disgusting hack. Unfortunately, it's the only way we can get files out of the tftpinitrd without worse hacks.
+
+makeproductfile() {
+ root=$1
+
+ rm -f $root/.buildstamp
+ echo $IMAGEUUID > $root/.buildstamp
+ echo $PRODUCT >> $root/.buildstamp
+ echo $VERSION >> $root/.buildstamp
+ if [ -n "$BUGURL" ]; then
+ echo $BUGURL >> $root/.buildstamp
+ fi
+ if [ "$AMITFTP" = "1" ]; then
+ rm -rf $root/modules/*/kernel/drivers/isdn/i4l/isdn.ko*
+ rm -rf $root/modules/*/kernel/drivers/isdn/isdnloop/isdnloop.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/bt8xx/bttv.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/btcx-risc.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/v4l1-compat.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videodev.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-core.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/compat_ioctl32.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/videobuf-dma-sg.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/v4l2-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/video/tveeprom.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/common/ir-common.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/bt878.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/bt8xx/dst.ko*
+ rm -rf $root/modules/*/kernel/drivers/media/dvb/dvb-core/dvb-core.ko*
+ rm -rf $root/firmware/ql2100_fw.bin
+ rm -rf $root/firmware/ql2300_fw.bin
+ rm -rf $root/firmware/ql2322_fw.bin
+ rm -rf $root/firmware/ql2400_fw.bin
+ rm -rf $root/firmware/ql2400_fw.bin_mid
+ fi
+}
+
+
maketftp() {
while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
if [ $1 = "--kernel" ]; then
@@ -77,12 +116,18 @@ makeBootImages() {
echo "Building boot images for kernel $kernelvers.$KERNELARCH"
echo "Building initrd.img"
+
+ export AMITFTP=0
+
makeinitrd --initrdto $TOPDESTPATH/images/initrd.img \
--initrdsize 8192 \
--loaderbin loader \
--modules "$INITRDMODS $SPARCMODS"
[ $? = 0 ] || exit 1
echo "Building special tftpinitrd.img"
+
+ export AMITFTP=1
+
makeinitrd --initrdto $TOPDESTPATH/images/tftpinitrd.img \
--initrdsize 8192 \
--loaderbin loader \
Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- anaconda.spec 9 Mar 2009 20:02:56 -0000 1.702
+++ anaconda.spec 11 Mar 2009 20:27:02 -0000 1.703
@@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 11.4.0.83
-Release: 15.1
+Release: 16
License: GPLv2+
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@@ -16,6 +16,7 @@
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
+Patch7: anaconda-11.4.0.83-sparc-evensmallertftp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64
@@ -170,6 +171,8 @@
%patch5 -p1
# Make the tftp image smaller by restricting the modules heavily (on sparc)
%patch6 -p1
+# Make the tftp image even smaller on sparc, includes one dirty hack
+%patch7 -p1
%build
%{__make} depend
@@ -232,6 +235,10 @@
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Wed Mar 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-16
+- try a function overload hack to delete more files from the tftp initrd
+ so we can get it under the limit
+
* Mon Mar 9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-15.1
- HACK: Don't delete the tftpinitrd.img, we need to look at it to see what
else we can scoop out
More information about the fedora-extras-commits
mailing list