From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 27 Mar 2017 09:03:01 +0000 (+0200)
Subject: kernel: move initramfs's init script out of base-files
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f6433eede79db4f6276b68e815bb17a9364292c7;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 9fa5c1d3dd96..407c1924a152 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/base-files/init
deleted file mode 100755
index 514be57e6644..000000000000
--- 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 000000000000..514be57e6644
--- /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