[PATCH] Embedded ramdisks

[PATCH] Embedded ramdisks

[Geert Uytterhoeven]

	Hi Ralf,

Fix the dependency for embedded ramdisks by using the contents of
CONFIG_EMBEDDED_RAMDISK_IMAGE (after stripping the leading and trailing double
quotes) instead of using the hardcoded filename `ramdisk.gz'.

--- linux-mips-2.4.x/arch/mips/ramdisk/Makefile	Tue Apr  1 16:22:04 2003
+++ linux/arch/mips/ramdisk/Makefile	Wed Apr  2 18:31:48 2003
@@ -8,7 +8,7 @@
 
 O_FORMAT = $(shell $(OBJDUMP) -i | head -2 | grep elf32)
 img = $(CONFIG_EMBEDDED_RAMDISK_IMAGE)
-ramdisk.o: ramdisk.gz ld.script
+ramdisk.o: $(subst ",,$(img)) ld.script
 	echo "O_FORMAT:  " $(O_FORMAT)
 	$(LD) -T ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
 

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH] Embedded ramdisks

[Ralf Baechle]

On Fri, May 23, 2003 at 03:52:45PM +0200, Geert Uytterhoeven wrote:

> Fix the dependency for embedded ramdisks by using the contents of
> CONFIG_EMBEDDED_RAMDISK_IMAGE (after stripping the leading and trailing double
> quotes) instead of using the hardcoded filename `ramdisk.gz'.

Thanks, applied.

  Ralf

[PATCH] Embedded ramdisks

[Geert Uytterhoeven]

The embedded ramdisk support allows to embed an arbitrary file in the image,
but the dependency in the Makefile still contains the hardcoded name
`ramdisk.gz'. This patch changes the dependency so it matches the selected file
name during kernel configuration.

The sed magic is needed because the kernel configuration embeds the filename in
double quotes.

--- linux-mips-2.4.x/arch/mips/ramdisk/Makefile	Fri Oct 25 13:37:30 2002
+++ geert-mips-2.4.x/arch/mips/ramdisk/Makefile	Thu Dec  5 11:53:14 2002
@@ -8,7 +8,7 @@
 
 O_FORMAT = $(shell $(OBJDUMP) -i | head -2 | grep elf32)
 img = $(CONFIG_EMBEDDED_RAMDISK_IMAGE)
-ramdisk.o: ramdisk.gz ld.script
+ramdisk.o: $(shell echo $(img) | sed -e 's/"//g') ld.script
 	echo "O_FORMAT:  " $(O_FORMAT)
 	$(LD) -T ld.script -b binary --oformat $(O_FORMAT) -o $@ $(img)
 

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds