From 9ce30f7175f924eba5779a6d29bf9d676c9d5224 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 27 Mar 2017 11:03:01 +0200 Subject: [PATCH] kernel: move initramfs's init script out of base-files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit f6433eede79db4f6276b68e815bb17a9364292c7) --- include/kernel-defaults.mk | 2 +- target/linux/generic/{base-files => other-files}/init | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename target/linux/generic/{base-files => other-files}/init (100%) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 10bd67a571..1ba7be8448 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -165,7 +165,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 similarity index 100% rename from target/linux/generic/base-files/init rename to target/linux/generic/other-files/init -- 2.25.1