[PATCH 2/2] rteval: Add make uninstall target and fix pyproject.toml license

John Kacur <[email protected]> Wed, 3 Jun 2026 16:49:53 -0400
Newsgroups org.kernel.vger.linux-rt-users
Message-ID <[email protected]>
Add uninstall target to Makefile:
- Removes rteval script from $(PREFIX)/bin
- Removes man page from share/man/man8
- Removes XSL files and load files from share/rteval
- Uninstalls Python package via pip (if installed from make install)
- Preserves /etc/rteval.conf (user may have customized)
- Respects DESTDIR variable for test installations
- Added to help target and .PHONY declarations

Fix pyproject.toml license deprecation warning:
- Change license from table format {text = "GPL-2.0-or-later"}
  to simple SPDX string "GPL-2.0-or-later"
- Fixes setuptools deprecation warning about project.license format

Add tags to .gitignore to ignore ctags files

Signed-off-by: John Kacur <[email protected]>
---
 .gitignore     |  1 +
 Makefile       | 26 +++++++++++++++++++++++++-
 pyproject.toml |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee5621e3fa3d..bd20ca2f4a71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ stamp-h1
 autom4te.cache/
 rteval-[0-9]*
 local/
+tags
diff --git a/Makefile b/Makefile
index a9d3a871f123..8b540c6c68b4 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,29 @@ rteval-$(VERSION).tar.bz2:
 	mv dist/rteval-$(VERSION).tar.bz2 .
 	rmdir dist
 
+uninstall:
+	@echo "Uninstalling rteval..."
+	# Remove the rteval script
+	rm -f $(DESTDIR)$(PREFIX)/bin/rteval
+	# Remove man page
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man8/rteval.8.gz
+	# Remove XSL files
+	rm -f $(DATADIR)/rteval/rteval_*.xsl
+	# Note: Leaving /etc/rteval.conf in place (remove manually if needed)
+	# Remove load files
+	rm -rf $(DATADIR)/rteval/loadsource
+	# Remove rteval data directory if empty
+	rmdir $(DATADIR)/rteval 2>/dev/null || true
+	# Uninstall Python package
+	@if $(PYTHON) -m pip show rteval 2>/dev/null | grep -q "Location: /usr"; then \
+		echo "Uninstalling rteval Python package..."; \
+		$(PYTHON) -m pip uninstall -y rteval; \
+	elif $(PYTHON) -m pip show rteval >/dev/null 2>&1; then \
+		echo "rteval found in pip but points to source directory (not removing)"; \
+	else \
+		echo "rteval Python package not found (may have been installed via RPM)"; \
+	fi
+
 help:
 	@echo ""
 	@echo "rteval Makefile targets:"
@@ -106,6 +129,7 @@ help:
 	@echo "        cpuset-tests:     run cpuset integration tests (requires root)"
 	@echo "        tarfile:          create the source tarball"
 	@echo "        install:          install rteval locally"
+	@echo "        uninstall:        uninstall rteval"
 	@echo "        clean:            cleanup generated files"
 	@echo "        realclean:        Same as clean plus directory run"
 	@echo "        sysreport:        do a short testrun and generate sysreport data"
@@ -121,4 +145,4 @@ tags:
 cleantags:
 	rm -f tags
 
-.PHONY: tests unit-tests e2e-tests regression-tests cpuset-tests
+.PHONY: tests unit-tests e2e-tests regression-tests cpuset-tests uninstall
diff --git a/pyproject.toml b/pyproject.toml
index 9fc681f3f91b..b981ca7d7661 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ analyzed for standard statistical measurements (i.e mode, median, range,
 mean, variance and standard deviation) and a report is generated.
 """, content-type = "text/plain"}
 requires-python = ">=3.10"
-license = {text = "GPL-2.0-or-later"}
+license = "GPL-2.0-or-later"
 dependencies = [
     "lxml",
     "requests",
-- 
2.54.0