[meta-cgl][PATCH] resource-agents: Bug fix.


leimaohui
 

Fix error as the fowllowing:

resource-agents-4.5.0-r0 do_package_qa: QA Issue: lib32-resource-agents installs files in /var/volatile, but it is expected to be empty [empty-dirs]

Signed-off-by: Lei Maohui <leimaohui@...>
---
.../cluster-resource-agents/resource-agents_4.5.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index 9349ab9..1da020e 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -59,8 +59,8 @@ EXTRA_OECONF += "--disable-fatal-warnings \
--with-rsctmpdir=/var/run/heartbeat/rsctmp"

do_install:append() {
- rm -rf "${D}${localstatedir}/run"
- rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+ rm -rf ${D}${localstatedir}/run
+ rm -rf ${D}${localstatedir}
}

# tickle_tcp is published under GPLv3, we just split it into ${PN}-extra,
--
2.25.1


Jeremy Puhlman
 

Merged.

On 8/7/2022 7:22 PM, leimaohui wrote:
Fix error as the fowllowing:

resource-agents-4.5.0-r0 do_package_qa: QA Issue: lib32-resource-agents installs files in /var/volatile, but it is expected to be empty [empty-dirs]

Signed-off-by: Lei Maohui <leimaohui@...>
---
.../cluster-resource-agents/resource-agents_4.5.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index 9349ab9..1da020e 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -59,8 +59,8 @@ EXTRA_OECONF += "--disable-fatal-warnings \
--with-rsctmpdir=/var/run/heartbeat/rsctmp"
do_install:append() {
- rm -rf "${D}${localstatedir}/run"
- rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+ rm -rf ${D}${localstatedir}/run
+ rm -rf ${D}${localstatedir}
}
# tickle_tcp is published under GPLv3, we just split it into ${PN}-extra,