Skip to contentSkip to conversation

layer.conf: add langdale to LAYERSERIES_COMPAT

PATCH In review Yi Zhao 2 participants 3 messages Oct 2, 2022 – Oct 3, 2022

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/2 layer.conf: add langdale to LAYERSERIES_COMPAT

---
 meta-cgl-common/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/conf/layer.conf +1 -1
index 2e21879..865ed9f 100644
@@ -11,6 +11,6 @@ BBFILE_PRIORITY_cgl-common = "7"
 
 LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux"
 
-LAYERSERIES_COMPAT_cgl-common = "honister kirkstone"
+LAYERSERIES_COMPAT_cgl-common = "honister kirkstone langdale"
 
 require conf/distro/include/cgl_common_security_flags.inc
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 resource-agents: set correct path of rm command in ldirectord.service

Fix buildpaths warning:
WARNING: resource-agents-4.5.0-r0 do_package_qa: QA Issue: File /lib/systemd/system/ldirectord.service in package ldirectord contains reference to TMPDIR [buildpaths]

---
 ...ce.in-set-correct-path-of-rm-command.patch | 28 +++++++++++++++++++
 .../resource-agents_4.5.0.bb                  |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-set-correct-path-of-rm-command.patch
meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-set-correct-path-of-rm-command.patch new file +28 -0
new file mode 100644
index 0000000..d53faea
@@ -0,0 +1,28 @@
+From d34c5d8611d084db9cb7169e3628f3f752618cc7 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Sun, 2 Oct 2022 21:08:34 +0800
+Subject: [PATCH] ldirectord.service.in: set correct path of rm command
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ ldirectord/systemd/ldirectord.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in
+index 7965b79fb..bb476cf5d 100644
+--- a/ldirectord/systemd/ldirectord.service.in
++++ b/ldirectord/systemd/ldirectord.service.in
+@@ -6,7 +6,7 @@ Documentation=man:ldirectord(8)
+ ExecStart=@sbindir@/ldirectord start
+ ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord
+ ExecStop=@sbindir@/ldirectord stop
+-ExecStopPost=@RM@ -f /var/lock/subsys/ldirectord
++ExecStopPost=/bin/rm -f /var/lock/subsys/ldirectord
+ ExecReload=@sbindir@/ldirectord reload
+ PIDFile=/run/ldirectord.ldirectord.pid
+ Type=forking
+-- 
+2.25.1
+
meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb +1 -0
index 1da020e..764a1d2 100644
@@ -20,6 +20,7 @@ SRC_URI = "git://github.com/ClusterLabs/resource-agents;branch=main;protocol=htt
            file://03-fix-header-defs-lookup.patch \
            file://fix-install-sh-not-found.patch \
            file://0001-ldirectord.service.in-use-run-instead-of-var-run.patch \
+           file://0001-ldirectord.service.in-set-correct-path-of-rm-command.patch \
           "
 
 SRCREV = "fee181320547365d7f8c88cca2b32801412b933d" 
Signature · 1 line
2.25.1
#2 lore raw
In reply to Yi Zhao

Merged.

Quoted 17 lines · Yi Zhao
---
  meta-cgl-common/conf/layer.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/conf/layer.conf +1 -1
index 2e21879..865ed9f 100644
@@ -11,6 +11,6 @@ BBFILE_PRIORITY_cgl-common = "7"
 
  LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux"
 
-LAYERSERIES_COMPAT_cgl-common = "honister kirkstone"
+LAYERSERIES_COMPAT_cgl-common = "honister kirkstone langdale"
 
  require conf/distro/include/cgl_common_security_flags.inc