From: Rafał Miłecki Date: Mon, 27 Mar 2017 09:03:01 +0000 (+0200) Subject: kernel: move initramfs's init script out of base-files X-Git-Tag: v17.01.5~247 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=9ce30f7175f924eba5779a6d29bf9d676c9d5224 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 (cherry picked from commit f6433eede79db4f6276b68e815bb17a9364292c7) --- 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/base-files/init deleted file mode 100755 index 514be57e66..0000000000 --- a/target/linux/generic/base-files/init +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006 OpenWrt.org -export INITRAMFS=1 -exec /sbin/init diff --git a/target/linux/generic/other-files/init b/target/linux/generic/other-files/init new file mode 100755 index 0000000000..514be57e66 --- /dev/null +++ b/target/linux/generic/other-files/init @@ -0,0 +1,4 @@ +#!/bin/sh +# Copyright (C) 2006 OpenWrt.org +export INITRAMFS=1 +exec /sbin/init