Merging upstream version 20220525.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 141 deletions

diff --git a/ethtool/Makefile b/ethtool/Makefile
deleted file mode 100644
index 278e7e5..0000000
--- a/ethtool/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Open Infrastructure: service-tools
-
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-#
-# SPDX-License-Identifier: GPL-3.0+
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-SHELL := sh -e
-
-SCRIPTS = bin/*
-
-all: build
-
-test:
-	@echo -n "Checking for syntax errors with sh... "
-	@for SCRIPT in $(SCRIPTS); \
-	do \
-		sh -n $${SCRIPT}; \
-		echo -n "."; \
-	done
-	@echo " done."
-
-	@echo -n "Checking for bashisms... "
-	@if [ -x /usr/bin/checkbashisms ]; \
-	then \
-		for SCRIPT in $(SCRIPTS); \
-		do \
-			checkbashisms -f -x $${SCRIPT}; \
-			echo -n "."; \
-		done; \
-	else \
-		echo "Note: devscripts not installed, skipping checkbashisms."; \
-	fi
-	@echo " done."
-
-	@echo -n "Checking with shellcheck... "
-	@if [ -x /usr/bin/shellcheck ]; \
-	then \
-		for SCRIPT in $(SCRIPTS); \
-		do \
-			shellcheck -e SC2039 $${SCRIPT}; \
-			echo -n "."; \
-		done; \
-	else \
-		echo "Note: shellcheck not installed, skipping shellcheck."; \
-	fi
-	@echo " done."
-
-build:
-
-install: build
-	mkdir -p $(DESTDIR)/usr/bin
-	cp -r bin/* $(DESTDIR)/usr/bin
-
-	mkdir -p $(DESTDIR)/lib/systemd/system
-	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
-
-uninstall:
-	for FILE in share/systemd/*; \
-	do \
-		rm -f $(DESTDIR)/lib/systemd/system/$$(basename $${FILE}); \
-	done
-
-	for FILE in bin/*; \
-	do \
-		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
-	done
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
-
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
-
-clean:
-
-distclean:
-
-reinstall: uninstall install
diff --git a/ethtool/bin/ethtool-i40e b/ethtool/bin/ethtool-i40e
deleted file mode 100755
index 637ae65..0000000
--- a/ethtool/bin/ethtool-i40e
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Open Infrastructure: service-tools
-
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-#
-# SPDX-License-Identifier: GPL-3.0+
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-set -e
-
-PROGRAM="$(basename ${0})"
-DEVICES="$(grep DRIVER=i40e /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | sort -V)"
-
-if [ -z "${DEVICES}" ]
-then
-	echo "'${PROGRAM}': no network devices available with i40e driver"
-fi
-
-for DEVICE in ${DEVICES}
-do
-	echo -n "'${DEVICE}': disabling FW LLDP..."
-	ethtool --set-priv-flags ${DEVICE} disable-fw-lldp on
-	echo " done."
-done
diff --git a/ethtool/share/systemd/ethtool-i40e.service b/ethtool/share/systemd/ethtool-i40e.service
deleted file mode 100644
index e578d35..0000000
--- a/ethtool/share/systemd/ethtool-i40e.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# Open Infrastructure: service-tools
-
-[Unit]
-Description=ethtool-i40e options
-Documentation=man:ethotool-i40e
-Before=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ethtool-i40e
-StandardOutput=journal
-StandardError=journal
-
-[Install]
-WantedBy=multi-user.target