aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-27 11:03:01 +0200
committerRafał Miłecki <rafal@milecki.pl>2017-04-04 14:06:40 +0200
commitf6433eede79db4f6276b68e815bb17a9364292c7 (patch)
treea73d3a45c328eb756bdc8c4b4a19e0e93911d758
parent68139cc0e819b5f654c4f78468049eef035d28f7 (diff)
downloadupstream-f6433eede79db4f6276b68e815bb17a9364292c7.tar.gz
upstream-f6433eede79db4f6276b68e815bb17a9364292c7.tar.bz2
upstream-f6433eede79db4f6276b68e815bb17a9364292c7.zip
kernel: move initramfs's init script out of base-files
Keeping it in base-files was resulting in adding it to the base-files package. This file is meant to be included manually for initramfs images only. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-rw-r--r--include/kernel-defaults.mk2
-rwxr-xr-xtarget/linux/generic/other-files/init (renamed from target/linux/generic/base-files/init)0
2 files changed, 1 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 9fa5c1d3dd..407c1924a1 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -167,7 +167,7 @@ endef
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
define Kernel/CompileImage/Initramfs
$(call Kernel/Configure/Initramfs)
- $(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init
+ $(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
$(call Kernel/CopyImage,-initramfs)
diff --git a/target/linux/generic/base-files/init b/target/linux/generic/other-files/init
index 514be57e66..514be57e66 100755
--- a/target/linux/generic/base-files/init
+++ b/target/linux/generic/other-files/init