Re: 2.6.9-rc4-mm1: initramfs build fix

From: Martin Waitz
Date: Sun Oct 17 2004 - 11:27:37 EST


hi :)

CONFIG_INITRAMFS_SOURCE may be empty which confuses 'test'.
So we have to quote it properly.

Signed-off-by: Martin Waitz <tali@xxxxxxxxxxxxxx>

Index: linux-2.6/usr/Makefile
===================================================================
--- linux-2.6.orig/usr/Makefile 2004-10-17 16:06:58.430886734 +0200
+++ linux-2.6/usr/Makefile 2004-10-17 16:07:56.185444167 +0200
@@ -25,14 +25,14 @@

quiet_cmd_gen_list = GEN_INITRAMFS_LIST $@
cmd_gen_list = $(shell \
- if test -f $(CONFIG_INITRAMFS_SOURCE); then \
- if [ $(CONFIG_INITRAMFS_SOURCE) != $@ ]; then \
- echo 'cp -f $(CONFIG_INITRAMFS_SOURCE) $@'; \
+ if test -f "$(CONFIG_INITRAMFS_SOURCE)"; then \
+ if [ "$(CONFIG_INITRAMFS_SOURCE)" != $@ ]; then \
+ echo 'cp -f "$(CONFIG_INITRAMFS_SOURCE)" $@'; \
else \
echo 'echo Using shipped $@'; \
fi; \
- elif test -d $(CONFIG_INITRAMFS_SOURCE); then \
- echo 'scripts/gen_initramfs_list.sh $(CONFIG_INITRAMFS_SOURCE) > $@'; \
+ elif test -d "$(CONFIG_INITRAMFS_SOURCE)"; then \
+ echo 'scripts/gen_initramfs_list.sh "$(CONFIG_INITRAMFS_SOURCE)" > $@'; \
else \
echo 'echo Using shipped $@'; \
fi)

--
Martin Waitz

Attachment: signature.asc
Description: Digital signature