From a20ad4f5797c66e06593e38b182bc80321b3d84bed91d216405bf389952031a2 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Fri, 15 Mar 2024 17:23:15 +0000 Subject: [PATCH] Accepting request 1158286 from home:ngueorguiev:branches:Base:System - Applied a patch (bsc#1221072) * s390-tools-sles15sp6-genprotimg-makefile.patch OBS-URL: https://build.opensuse.org/request/show/1158286 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=199 --- ...-tools-sles15sp6-genprotimg-makefile.patch | 92 +++++++++++++++++++ s390-tools.changes | 6 ++ s390-tools.spec | 1 + 3 files changed, 99 insertions(+) create mode 100644 s390-tools-sles15sp6-genprotimg-makefile.patch diff --git a/s390-tools-sles15sp6-genprotimg-makefile.patch b/s390-tools-sles15sp6-genprotimg-makefile.patch new file mode 100644 index 0000000..3d0ad08 --- /dev/null +++ b/s390-tools-sles15sp6-genprotimg-makefile.patch @@ -0,0 +1,92 @@ +From 0748d365a60477c96cb9f6a12e9dbe547d549e1f Mon Sep 17 00:00:00 2001 +From: Marc Hartmayer +Date: Tue, 12 Mar 2024 09:33:19 +0000 +Subject: [PATCH] genprotimg/**/Makefile: Fix staged installs + +Fix the support for staged installs. The Makefile variable `PKGDATADIR` +uses `DESTDIR` for all Makefile target, but actually it should only be +used for the `install*` and `uninstall*` targets. [1] Fix this by using +`DESTDIR` only for `install*` targets - uninstall* targets are not +supported by s390-tools. + +Before this change, if `DESTDIR` was set for staged installs, +`genprotimg` has tried to find the bootloader binaries at the temporary +installation path `$DESTDIR$(TOOLS_DATADIR)/genprotimg/` instead of +`$(TOOLS_DATADIR)/genprotimg`. + +[1] https://www.gnu.org/prep/standards/html_node/DESTDIR.html + +Fixes: 65b9fc442c1a ("genprotimg: introduce new tool for the creation of PV images") +Reviewed-by: Steffen Eiden +Signed-off-by: Marc Hartmayer +Signed-off-by: Steffen Eiden +--- + genprotimg/Makefile | 6 +++--- + genprotimg/boot/Makefile | 8 ++++---- + genprotimg/src/Makefile | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/genprotimg/Makefile b/genprotimg/Makefile +index 8c9f7048..6a2e37e4 100644 +--- a/genprotimg/Makefile ++++ b/genprotimg/Makefile +@@ -3,7 +3,7 @@ include ../common.mak + + .DEFAULT_GOAL := all + +-PKGDATADIR := "$(DESTDIR)$(TOOLS_DATADIR)/genprotimg" ++PKGDATADIR := "$(TOOLS_DATADIR)/genprotimg" + TESTS := + SUBDIRS := boot src man + RECURSIVE_TARGETS := all-recursive install-recursive clean-recursive +@@ -11,8 +11,8 @@ RECURSIVE_TARGETS := all-recursive install-recursive clean-recursive + all: all-recursive + + install: install-recursive +- $(INSTALL) -d -m 755 "$(PKGDATADIR)" +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 samples/check_hostkeydoc "$(PKGDATADIR)" ++ $(INSTALL) -d -m 755 "$(DESTDIR)$(PKGDATADIR)" ++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 samples/check_hostkeydoc "$(DESTDIR)$(PKGDATADIR)" + + clean: clean-recursive + +diff --git a/genprotimg/boot/Makefile b/genprotimg/boot/Makefile +index 799df9cc..73f3c9a8 100644 +--- a/genprotimg/boot/Makefile ++++ b/genprotimg/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 := $(DESTDIR)$(TOOLS_DATADIR)/genprotimg ++PKGDATADIR := $(TOOLS_DATADIR)/genprotimg + + 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 "$(PKGDATADIR)" +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin "$(PKGDATADIR)" +- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin "$(PKGDATADIR)" ++ $(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)" + + else + # Don't generate the dependency files (see `common.mak` for the +diff --git a/genprotimg/src/Makefile b/genprotimg/src/Makefile +index 08734bff..d447e6cf 100644 +--- a/genprotimg/src/Makefile ++++ b/genprotimg/src/Makefile +@@ -3,7 +3,7 @@ include ../../common.mak + + bin_PROGRAM = genprotimg + +-PKGDATADIR ?= "$(DESTDIR)$(TOOLS_DATADIR)/genprotimg" ++PKGDATADIR ?= "$(TOOLS_DATADIR)/genprotimg" + SRC_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + TOP_SRCDIR := $(SRC_DIR)/../ + ROOT_DIR = $(TOP_SRC_DIR)/../../ + diff --git a/s390-tools.changes b/s390-tools.changes index 8197716..653bb71 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 15 16:45:58 UTC 2024 - Nikolay Gueorguiev + +- Applied a patch (bsc#1221072) + * s390-tools-sles15sp6-genprotimg-makefile.patch + ------------------------------------------------------------------- Tue Mar 12 08:46:19 UTC 2024 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index a964b3f..4420c69 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -153,6 +153,7 @@ Patch910: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.p Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch Patch912: s390-tools-ALP-zdev-live.patch Patch913: s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch +Patch914: s390-tools-sles15sp6-genprotimg-makefile.patch ### BuildRequires: curl-devel