From f368071feaf782de6c0ed69475b2debdca4fe409 Mon Sep 17 00:00:00 2001 From: Patrik Olsson Date: Fri, 21 Apr 2023 10:02:50 +0200 Subject: [PATCH 1/3] Bump buildroot to 2023.02 LTS --- buildroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot b/buildroot index 9dd3bb1..8cca1e6 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 9dd3bb1963bc906c72146d9872462bf493d512ac +Subproject commit 8cca1e6de1c69a0a5e876116906bb3f6da4a5bd5 From 6f5aa246b89db6253a96ae107f83846d7abb7d49 Mon Sep 17 00:00:00 2001 From: Patrik Olsson Date: Fri, 21 Apr 2023 10:03:12 +0200 Subject: [PATCH 2/3] Remove mdio-tools from NetBox --- package/Config.in | 1 - package/mdio-tools/Config.in | 12 ------------ package/mdio-tools/mdio-tools.mk | 18 ------------------ 3 files changed, 31 deletions(-) delete mode 100644 package/mdio-tools/Config.in delete mode 100644 package/mdio-tools/mdio-tools.mk diff --git a/package/Config.in b/package/Config.in index 548b623..03107f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -4,7 +4,6 @@ source "$BR2_EXTERNAL_NETBOX_PATH/package/finit/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/libnsh/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/mcjoin/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/mdnsd/Config.in" -source "$BR2_EXTERNAL_NETBOX_PATH/package/mdio-tools/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/nemesis/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/querierd/Config.in" source "$BR2_EXTERNAL_NETBOX_PATH/package/skeleton-init-finit/Config.in" diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in deleted file mode 100644 index 0e2482e..0000000 --- a/package/mdio-tools/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_MDIO_TOOLS - bool "mdio-tools" - depends on BR2_PACKAGE_LIBMNL - help - Provides a low-level interface to MDIO buses on the - system. In contrast to similar tools, mdio-tools will - address the MDIO bus directly, without requiring a network - interface with a connection to that bus. It will also safely - perform operations that require executing multiple MDIO - accesses atomically. - - https://github.com/wkz/mdio-tools diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk deleted file mode 100644 index c73739e..0000000 --- a/package/mdio-tools/mdio-tools.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# mdio-tools -# -################################################################################ - -MDIO_TOOLS_VERSION = 1.1.1 -MDIO_TOOLS_SOURCE = mdio-tools-$(MDIO_TOOLS_VERSION).tar.gz -MDIO_TOOLS_SITE = https://github.com/wkz/mdio-tools/releases/download/$(MDIO_TOOLS_VERSION) -MDIO_TOOLS_LICENSE = GPL-2.0 -MDIO_TOOLS_LICENSE_FILES = COPYING -MDIO_TOOLS_INSTALL_STAGING = YES - -MDIO_TOOLS_MODULE_SUBDIRS = kernel -MDIO_TOOLS_MODULE_MAKE_OPTS = KDIR=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(autotools-package)) From 03acfa701d06bc619022cafe563e2fff8b4d16a5 Mon Sep 17 00:00:00 2001 From: Patrik Olsson Date: Fri, 21 Apr 2023 12:45:46 +0200 Subject: [PATCH 3/3] Remove mstpd patch from NetBox --- patches/mstpd/0.1.0/busybox-pidof.patch | 26 ------------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/mstpd/0.1.0/busybox-pidof.patch diff --git a/patches/mstpd/0.1.0/busybox-pidof.patch b/patches/mstpd/0.1.0/busybox-pidof.patch deleted file mode 100644 index 53395ad..0000000 --- a/patches/mstpd/0.1.0/busybox-pidof.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mstpd-0.1.0/bridge-stp.in.orig 2022-02-04 11:49:59.764280663 +0100 -+++ mstpd-0.1.0/bridge-stp.in 2022-02-04 11:51:00.212347703 +0100 -@@ -139,7 +139,7 @@ - fi - - # Start mstpd if necessary. -- if ! pidof -c -s mstpd >/dev/null; then -+ if ! pidof -s mstpd >/dev/null; then - if [ "$MANAGE_MSTPD" != 'y' ]; then - errmsg 'mstpd is not running' - exit 3 -@@ -212,12 +212,12 @@ - done - - # Kill mstpd, since no bridges are currently using it. -- kill $(pidof -c mstpd) -+ kill $(pidof mstpd) - ;; - restart|restart_config) - if [ "$action" = 'restart' ]; then - # Kill mstpd. -- pids="$(pidof -c mstpd)" ; Err=$? -+ pids="$(pidof mstpd)" ; Err=$? - if [ $Err -eq 0 ]; then - echo 'Stopping mstpd ...' - kill $pids