diff options
-rw-r--r-- | Documentation/early-userspace/README | 6 | ||||
-rw-r--r-- | Documentation/filesystems/ramfs-rootfs-initramfs.txt | 2 | ||||
-rw-r--r-- | usr/Makefile | 2 | ||||
-rwxr-xr-x | usr/gen_initramfs_list.sh (renamed from scripts/gen_initramfs_list.sh) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/early-userspace/README b/Documentation/early-userspace/README index 2c00b072a4c8..1e1057958dd3 100644 --- a/Documentation/early-userspace/README +++ b/Documentation/early-userspace/README | |||
@@ -66,17 +66,17 @@ early userspace image can be built by an unprivileged user. | |||
66 | 66 | ||
67 | As a technical note, when directories and files are specified, the | 67 | As a technical note, when directories and files are specified, the |
68 | entire CONFIG_INITRAMFS_SOURCE is passed to | 68 | entire CONFIG_INITRAMFS_SOURCE is passed to |
69 | scripts/gen_initramfs_list.sh. This means that CONFIG_INITRAMFS_SOURCE | 69 | usr/gen_initramfs_list.sh. This means that CONFIG_INITRAMFS_SOURCE |
70 | can really be interpreted as any legal argument to | 70 | can really be interpreted as any legal argument to |
71 | gen_initramfs_list.sh. If a directory is specified as an argument then | 71 | gen_initramfs_list.sh. If a directory is specified as an argument then |
72 | the contents are scanned, uid/gid translation is performed, and | 72 | the contents are scanned, uid/gid translation is performed, and |
73 | usr/gen_init_cpio file directives are output. If a directory is | 73 | usr/gen_init_cpio file directives are output. If a directory is |
74 | specified as an argument to scripts/gen_initramfs_list.sh then the | 74 | specified as an argument to usr/gen_initramfs_list.sh then the |
75 | contents of the file are simply copied to the output. All of the output | 75 | contents of the file are simply copied to the output. All of the output |
76 | directives from directory scanning and file contents copying are | 76 | directives from directory scanning and file contents copying are |
77 | processed by usr/gen_init_cpio. | 77 | processed by usr/gen_init_cpio. |
78 | 78 | ||
79 | See also 'scripts/gen_initramfs_list.sh -h'. | 79 | See also 'usr/gen_initramfs_list.sh -h'. |
80 | 80 | ||
81 | Where's this all leading? | 81 | Where's this all leading? |
82 | ========================= | 82 | ========================= |
diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt index b176928e6963..79637d227e85 100644 --- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt +++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt | |||
@@ -164,7 +164,7 @@ Documentation/early-userspace/README for more details.) | |||
164 | The kernel does not depend on external cpio tools. If you specify a | 164 | The kernel does not depend on external cpio tools. If you specify a |
165 | directory instead of a configuration file, the kernel's build infrastructure | 165 | directory instead of a configuration file, the kernel's build infrastructure |
166 | creates a configuration file from that directory (usr/Makefile calls | 166 | creates a configuration file from that directory (usr/Makefile calls |
167 | scripts/gen_initramfs_list.sh), and proceeds to package up that directory | 167 | usr/gen_initramfs_list.sh), and proceeds to package up that directory |
168 | using the config file (by feeding it to usr/gen_init_cpio, which is created | 168 | using the config file (by feeding it to usr/gen_init_cpio, which is created |
169 | from usr/gen_init_cpio.c). The kernel's build-time cpio creation code is | 169 | from usr/gen_init_cpio.c). The kernel's build-time cpio creation code is |
170 | entirely self-contained, and the kernel's boot-time extractor is also | 170 | entirely self-contained, and the kernel's boot-time extractor is also |
diff --git a/usr/Makefile b/usr/Makefile index 237a028693ce..748f6a60bb1e 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
@@ -24,7 +24,7 @@ $(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE | |||
24 | # Generate the initramfs cpio archive | 24 | # Generate the initramfs cpio archive |
25 | 25 | ||
26 | hostprogs-y := gen_init_cpio | 26 | hostprogs-y := gen_init_cpio |
27 | initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh | 27 | initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh |
28 | ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ | 28 | ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ |
29 | $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) | 29 | $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) |
30 | ramfs-args := \ | 30 | ramfs-args := \ |
diff --git a/scripts/gen_initramfs_list.sh b/usr/gen_initramfs_list.sh index 0aad760fcd8c..0aad760fcd8c 100755 --- a/scripts/gen_initramfs_list.sh +++ b/usr/gen_initramfs_list.sh | |||