diff mbox series

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

Message ID 1659925360-4365-1-git-send-email-leimaohui@fujitsu.com
State New
Headers show
Series [meta-cgl] resource-agents: Bug fix. | expand

Commit Message

Maohui Lei (Fujitsu) Aug. 8, 2022, 2:22 a.m. UTC
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@fujitsu.com>
---
 .../cluster-resource-agents/resource-agents_4.5.0.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jeremy Puhlman Aug. 11, 2022, 9:15 p.m. UTC | #1
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@fujitsu.com>
> ---
>   .../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,
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#57792): https://lists.yoctoproject.org/g/yocto/message/57792
> Mute This Topic: https://lists.yoctoproject.org/mt/92884749/2167262
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [jpuhlman@mvista.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

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 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,