2004-10-21 02:59:59

by Chris Wedgwood

[permalink] [raw]
Subject: [PATCH] UML: INITRAMFS_SOURCE noise/build fix

Trivial patch (copy & yank) so UML builds don't generate a warning
from linux/usr/Makefile:gen_cmd_list when CONFIG_INITRAMFS_SOURCE
isn't defined (maybe the Makefile shouldn't require
CONFIG_INITRAMFS_SOURCE to be set?).

Signed-off-by: [email protected]

diff -Nru a/arch/um/Kconfig_block b/arch/um/Kconfig_block
--- a/arch/um/Kconfig_block 2004-10-20 19:36:35 -07:00
+++ b/arch/um/Kconfig_block 2004-10-20 19:36:35 -07:00
@@ -52,6 +52,34 @@
bool "Initial RAM disk (initrd) support"
depends on BLK_DEV_RAM=y

+# copied directly from drivers/block/Kconfig
+
+config INITRAMFS_SOURCE
+ string "Source directory of cpio_list"
+ default ""
+ help
+ This can be set to either a directory containing files, etc to be
+ included in the initramfs archive, or a file containing newline
+ separated entries.
+
+ If it is a file, it should be in the following format:
+ # a comment
+ file <name> <location> <mode> <uid> <gid>
+ dir <name> <mode> <uid> <gid>
+ nod <name> <mode> <uid> <gid> <dev_type> <maj> <min>
+
+ Where:
+ <name> name of the file/dir/nod in the archive
+ <location> location of the file in the current filesystem
+ <mode> mode/permissions of the file
+ <uid> user id (0=root)
+ <gid> group id (0=root)
+ <dev_type> device type (b=block, c=character)
+ <maj> major number of nod
+ <min> minor number of nod
+
+ If you are not sure, leave it blank.
+
config MMAPPER
tristate "Example IO memory driver"
depends on BROKEN


2004-10-22 02:36:14

by Jeff Dike

[permalink] [raw]
Subject: Re: [PATCH] UML: INITRAMFS_SOURCE noise/build fix

[email protected] said:
> Trivial patch (copy & yank) so UML builds don't generate a warning
> from linux/usr/Makefile:gen_cmd_list when CONFIG_INITRAMFS_SOURCE
> isn't defined (maybe the Makefile shouldn't require
> CONFIG_INITRAMFS_SOURCE to be set?).

Applied, thanks.

I hadn't got around to figuring out what that error was about.

Jeff