From 52c09f0f6c6fcf6e81ee4fc7b2db225c3c950ecf Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 29 Oct 2021 23:30:45 +0200 Subject: target: linux: patches: Drop initramfs startup hack No need to change the initramfs 'init' binary location in kernels anymore, image.mk adds a symlink from /init to /sbin/init to cover for that. Signed-off-by: Phil Sutter --- target/linux/patches/3.16.85/startup.patch | 12 ------------ target/linux/patches/4.14.252/startup.patch | 9 --------- target/linux/patches/4.16.17/startup.patch | 9 --------- target/linux/patches/4.19.213/startup.patch | 9 --------- target/linux/patches/4.4.289/startup.patch | 9 --------- target/linux/patches/4.9.287/startup.patch | 9 --------- target/linux/patches/5.10.75/startup.patch | 9 --------- target/linux/patches/5.4.155/startup.patch | 9 --------- .../6064a9bdf48cefbccc4f6472dd04251f0dec1931/startup.patch | 9 --------- 9 files changed, 84 deletions(-) (limited to 'target/linux/patches') diff --git a/target/linux/patches/3.16.85/startup.patch b/target/linux/patches/3.16.85/startup.patch index d396b75e4..52465989f 100644 --- a/target/linux/patches/3.16.85/startup.patch +++ b/target/linux/patches/3.16.85/startup.patch @@ -23,15 +23,3 @@ diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c return 0; } rootfs_initcall(populate_rootfs); -diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c ---- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100 -@@ -924,7 +924,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.14.252/startup.patch b/target/linux/patches/4.14.252/startup.patch index bac354728..f52660a95 100644 --- a/target/linux/patches/4.14.252/startup.patch +++ b/target/linux/patches/4.14.252/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.14.24.orig/init/main.c linux-4.14.24/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* -@@ -1077,7 +1079,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.16.17/startup.patch b/target/linux/patches/4.16.17/startup.patch index 8115b2cc6..e8de6cd4b 100644 --- a/target/linux/patches/4.16.17/startup.patch +++ b/target/linux/patches/4.16.17/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.15.13.orig/init/main.c linux-4.15.13/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* -@@ -1083,7 +1085,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.19.213/startup.patch b/target/linux/patches/4.19.213/startup.patch index dd27de856..4f42e84a7 100644 --- a/target/linux/patches/4.19.213/startup.patch +++ b/target/linux/patches/4.19.213/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c (void) ksys_dup(0); (void) ksys_dup(0); /* -@@ -1146,7 +1148,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (ksys_access((const char __user *) - ramdisk_execute_command, 0) != 0) { diff --git a/target/linux/patches/4.4.289/startup.patch b/target/linux/patches/4.4.289/startup.patch index e54ac19a6..f9ab3f1c1 100644 --- a/target/linux/patches/4.4.289/startup.patch +++ b/target/linux/patches/4.4.289/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.4.6.orig/init/main.c linux-4.4.6/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* -@@ -1019,7 +1021,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.9.287/startup.patch b/target/linux/patches/4.9.287/startup.patch index e54ac19a6..f9ab3f1c1 100644 --- a/target/linux/patches/4.9.287/startup.patch +++ b/target/linux/patches/4.9.287/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.4.6.orig/init/main.c linux-4.4.6/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* -@@ -1019,7 +1021,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/5.10.75/startup.patch b/target/linux/patches/5.10.75/startup.patch index 26583ff21..eef481021 100644 --- a/target/linux/patches/5.10.75/startup.patch +++ b/target/linux/patches/5.10.75/startup.patch @@ -14,15 +14,6 @@ diff -Nur linux-5.10.17.orig/init/initramfs.c linux-5.10.17/init/initramfs.c diff -Nur linux-5.10.17.orig/init/main.c linux-5.10.17/init/main.c --- linux-5.10.17.orig/init/main.c 2021-02-17 11:02:30.000000000 +0100 +++ linux-5.10.17/init/main.c 2021-02-23 13:39:32.238650450 +0100 -@@ -158,7 +158,7 @@ - #endif - - static char *execute_command; --static char *ramdisk_execute_command = "/init"; -+static char *ramdisk_execute_command = "/sbin/init"; - - /* - * Used to generate warnings if static_key manipulation functions are used @@ -1483,6 +1483,8 @@ pr_err("Warning: unable to open an initial console.\n"); return; diff --git a/target/linux/patches/5.4.155/startup.patch b/target/linux/patches/5.4.155/startup.patch index 348cded65..081aa103a 100644 --- a/target/linux/patches/5.4.155/startup.patch +++ b/target/linux/patches/5.4.155/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-5.4.147.orig/init/main.c linux-5.4.147/init/main.c (void) ksys_dup(0); (void) ksys_dup(0); /* -@@ -1206,7 +1208,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (ksys_access((const char __user *) - ramdisk_execute_command, 0) != 0) { diff --git a/target/linux/patches/6064a9bdf48cefbccc4f6472dd04251f0dec1931/startup.patch b/target/linux/patches/6064a9bdf48cefbccc4f6472dd04251f0dec1931/startup.patch index e54ac19a6..f9ab3f1c1 100644 --- a/target/linux/patches/6064a9bdf48cefbccc4f6472dd04251f0dec1931/startup.patch +++ b/target/linux/patches/6064a9bdf48cefbccc4f6472dd04251f0dec1931/startup.patch @@ -23,12 +23,3 @@ diff -Nur linux-4.4.6.orig/init/main.c linux-4.4.6/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* -@@ -1019,7 +1021,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; -- cgit v1.2.3