mstpd: update to ${sbindir} because of usrmerge
Signed-off-by: Harvey Wu <Harvey.Wu@quantatw.com>
Change-Id: I2dffda1e08e8c536a7f9b27a936dcebb4674deb7
diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb
index faa08c5..923197b 100644
--- a/meta-google/recipes-extended/networking/mstpd_git.bb
+++ b/meta-google/recipes-extended/networking/mstpd_git.bb
@@ -13,7 +13,7 @@
inherit autotools pkgconfig systemd
PACKAGES =+ "${PN}-mstpd"
-FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl /sbin/bridge-stp"
+FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl ${sbindir}/bridge-stp"
SYSTEMD_PACKAGES = "${PN}-mstpd"
SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service"
@@ -22,8 +22,8 @@
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
+ install -d -m 0755 ${D}/${sbindir}
+ install -m 0755 ${WORKDIR}/bridge-stp ${D}/${sbindir}
install -d -m 0755 ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir}/