From 67ee3a57ffd12388a20cfc64584a022853f47036 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 5 Jul 2023 20:33:17 +0200 Subject: [PATCH] systemd: drop 0007-remove-broken-link-for-TAS-error.patch patch :Release Notes: The same was merged upstream in: https://git.openembedded.org/openembedded-core/commit/?h=mickledore&id=7702dc8fc6c9b34647067ffabbc0e24d6109abe7 :Detailed Notes: :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [WRP-412] Create GPVB with Yocto 4.2 Mickledore Change-Id: I6193d1cf90d3f36c897743ba52464b535b42b3f2 --- ...007-remove-broken-link-for-TAS-error.patch | 51 ------------------- .../recipes-core/systemd/systemd_%.bbappend | 4 -- 2 files changed, 55 deletions(-) delete mode 100644 meta-webos/recipes-core/systemd/systemd/0007-remove-broken-link-for-TAS-error.patch diff --git a/meta-webos/recipes-core/systemd/systemd/0007-remove-broken-link-for-TAS-error.patch b/meta-webos/recipes-core/systemd/systemd/0007-remove-broken-link-for-TAS-error.patch deleted file mode 100644 index 34d03ce2a..000000000 --- a/meta-webos/recipes-core/systemd/systemd/0007-remove-broken-link-for-TAS-error.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d721339fd089ff3152cb329133ab50acbfe329f3 Mon Sep 17 00:00:00 2001 -From: "jaekyu.lee" -Date: Wed, 14 Jun 2023 01:13:39 +0900 -Subject: [PATCH] remove broken link for TAS error - -:Release Notes: -TAS is trying to scp whole /var/log directory and fails because -/var/log/README is a broken symlink to -../../usr/share/doc/systemd/README.logs which isn't installed in our images - -:Detailed Notes: -During executing command "load_file(from_filename=/var/log, to_folder=/tmp/tmpp5d0b0qe/var, recursive=True)" the following error occurred: -Traceback (most recent call last): -File "/var/lib/tas/cw/tests_b79ffc47e4a28aede6b21bff796f1039964cb284/webos/device_shell/base_commandline.py", line 573, in _ssh_retry_policy -result = method_for_execution() -File "/var/lib/tas/cw/tests_b79ffc47e4a28aede6b21bff796f1039964cb284/webos/device_shell/base_commandline.py", line 526, in _load_file -scp_client.get(from_filename, to_folder, recursive=recursive) -File "/usr/local/lib/python3.6/dist-packages/scp.py", line 238, in get -self._recv_all() -File "/usr/local/lib/python3.6/dist-packages/scp.py", line 388, in _recv_all -raise SCPException(asunicode(msg[1:])) -scp.SCPException: scp: /var/log/README: No such file or directory - ---- -Upstream-Status: Pending - - tmpfiles.d/legacy.conf.in | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in -index 4f2c0d7c43..5f688fb1ad 100644 ---- a/tmpfiles.d/legacy.conf.in -+++ b/tmpfiles.d/legacy.conf.in -@@ -12,9 +12,11 @@ - - d /run/lock 0755 root root - - L /var/lock - - - - ../run/lock --{% if CREATE_LOG_DIRS %} --L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs --{% endif %} -+ -+# temp fix for TAS error -+#{% if CREATE_LOG_DIRS %} -+#L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs -+#{% endif %} - - # /run/lock/subsys is used for serializing SysV service execution, and - # hence without use on SysV-less systems. --- -2.40.1 - diff --git a/meta-webos/recipes-core/systemd/systemd_%.bbappend b/meta-webos/recipes-core/systemd/systemd_%.bbappend index 29b3b8610..212fca414 100644 --- a/meta-webos/recipes-core/systemd/systemd_%.bbappend +++ b/meta-webos/recipes-core/systemd/systemd_%.bbappend @@ -12,10 +12,6 @@ SRC_URI:append:webos = " \ file://0006-Change-ownership-of-media-directory-to-support-non-r.patch \ " -SRC_URI:append = " \ - file://0007-remove-broken-link-for-TAS-error.patch \ -" - inherit webos_prerelease_dep VIRTUAL-RUNTIME_bash ?= "bash"