From d4e2075c00eb1ad8d56ef8f3d145263d7e6e33b8 Mon Sep 17 00:00:00 2001 From: Harvey Wu Date: Thu, 20 Jul 2023 09:23:44 +0800 Subject: mstpd: update to ${sbindir} because of usrmerge Signed-off-by: Harvey Wu Change-Id: I2dffda1e08e8c536a7f9b27a936dcebb4674deb7 --- meta-google/recipes-extended/networking/mstpd_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-google') diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb index faa08c549c..923197b25f 100644 --- a/meta-google/recipes-extended/networking/mstpd_git.bb +++ b/meta-google/recipes-extended/networking/mstpd_git.bb @@ -13,7 +13,7 @@ SRC_URI += "file://mstpd.service" 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 @@ do_install:append() { 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}/ -- cgit v1.2.3