patch-2.1.126 linux/arch/alpha/boot/Makefile

• Lines: 42
• Date: Mon Oct 12 11:40:12 1998
• Orig file: v2.1.125/linux/arch/alpha/boot/Makefile
• Orig date: Wed Sep 9 14:51:03 1998

diff -u --recursive --new-file v2.1.125/linux/arch/alpha/boot/Makefile linux/arch/alpha/boot/Makefile
@@ -36,7 +36,10 @@
 	tools/mkbb bootimage tools/lxboot
 
 bootpfile:	tools/bootph vmlinux.nh
-	( cat tools/bootph vmlinux.nh ) > bootpfile
+	cat tools/bootph vmlinux.nh > bootpfile
+ifdef INITRD
+	cat $(INITRD) >> bootpfile
+endif
 
 srmboot:	bootdevice bootimage
 	dd if=bootimage of=$(BOOTDEV) bs=512 seek=1 skip=1
@@ -48,15 +51,18 @@
 vmlinux.gz: vmlinux
 	gzip -fv9 vmlinux
 
-#
-# A raw binary without header.  Used by raw boot.
-#
 main.o: ksize.h
 
 bootp.o: ksize.h
 
-ksize.h: $(OBJSTRIP) vmlinux.nh
-	echo "#define KERNEL_SIZE `$(OBJSTRIP) -p vmlinux.nh /dev/null`" > $@
+ksize.h: vmlinux.nh dummy
+	echo "#define KERNEL_SIZE `ls -l vmlinux.nh | awk '{print $$5}'`" > $@T
+ifdef INITRD
+	[ -f $(INITRD) ] || exit 1
+	echo "#define INITRD_SIZE `ls -l $(INITRD) | awk '{print $$5}'`" >> $@T
+endif
+	cmp -s $@T $@ || mv -f $@T $@
+	rm -f $@T
 
 vmlinux.nh: $(VMLINUX) $(OBJSTRIP)
 	$(OBJSTRIP) -v $(VMLINUX) vmlinux.nh
@@ -91,3 +97,5 @@
 	rm -f vmlinux.nh ksize.h
 
 dep:
+
+dummy: