From 352e2fe5d3da1993cf65be86bdb743b34c95b0b0 Mon Sep 17 00:00:00 2001 From: Eduard Shishkin Date: Mon, 16 Dec 2024 13:55:52 +0100 Subject: [PATCH] zipl/src: Fix incorrect installation of zipl_helper.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dereferencing zipl.helper.md by 'make install' causes "duplicate BUILD-IDs" conflict for distro partners. Install zipl_helper.device-mapper as a regular file and all other helpers - as symlinks to the zipl_helper.device-mapper Fixes: 3296d85e351a ("zipl/src: add support of md-mirrors") Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/178 Signed-off-by: Eduard Shishkin Acked-by: Jan Höppner Signed-off-by: Jan Höppner --- zipl/src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zipl/src/Makefile b/zipl/src/Makefile index 7927974d..39489e2e 100644 --- a/zipl/src/Makefile +++ b/zipl/src/Makefile @@ -38,9 +38,10 @@ install: all $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(INSTALL) -c zipl $(DESTDIR)$(BINDIR) $(INSTALL) -c zipl-editenv $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) \ - $(DESTDIR)$(TOOLS_LIBDIR) - $(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR) + $(INSTALL) -m 755 zipl_helper.device-mapper $(DESTDIR)$(TOOLS_LIBDIR) + ln -f -s zipl_helper.device-mapper $(DESTDIR)$(TOOLS_LIBDIR)/zipl_helper.md + ln -f -s zipl_helper.device-mapper $(DESTDIR)$(TOOLS_LIBDIR)/chreipl_helper.md + ln -f -s zipl_helper.device-mapper $(DESTDIR)$(TOOLS_LIBDIR)/chreipl_helper.device-mapper clean: rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl zipl-editenv