From 2371f971e12780f5a7dc37a825dfaa0944943548 Mon Sep 17 00:00:00 2001
From: Jan Stoess <stoess@ira.uka.de>
Date: Tue, 22 Jun 2010 14:39:37 +0200
Subject: [PATCH] Use gzipped binaries when compiling the grub disk

---
 user/util/grubdisk/Makefile.in | 22 +++++++++++-----------
 user/util/grubdisk/menu.lst    | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/user/util/grubdisk/Makefile.in b/user/util/grubdisk/Makefile.in
index 450c7fbd..aa398f58 100644
--- a/user/util/grubdisk/Makefile.in
+++ b/user/util/grubdisk/Makefile.in
@@ -47,18 +47,18 @@ bootdisk.img:	grub.img mtoolsrc ${srcdir}/menu.lst ${top_builddir}/util/kickstar
 	/sbin/mkdosfs -C bootdisk.img 1440
 	@# Make it a GRUB disk
 	dd if=grub.img of=bootdisk.img conv=notrunc > /dev/null
-	#@ Strip binaries
-	strip ${top_builddir}/*/*/{kickstart,sigma0} 
-	strip ${APP}
-	cp ${kerneldir}/${KERNEL} ${kerneldir}/${KERNEL}.stripped
-	strip ${kerneldir}/${KERNEL}.stripped 
-	cat ${srcdir}/menu.lst | sed -e "s/APP/`basename ${APP}`/" > menu.lst
+	#@ Strip and zip binaries
+	cp -u ${top_builddir}/*/*/{kickstart,sigma0} ${kerneldir}/${KERNEL}  ${APP} .
+	strip ${notdir ${APP}} sigma0 kickstart ${KERNEL}
+	gzip -f ${notdir ${APP}} sigma0 kickstart ${KERNEL}
+	cat ${srcdir}/menu.lst | sed -e "s/APP/${notdir ${APP}}/" > menu.lst
 	@# Copy the binaries to it
 	export MTOOLSRC=mtoolsrc ; \
-	 mcopy -m menu.lst y:boot/grub ; \
-	 mcopy -m ${top_builddir}/*/*/{kickstart,sigma0} y: ; \
-	 mcopy -m ${APP} y: ; \
-	 mcopy -m ${kerneldir}/${KERNEL}.stripped y:kernel
+	mcopy -m menu.lst y:boot/grub ; \
+	mcopy -m kickstart.gz y: ; \
+	mcopy -m ${KERNEL}.gz y:kernel.gz ; \
+	mcopy -m sigma0.gz y: ; \
+	mcopy -m ${notdir ${APP}}.gz y: ; 
 
 grub.img:
 	# Fetch GRUB disk image from web if not local
@@ -69,4 +69,4 @@ mtoolsrc:
 
 
 do-clean:
-	@$(RM) bootdisk.img mtoolsrc ${KERNEL}.stripped
+	$(RM) bootdisk.img mtoolsrc ${notdir ${APP}}.gz sigma0.gz kickstart.gz ${KERNEL}.gz
diff --git a/user/util/grubdisk/menu.lst b/user/util/grubdisk/menu.lst
index a446750c..7f33baa9 100644
--- a/user/util/grubdisk/menu.lst
+++ b/user/util/grubdisk/menu.lst
@@ -3,7 +3,7 @@
 ## Copyright (C) 1999-2010,  Karlsruhe University
 ## Copyright (C) 2008-2009,  Volkmar Uhlig, IBM Corporation
 ##                
-## File path:     util/grubdisk/menu.lst
+## File path:     menu.lst
 ## Description:   
 ##                
 ## Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
 timeout 0
 
 title = L4Ka::Pistachio pingpong 
-kernel=/kickstart
-module=/kernel
-module=/sigma0
-module=/APP
+kernel=/kickstart.gz
+module=/kernel.gz
+module=/sigma0.gz
+module=/APP.gz