use standard busybox init, remove previously used /init. some configs and ideas from buildroot project

5 files changed, 1 insertions, 39 deletions

diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index b6716cbdd..03cecfca1 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,7 +38,7 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && ADK_TARGET_QEMU_WITH_GRAPHIC
 default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_RUNTIME_CONSOLE_SERIAL
 
diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch
index d23d6d212..4dccae8c1 100644
--- a/target/linux/patches/3.11.10/startup.patch
+++ b/target/linux/patches/3.11.10/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
 --- linux-3.7.3.orig/init/main.c	2013-01-17 17:47:40.000000000 +0100
 +++ linux-3.7.3/init/main.c	2013-01-19 15:08:13.000000000 +0100
-@@ -834,7 +834,8 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	if (!run_init_process("/sbin/init") ||
-+	if (!run_init_process("/init") ||
-+ 	    !run_init_process("/sbin/init") ||
- 	    !run_init_process("/etc/init") ||
- 	    !run_init_process("/bin/init") ||
- 	    !run_init_process("/bin/sh"))
 @@ -879,6 +880,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch
index d23d6d212..4dccae8c1 100644
--- a/target/linux/patches/3.12.13/startup.patch
+++ b/target/linux/patches/3.12.13/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
 --- linux-3.7.3.orig/init/main.c	2013-01-17 17:47:40.000000000 +0100
 +++ linux-3.7.3/init/main.c	2013-01-19 15:08:13.000000000 +0100
-@@ -834,7 +834,8 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	if (!run_init_process("/sbin/init") ||
-+	if (!run_init_process("/init") ||
-+ 	    !run_init_process("/sbin/init") ||
- 	    !run_init_process("/etc/init") ||
- 	    !run_init_process("/bin/init") ||
- 	    !run_init_process("/bin/sh"))
 @@ -879,6 +880,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.13.5/startup.patch b/target/linux/patches/3.13.5/startup.patch
index bfe3ae6ec..be4ea469d 100644
--- a/target/linux/patches/3.13.5/startup.patch
+++ b/target/linux/patches/3.13.5/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
 --- linux-3.13.3.orig/init/main.c	2014-02-13 23:00:14.000000000 +0100
 +++ linux-3.13.3/init/main.c	2014-02-17 11:35:14.000000000 +0100
-@@ -871,7 +871,8 @@
- 		pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
- 			execute_command, ret);
- 	}
--	if (!try_to_run_init_process("/sbin/init") ||
-+	if (!try_to_run_init_process("/init") ||
-+            !try_to_run_init_process("/sbin/init") ||
- 	    !try_to_run_init_process("/etc/init") ||
- 	    !try_to_run_init_process("/bin/init") ||
- 	    !try_to_run_init_process("/bin/sh"))
 @@ -916,6 +917,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		pr_err("Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch
index 68e8987b0..4f47eddcb 100644
--- a/target/linux/patches/3.4.82/startup.patch
+++ b/target/linux/patches/3.4.82/startup.patch
@@ -1,14 +1,6 @@
 diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c
 --- linux-2.6.34.orig/init/main.c	2010-05-16 23:17:36.000000000 +0200
 +++ linux-2.6.34/init/main.c	2010-05-20 20:13:26.321613615 +0200
-@@ -842,6 +842,7 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
-+	run_init_process("/init");
- 	run_init_process("/sbin/init");
- 	run_init_process("/etc/init");
- 	run_init_process("/bin/init");
 @@ -889,6 +890,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");