[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[patch] Updated kernel.sh, along with driverdisk.sh



This patch should be done instead of the previous one I posted for kernel.sh.  Sorry for
the multiple posts.

Doing a 'make clean' prior to 'make release' results in kernel.sh and driverdisk.sh
failing because the default behavior of gzip is not working as the script is written.  I
explicitly added the '--no-name' (I tested '--stdout' too, but it does not fix this
problem) flag to gzip in the affected files, which fixes the gzip behavior (and should not
break even if gzip changes its default behavior again).  

A note regarding the gzip behavior was found in another post:
> There are at least two bugs: one is that fseek() doesn't work on
> unseekable file handles, like stdin and stdout; 

Hence our problem.  By explicitly giving the '--no-name' flag, we can avoid this entirely
now and in the future.  Besides, IMHO It doesn't make sense to not have the '--no-name'
flag when the file being compressed is stdin.  Again, IMHO, this is cleaner.

cvs diff -u:
Index: driverdisks.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/driverdisks.sh,v
retrieving revision 1.15
diff -u -r1.15 driverdisks.sh
--- driverdisks.sh      2001/04/08 08:11:28     1.15
+++ driverdisks.sh      2001/04/18 15:03:16
@@ -116,7 +116,7 @@
 
 outfile=drivers${revext}.tgz
 info "moving $tartmp into $outfile"
-(cd $tartmp; tar clf - .) | gzip --best > $outfile
+(cd $tartmp; tar clf - .) | gzip --no-name --best > $outfile
 rm -fr $tartmp
 
 info "splitting drivers into floppy-sized chunks"
Index: kernel.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/kernel.sh,v
retrieving revision 1.23
diff -u -r1.23 kernel.sh
--- kernel.sh   2001/04/08 08:10:44     1.23
+++ kernel.sh   2001/04/18 15:03:16
@@ -105,11 +105,11 @@
 fi
 
 info "creating sys_map$subarch.gz"
-cat $extractdir/boot/System.map-* | gzip -9 > sys_map$subarch.gz
+cat $extractdir/boot/System.map-* | gzip --no-name -9 > sys_map$subarch.gz
 
 info "creating config$subarch.gz"
 # copy the config getting rid of comments and blank lines
-cat $extractdir/boot/config-* | grep -vE '^(#|$)' | gzip -9 > config$subarch.gz
+cat $extractdir/boot/config-* | grep -vE '^(#|$)' | gzip --no-name -9 > config$subarch.gz
 
 rm -rf $extractdir
 
James Strandboge
jstrand1@rochester.rr.com



Reply to: