From 32635364aa1867e06d1a3b1deb1508e83f45af7a Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 8 Mar 2024 13:29:04 +0100 Subject: [PATCH] package/mcd: new package, replaces querierd Update all package references and confd:ietf-interfaces Signed-off-by: Joachim Wiberg --- package/Config.in | 2 +- package/mcd/Config.in | 6 ++++ .../querierd.conf => mcd/example.conf} | 5 ++-- package/mcd/mcd.hash | 2 ++ package/mcd/mcd.mk | 27 +++++++++++++++++ package/mcd/mcd.svc | 1 + package/mcd/template.svc | 3 ++ package/querierd/Config.in | 6 ---- package/querierd/querierd.hash | 2 -- package/querierd/querierd.mk | 29 ------------------- package/querierd/querierd.svc | 2 -- package/querierd/template.svc | 3 -- .../etc/finit.d/available/querierd.conf | 1 - src/confd/src/ietf-interfaces.c | 8 ++--- 14 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 package/mcd/Config.in rename package/{querierd/querierd.conf => mcd/example.conf} (92%) create mode 100644 package/mcd/mcd.hash create mode 100644 package/mcd/mcd.mk create mode 100644 package/mcd/mcd.svc create mode 100644 package/mcd/template.svc delete mode 100644 package/querierd/Config.in delete mode 100644 package/querierd/querierd.hash delete mode 100644 package/querierd/querierd.mk delete mode 100644 package/querierd/querierd.svc delete mode 100644 package/querierd/template.svc delete mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf diff --git a/package/Config.in b/package/Config.in index 978e3d56..010b10ee 100644 --- a/package/Config.in +++ b/package/Config.in @@ -15,9 +15,9 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/libsrx/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/mcd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/mdnsd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/podman/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/tetris/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/querierd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/greenpak-programmer/Config.in" diff --git a/package/mcd/Config.in b/package/mcd/Config.in new file mode 100644 index 00000000..b249f941 --- /dev/null +++ b/package/mcd/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MCD + bool "mcd" + help + A bridge helper daemon for sending multicast queries. + + https://github.com/kernelkit/mcd diff --git a/package/querierd/querierd.conf b/package/mcd/example.conf similarity index 92% rename from package/querierd/querierd.conf rename to package/mcd/example.conf index 521fad48..87575303 100644 --- a/package/querierd/querierd.conf +++ b/package/mcd/example.conf @@ -1,4 +1,4 @@ -# /etc/querierd.conf: default Infix configuration +# /etc/mcd.conf: example configuration # Query interval can be [1,1024], default 125. Recommended not go below 10 #query-interval 125 @@ -26,6 +26,7 @@ # Enable and one of the IGMP versions to use at startup, with fallback # to older versions if older clients appear. -iface vlan1 enable igmpv3 +#iface vlan1 enable igmpv3 #iface vlan2 enable igmpv3 #iface vlan3 enable igmpv3 +iface br0 enable igmpv3 diff --git a/package/mcd/mcd.hash b/package/mcd/mcd.hash new file mode 100644 index 00000000..e0c7abec --- /dev/null +++ b/package/mcd/mcd.hash @@ -0,0 +1,2 @@ +sha256 63e70c0bd457b1d198acdb8d2bbe4925140ed368c7b3971a02f6c969058c039c mcd-1.0.tar.gz +sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/package/mcd/mcd.mk b/package/mcd/mcd.mk new file mode 100644 index 00000000..0178f6d9 --- /dev/null +++ b/package/mcd/mcd.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# mcd +# +################################################################################ + +MCD_VERSION = 1.0 +MCD_SITE = https://github.com/kernelkit/mcd/releases/download/v$(MCD_VERSION) +MCD_LICENSE = BSD-3-Clause +MCD_LICENSE_FILES = LICENSE + +define MCD_INSTALL_CONFIG + $(INSTALL) -D -m 0644 $(MCD_PKGDIR)/example.conf \ + $(TARGET_DIR)/etc/mcd/example.conf +endef +MCD_POST_INSTALL_TARGET_HOOKS += MCD_INSTALL_CONFIG + +define MCD_INSTALL_FINIT_SVC + $(INSTALL) -D -m 0644 $(MCD_PKGDIR)/mcd.svc \ + $(FINIT_D)/available/mcd.conf + $(INSTALL) -D -m 0644 $(MCD_PKGDIR)/template.svc \ + $(FINIT_D)/available/mcd@.conf +endef + +MCD_POST_INSTALL_TARGET_HOOKS += MCD_INSTALL_FINIT_SVC + +$(eval $(autotools-package)) diff --git a/package/mcd/mcd.svc b/package/mcd/mcd.svc new file mode 100644 index 00000000..b09479b9 --- /dev/null +++ b/package/mcd/mcd.svc @@ -0,0 +1 @@ +service [2345789] env:-/etc/default/mcd /usr/sbin/mcd -sn $MCD_ARGS -- Multicast querier daemon diff --git a/package/mcd/template.svc b/package/mcd/template.svc new file mode 100644 index 00000000..8fdc2129 --- /dev/null +++ b/package/mcd/template.svc @@ -0,0 +1,3 @@ +service \ + [2345] mcd -sn -f /etc/mcd/%i.conf -i %i \ + -- Multicast querier daemon @%i diff --git a/package/querierd/Config.in b/package/querierd/Config.in deleted file mode 100644 index ece64269..00000000 --- a/package/querierd/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_QUERIERD - bool "querierd" - help - A bridge helper daemon for sending multicast queries. - - https://github.com/westermo/querierd diff --git a/package/querierd/querierd.hash b/package/querierd/querierd.hash deleted file mode 100644 index bf1223c2..00000000 --- a/package/querierd/querierd.hash +++ /dev/null @@ -1,2 +0,0 @@ -sha256 b425e5d9db3e87a5e4d6dd3887f4378202e07aaf2304412f5c1fb0589ab625dc querierd-0.10.tar.gz -sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29 LICENSE diff --git a/package/querierd/querierd.mk b/package/querierd/querierd.mk deleted file mode 100644 index da1f66f3..00000000 --- a/package/querierd/querierd.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# querierd -# -################################################################################ - -QUERIERD_VERSION = 0.10 -QUERIERD_SITE = \ - https://github.com/westermo/querierd/releases/download/v$(QUERIERD_VERSION) -QUERIERD_LICENSE = BSD-3-Clause -QUERIERD_LICENSE_FILES = LICENSE -QUERIERD_INSTALL_STAGING = YES - -define QUERIERD_INSTALL_CONFIG - $(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.conf \ - $(TARGET_DIR)/etc/querierd/example.conf -endef -QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_CONFIG - -define QUERIERD_INSTALL_FINIT_SVC - $(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.svc \ - $(FINIT_D)/available/querierd.conf - $(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/template.svc \ - $(FINIT_D)/available/querierd@.conf -endef - -QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_FINIT_SVC - -$(eval $(autotools-package)) diff --git a/package/querierd/querierd.svc b/package/querierd/querierd.svc deleted file mode 100644 index 5ae250b7..00000000 --- a/package/querierd/querierd.svc +++ /dev/null @@ -1,2 +0,0 @@ -# Launch IGMP querier daemon -service [2345789] env:-/etc/default/querierd /usr/sbin/querierd -sn $QUERIERD_ARGS -- IGMP querier daemon diff --git a/package/querierd/template.svc b/package/querierd/template.svc deleted file mode 100644 index 497073c4..00000000 --- a/package/querierd/template.svc +++ /dev/null @@ -1,3 +0,0 @@ -service \ - [2345] querierd -sn -f /etc/querierd/%i.conf -i %i \ - -- IGMP querier daemon @%i diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf deleted file mode 100644 index 000d3413..00000000 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf +++ /dev/null @@ -1 +0,0 @@ -service [2345] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon diff --git a/src/confd/src/ietf-interfaces.c b/src/confd/src/ietf-interfaces.c index 9717a36f..c2f788fd 100644 --- a/src/confd/src/ietf-interfaces.c +++ b/src/confd/src/ietf-interfaces.c @@ -978,12 +978,12 @@ static void mcast_querier(const char *ifname, int mode, int interval) DEBUG("mcast querier %s mode %d interval %d", ifname, mode, interval); if (!mode) { - erasef("/etc/querierd/%s.conf", ifname); - systemf("initctl -bnq disable querierd@%s", ifname); + erasef("/etc/mcd/%s.conf", ifname); + systemf("initctl -bnq disable mcd@%s", ifname); return; } - fp = fopenf("w", "/etc/querierd/%s.conf", ifname); + fp = fopenf("w", "/etc/mcd/%s.conf", ifname); if (!fp) { ERRNO("Failed creating querier configuration for %s", ifname); return; @@ -993,7 +993,7 @@ static void mcast_querier(const char *ifname, int mode, int interval) fprintf(fp, "iface %s enable %sigmpv3\n", ifname, mode == 1 ? "proxy-queries " : ""); fclose(fp); - systemf("initctl -bnq enable querierd@%s", ifname); + systemf("initctl -bnq enable mcd@%s", ifname); } static char *find_vlan_interface(sr_session_ctx_t *session, const char *brname, int vid)