This was declared deprecated in commit 10c88f1c18b7 ("tools: Install pv
bootloaders in libexec rather than /usr/bin") in 2012Take it out fully now, 11 years later. Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: George Dunlap <george.dun...@citrix.com> CC: Jan Beulich <jbeul...@suse.com> CC: Stefano Stabellini <sstabell...@kernel.org> CC: Wei Liu <w...@xen.org> CC: Julien Grall <jul...@xen.org> --- CHANGELOG.md | 3 +++ tools/pygrub/Makefile | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ecebb9f686a..36a8ef89d8e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,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 4963bc89c6ed..d5e291ea0619 100644 --- 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 base-commit: f96e2f64576cdbb147391c7cb399d393385719a9 -- 2.30.2
