kernel: move initramfs's init script out of base-files
authorRafał Miłecki <rafal@milecki.pl>
Mon, 27 Mar 2017 09:03:01 +0000 (11:03 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 13 Dec 2017 14:00:42 +0000 (15:00 +0100)
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>
(cherry picked from commit f6433eede79db4f6276b68e815bb17a9364292c7)

include/kernel-defaults.mk
target/linux/generic/base-files/init [deleted file]
target/linux/generic/other-files/init [new file with mode: 0755]

index 10bd67a..1ba7be8 100644 (file)
@@ -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
+++ /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
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+export INITRAMFS=1
+exec /sbin/init