commit 620c61da06f56520f500d7c2f3cd07a5177adcfc
author William A. Kennington III <wak@google.com> Tue Nov 08 15:40:56 2022 -0800
committer William A. Kennington III <wak@google.com> Thu Nov 10 21:41:45 2022 +0000
tree 45092f065cbce34c2b5867c4dbceb47f217fd2a6
parent 26fb25b220d9132a6c0c050e8c8bf75b0322592e

meta-google: mstpd: Fix build

Sometimes the build does not include directories we remove based on some
system non-determinism.

Change-Id: Ia1c1d66349f1aa0a1bd3ae7860ec10d10fc31b5d
Signed-off-by: William A. Kennington III <wak@google.com>

meta-google/recipes-extended/networking/mstpd_git.bb

diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb
index 309f626..faa08c5 100644
--- a/meta-google/recipes-extended/networking/mstpd_git.bb
+++ b/meta-google/recipes-extended/networking/mstpd_git.bb
@@ -19,8 +19,8 @@
 SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service"
 
 do_install:append() {
-  rm -r ${D}${libexecdir} ${D}${libdir}/NetworkManager
-  rmdir ${D}${libdir}
+  rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager
+  rmdir ${D}${libdir} || true
 
   install -d -m 0755 ${D}/sbin
   install -m 0755 ${WORKDIR}/bridge-stp ${D}/sbin