From f747ee50b2893f5226d0e1ce552b315d765505b9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 7 Nov 2023 08:12:28 +0100 Subject: mstpd: Update to 0.1.0+ The "update" to 0.05 in commit d0dbeb580f was actually a revert, since version "0.05" in reality corresponds to "0.0.5". Also do some clean up: * Unify SRC_URI. * Correct the indentation of shell code. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- meta-oe/recipes-extended/networking/mstpd_git.bb | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb index ed5669e55e..b2043ef062 100644 --- a/meta-oe/recipes-extended/networking/mstpd_git.bb +++ b/meta-oe/recipes-extended/networking/mstpd_git.bb @@ -1,15 +1,17 @@ -PV = "0.05" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4" -SRC_URI = "git://github.com/mstpd/mstpd;branch=master;protocol=https" +PV = "0.1.0+git" + +SRC_URI = " \ + git://github.com/mstpd/mstpd;branch=master;protocol=https \ + file://bridge-stp \ + file://mstpd.service \ +" SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c" S = "${WORKDIR}/git" -SRC_URI:append = " \ - file://bridge-stp \ - file://mstpd.service \ -" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+){2,})" inherit autotools pkgconfig systemd @@ -20,12 +22,12 @@ SYSTEMD_PACKAGES = "${PN}-mstpd" SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service" do_install:append() { - rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager - rmdir ${D}${libdir} || true + rm -rf ${D}${libexecdir} ${D}${libdir}/NetworkManager + rmdir ${D}${libdir} || true - install -d -m 0755 ${D}/${sbindir} - install -m 0755 ${WORKDIR}/bridge-stp ${D}/${sbindir} + 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}/ + install -d -m 0755 ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir} } -- cgit v1.2.3-54-g00ecf