From f4fec5f1205cfd9e07f9871a1787d101dcab3aa4 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Fri, 25 Jul 2025 09:49:20 +0200 Subject: [PATCH] rust/pvimg/boot: Use 'PVIMG_PKGDATADIR' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use 'PVIMG_PKGDATADIR' as it is used by the 'pvimg_pkg_data' macro rule. The problem only shows up if someone changes 'PVIMG_PKGDATADIR' to something different than the default. Fixes: f4cf4ae6ebb1 ("rust: Add a new tool called 'pvimg'") Reviewed-by: Jan Höppner Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- rust/pvimg/boot/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/pvimg/boot/Makefile b/rust/pvimg/boot/Makefile index 88b858fd..1bff4f83 100644 --- a/rust/pvimg/boot/Makefile +++ b/rust/pvimg/boot/Makefile @@ -7,7 +7,7 @@ DEBUG_FILES := $(addsuffix .debug,$(FILES)) ifeq ($(HOST_ARCH),s390x) ZIPL_DIR := $(rootdir)/zipl ZIPL_BOOT_DIR := $(ZIPL_DIR)/boot -PKGDATADIR := $(TOOLS_DATADIR)/pvimg +PVIMG_PKGDATADIR ?= $(TOOLS_DATADIR)/pvimg INCLUDE_PATHS := $(ZIPL_BOOT_DIR) $(ZIPL_DIR)/include $(rootdir)/include INCLUDE_PARMS := $(addprefix -I,$(INCLUDE_PATHS)) @@ -86,9 +86,9 @@ stage3b.elf: head.o $(ZIPL_OBJS) @chmod a-x $@ install: stage3a.bin stage3b_reloc.bin - $(INSTALL) -d -m 755 $(DESTDIR)$(PKGDATADIR) - $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin $(DESTDIR)$(PKGDATADIR) - $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin $(DESTDIR)$(PKGDATADIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(PVIMG_PKGDATADIR) + $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin $(DESTDIR)$(PVIMG_PKGDATADIR) + $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin $(DESTDIR)$(PVIMG_PKGDATADIR) else # Don't generate the dependency files (see `common.mak` for the