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 <[email protected]>
(cherry picked from commit f6433eede79db4f6276b68e815bb17a9364292c7)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 10bd67a571f12b2ffeb97624654f3f2c68905af4..1ba7be844898d0aa7ad3e0b223bde2ddf8c361cf 100644 (file)
--- 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 (executable)
index 514be57..0000000
--- 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 (executable)
index 0000000..514be57
--- /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