diff options
| author |   ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
|---|---|---|
| committer | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
| commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
| tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/poky/meta/recipes-extended/lsb/lsbinitscripts | |
| parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) | |
agl-basesystem
Diffstat (limited to 'external/poky/meta/recipes-extended/lsb/lsbinitscripts')
2 files changed, 54 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/external/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch new file mode 100644 index 00000000..c0076453 --- /dev/null +++ b/external/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch @@ -0,0 +1,21 @@ +Upstream-Status: Pending + +Subject: functions: avoid exit 1 which causes init scripts to fail + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + rc.d/init.d/functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: initscripts-9.72/rc.d/init.d/functions +=================================================================== +--- initscripts-9.72.orig/rc.d/init.d/functions ++++ initscripts-9.72/rc.d/init.d/functions +@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then + fi + fi + +-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x ++strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true + return 0 + diff --git a/external/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/external/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch new file mode 100644 index 00000000..e912daa7 --- /dev/null +++ b/external/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -0,0 +1,33 @@ +From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 +From: Fan Xin <fan.xin@jp.fujitsu.com> +Date: Mon, 5 Jun 2017 16:26:47 +0900 +Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Rebase on 9.72 + +Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> +Upstream-Status: Pending + +--- + rc.d/init.d/functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 2e3da964..1a204dec 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions +@@ -59,7 +59,7 @@ systemctl_redirect () { + [ -z "${COLUMNS:-}" ] && COLUMNS=80 + + if [ -z "${CONSOLETYPE:-}" ]; then +- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" + else + CONSOLETYPE="serial" +-- +2.15.1 + |