patch-1.3.5 linux/arch/i386/boot/compressed/Makefile

• Lines: 52
• Date: Thu Jun 29 11:53:09 1995
• Orig file: v1.3.4/linux/arch/i386/boot/compressed/Makefile
• Orig date: Tue Jan 31 08:58:00 1995

diff -u --recursive --new-file v1.3.4/linux/arch/i386/boot/compressed/Makefile linux/arch/i386/boot/compressed/Makefile
@@ -11,6 +11,12 @@
 
 CFLAGS = -O2 -DSTDC_HEADERS
 
+ifdef CONFIG_KERNEL_ELF
+TARGET=--target elf32-i386
+INPUT_DATA=input_data
+INPUT_LEN=input_len
+endif
+
 .c.s:
 	$(CC) $(CFLAGS) -S $<
 .s.o:
@@ -20,13 +26,24 @@
 
 all: vmlinux
 
-vmlinux:	piggy.o $(OBJECTS)
-		$(LD) $(ZLINKFLAGS) -o vmlinux $(OBJECTS) piggy.o
+vmlinux: piggy.o $(OBJECTS)
+	$(LD) $(ZLINKFLAGS) -o vmlinux $(OBJECTS) piggy.o
+
+head.o: head.S $(TOPDIR)/include/linux/tasks.h
+	$(CC) -traditional -c head.S
 
-head.o:	head.s
+ifdef CONFIG_KERNEL_ELF
 
-head.s: head.S $(TOPDIR)/include/linux/tasks.h
-	$(CPP) -traditional head.S -o head.s
+# You cannot compress a file and have the kernel uncompress it, it must
+# be stdin
+piggy.o:	$(SYSTEM)
+	tmppiggy=/tmp/$$.piggy; \
+	rm -f $$tmppiggy $$tmppiggy.gz; \
+	$(OBJDUMP) $(OBJDUMP_FLAGS) -o $(IMAGE_OFFSET) $(SYSTEM) > $$tmppiggy; \
+	gzip -f -9 < $$tmppiggy > $$tmppiggy.gz; \
+	encaps $(TARGET) piggy.o $$tmppiggy.gz $(INPUT_DATA) $(INPUT_LEN); \
+	rm -f $$tmppiggy $$tmppiggy.gz
+else
 
 piggy.o:	$(SYSTEM) xtract piggyback
 		./xtract $(SYSTEM) | gzip -9 | ./piggyback > piggy.o
@@ -36,6 +53,8 @@
 
 piggyback: piggyback.c
 	$(HOSTCC) $(CFLAGS) -o piggyback piggyback.c
+
+endif
 
 clean:
 	rm -f xtract piggyback vmlinux