diff options
Diffstat (limited to 'meta-agl/recipes-devtools')
4 files changed, 6 insertions, 31 deletions
diff --git a/meta-agl/recipes-devtools/autogen/autogen-native_5.18.12.bbappend b/meta-agl/recipes-devtools/autogen/autogen-native_5.18.12.bbappend deleted file mode 100644 index a6f697cdb..000000000 --- a/meta-agl/recipes-devtools/autogen/autogen-native_5.18.12.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = "file://0003-autoopts-mk-tpl-config.sh-fix-shell-path.patch" diff --git a/meta-agl/recipes-devtools/autogen/files/0003-autoopts-mk-tpl-config.sh-fix-shell-path.patch b/meta-agl/recipes-devtools/autogen/files/0003-autoopts-mk-tpl-config.sh-fix-shell-path.patch deleted file mode 100644 index db6b0cdf8..000000000 --- a/meta-agl/recipes-devtools/autogen/files/0003-autoopts-mk-tpl-config.sh-fix-shell-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From df4f5ccc376a630b1a587a8ca3b1f35a305867dd Mon Sep 17 00:00:00 2001 -From: Robert Berger <robert.berger@ReliableEmbeddedSystems.com> -Date: Wed, 23 Aug 2017 07:19:03 +0000 -Subject: [PATCH] autoopts/mk-tpl-config.sh: fix shell path - -POSIX_SHELL as shebang doesn't work when it is longer than -BINPRM_BUF_SIZE which is 128 usually. So use "/bin/sh". - -Signed-off-by: Robert Berger <robert.berger@ReliableEmbeddedSystems.com> ---- - autoopts/mk-tpl-config.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh -index c4708a2..550870e 100755 ---- a/autoopts/mk-tpl-config.sh -+++ b/autoopts/mk-tpl-config.sh -@@ -102,7 +102,7 @@ fix_scripts() { - sed 1d $f - ;; - -- */sh ) echo '#!' ${POSIX_SHELL} -+ */sh ) echo '#!/bin/sh' - sed 1d $f - ;; - --- -2.7.4 - diff --git a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service index 61d6d4679..8f8667db6 100644 --- a/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service +++ b/meta-agl/recipes-devtools/run-agl-postinsts/run-agl-postinsts/run-agl-postinsts.service @@ -7,6 +7,7 @@ ConditionPathExists=#SYSCONFDIR#/agl-postinsts [Service] Type=oneshot +StandardOutput=journal+console ExecStart=#SBINDIR#/run-agl-postinsts ExecStartPost=#BASE_BINDIR#/systemctl disable run-agl-postinsts.service RemainAfterExit=No diff --git a/meta-agl/recipes-devtools/run-postinsts/run-postinsts_%.bbappend b/meta-agl/recipes-devtools/run-postinsts/run-postinsts_%.bbappend new file mode 100644 index 000000000..fc327b6ef --- /dev/null +++ b/meta-agl/recipes-devtools/run-postinsts/run-postinsts_%.bbappend @@ -0,0 +1,5 @@ +do_configure_append() { + if ! grep -q StandardOutput= ${WORKDIR}/run-postinsts.service; then + sed -i '/ExecStart=/iStandardOutput=journal+console' ${WORKDIR}/run-postinsts.service + fi +} |