Skip to contentSkip to conversation

- UML - add initramfs to Kconfig

PATCH In review Jeff Dike 2 participants 3 messages Nov 14, 2004 User-mode Linux (UML)

lore
Share & tools
lore

Jeff Dike

author
#0 lore raw

PATCH 1/1 - UML - add initramfs to Kconfig

Trivial patch (copy and 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?).

arch/um/Kconfig_block +28 -0
Index: 2.6.9/arch/um/Kconfig_block
===================================================================
@@ -79,6 +79,34 @@
 
 	  If you are not sure, leave it blank.
 
+# 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
#1 lore raw
Quoted 4 lines · Jeff Dike

Trivial patch (copy and 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?).

This is already in the BK tree... for about 3 weeks now! What tree are you working from?

author
#2 lore raw
Quoted 2 lines · [email protected] said:

This is already in the BK tree... for about 3 weeks now! What tree are you working from?

Oops, I rely on quilt telling me a patch is in -mm when I push my patchset on to the latest. However, it is disturbingly happy to insert duplicate copies of stuff, as happened in this case.

Jeff