From d721eb018973842a432869f6f9efd5752b2e7f19 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Mon, 19 Dec 2022 09:51:51 +0000 Subject: [PATCH 1/2] zgetdump/Makefile: don't use `.check_dep_zgetdump` as linker input The `.check_dep_zgetdump` file is used to cache the result of the dependency checks and should not be used as input for linking or anything else. Let's add it as dependency for the objects file. This shouldn't cause any problems since the Makefile rule for object files is defined in `common.mak` as follows: %.o: %.c $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@ Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/147 Fixes: 8d8d5e9746a4 ("zdump: Fix Makefile dependencies") Signed-off-by: Marc Hartmayer Reviewed-by: Jan Hoeppner Signed-off-by: Jan Hoeppner --- zdump/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zdump/Makefile b/zdump/Makefile index ca8aadc..934dc47 100644 --- a/zdump/Makefile +++ b/zdump/Makefile @@ -119,7 +119,9 @@ libs = $(rootdir)/libutil/libutil.a $(LIBPV) all: $(BUILD_TARGETS) -zgetdump: .check_dep_zgetdump $(OBJECTS) $(libs) +$(OBJECTS): .check_dep_zgetdump + +zgetdump: $(OBJECTS) $(libs) skip-zgetdump: echo " SKIP zgetdump due to unresolved dependencies" -- 2.39.1 From d9f54f76e2e6f17e0b5bafdc0d09ff0e72edd474 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Fri, 20 Jan 2023 11:04:18 +0100 Subject: [PATCH 2/2] zkey: Support EP11 host library version 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Try to load libep11.so.4 if available, but fallback to older library versions if not. Reviewed-by: Jörg Schmidbauer Signed-off-by: Ingo Franzki Signed-off-by: Steffen Eiden --- zkey/ep11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zkey/ep11.c b/zkey/ep11.c index 58dc3c5..8359929 100644 --- a/zkey/ep11.c +++ b/zkey/ep11.c @@ -35,7 +35,7 @@ * Definitions for the EP11 library */ #define EP11_LIBRARY_NAME "libep11.so" -#define EP11_LIBRARY_VERSION 3 +#define EP11_LIBRARY_VERSION 4 #define EP11_WEB_PAGE "http://www.ibm.com/security/cryptocards" /** -- 2.39.1