tools/pygrub: Drop compatibility symlink

This was deprecated in commit 10c88f1c18b7 ("tools: Install pv bootloaders in
libexec rather than /usr/bin") and caused to warn in commit c31d6a7ee2ea
("libxl: Warn that /usr/bin/pygrub is deprecated"), both in 2012.

New versions of RPM warn against absolute symlinks, so take out fully, 11
years later.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee5d41fc93370b457a1e811f8f53f98e1942832..723d06425431cd73fb37681ad38c6a618cd6d93a 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 - caml-stubdom.  It hasn't built since 2014, was pinned to Ocaml 4.02, and has
   been superseded by the MirageOS/SOLO5 projects.
+- /usr/bin/pygrub symlink.  This was deprecated in Xen 4.2 (2012) but left for
+  compatibility reasons.  VMs configured with bootloader="/usr/bin/pygrub"
+  should be updated to just bootloader="pygrub".
 
 ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16
 

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 4963bc89c6ed4fdbe498fbbf3d75e34d03544d0a..d5e291ea061905b250623503fbce1bcd1f120727 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -22,15 +22,9 @@ install: all
        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
                --root="$(DESTDIR)" --force
        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-       set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
-                    "`readlink -f $(DESTDIR)/$(bindir)`" != \
-                    "`readlink -f $(LIBEXEC_BIN)`" ]; then \
-           ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(bindir); \
-       fi
 
 .PHONY: uninstall
 uninstall:
-       rm -f $(DESTDIR)/$(bindir)/pygrub
        if [ -e $(INSTALL_LOG) ]; then \
                cat $(INSTALL_LOG) | xargs -i rm -f $(DESTDIR)/{}; \
        fi