diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-04 18:02:35 +0300 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-15 18:25:22 +0300 |
| commit | 4538f41305c3f2c35463c996663dbf6307030ad7 (patch) | |
| tree | 3ea57f126a5e2fb321890bdc8ec2670eefbeddb6 /usr/Makefile | |
| parent | 9668097599aa5fb87351bc2263e06a1c24718d40 (diff) | |
| download | linux-4538f41305c3f2c35463c996663dbf6307030ad7.tar.xz | |
initramfs: add default_cpio_list, and delete -d option support
When CONFIG_INITRAMFS_SOURCE is empty, the Makefile passes the -d
option to gen_initramfs.sh to create the default initramfs, which
contains /dev, /dev/console, and /root.
This commit simplifies the default behavior; remove the -d option,
and add the default cpio list.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile index 9c7387156c6b..4ca452197834 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -25,7 +25,7 @@ $(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE hostprogs-y := gen_init_cpio ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) + $(shell echo $(CONFIG_INITRAMFS_SOURCE)),$(srctree)/$(src)/default_cpio_list) ramfs-args := \ $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) |