[meta-cgl] resource-agents: Fix QA Issue:

Message ID 1637666429-4258-1-git-send-email-leimaohui@fujitsu.com
State New
Headers show
Series [meta-cgl] resource-agents: Fix QA Issue: | expand

Commit Message

Maohui Lei (Fujitsu) Nov. 23, 2021, 11:20 a.m. UTC
ERROR: resource-agents-4.5.0-r0 do_package_qa: QA Issue: resource-agents installs files in /var/volatile, but it is expected to be empty [empty-dirs]

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

Comments

Maohui Lei (Fujitsu) Dec. 13, 2021, 2:53 a.m. UTC | #1
ping

> -----Original Message-----
> From: Lei, Maohui <leimaohui@fujitsu.com>
> Sent: Tuesday, November 23, 2021 7:20 PM
> To: yocto@lists.yoctoproject.org
> Cc: Lei, Maohui <leimaohui@fujitsu.com>
> Subject: [yocto] [meta-cgl][PATCH] resource-agents: Fix QA Issue:
> 
> ERROR: resource-agents-4.5.0-r0 do_package_qa: QA Issue: resource-agents
> installs files in /var/volatile, but it is expected to be empty [empty-dirs]
> 
> Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
> ---
>  .../cluster-resource-agents/resource-agents_4.5.0.bb           | 3 +--
>  1 file changed, 1 insertion(+), 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 261681c..d6fb708 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
> @@ -57,8 +57,7 @@ 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}"
>  }
> 
>  # tickle_tcp is published under GPLv3, we just split it into ${PN}-extra,
> --
> 2.25.1

Patch

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 261681c..d6fb708 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
@@ -57,8 +57,7 @@  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}"
 }
 
 # tickle_tcp is published under GPLv3, we just split it into ${PN}-extra,