On Mon, Dec 09, 2024 at 08:59 AM +0100, "Nico Boehr" <nrb@xxxxxxxxxxxxx> wrote: > On Thu Dec 5, 2024 at 5:00 PM CET, Marc Hartmayer wrote: > [...] >> diff --git a/s390x/Makefile b/s390x/Makefile >> index 23342bd64f44..3da3bebb6775 100644 >> --- a/s390x/Makefile >> +++ b/s390x/Makefile >> @@ -197,17 +197,26 @@ $(comm-key): >> %.bin: %.elf >> $(OBJCOPY) -O binary $< $@ >> >> +define test_genprotimg_opt >> +$(shell $(GENPROTIMG) --help | grep -q -- "$1" && echo yes || echo no) >> +endef >> + >> +GENPROTIMG_DEFAULT_ARGS := --no-verify >> +ifneq ($(HOST_KEY_DOCUMENT),) >> # The genprotimg arguments for the cck changed over time so we need to >> # figure out which argument to use in order to set the cck >> -ifneq ($(HOST_KEY_DOCUMENT),) >> -GENPROTIMG_HAS_COMM_KEY = $(shell $(GENPROTIMG) --help | grep -q -- --comm-key && echo yes) >> -ifeq ($(GENPROTIMG_HAS_COMM_KEY),yes) >> +ifeq ($(call test_genprotimg_opt,--comm-key),yes) >> GENPROTIMG_COMM_OPTION := --comm-key >> else >> GENPROTIMG_COMM_OPTION := --x-comm-key >> endif >> -else >> -GENPROTIMG_HAS_COMM_KEY = >> +# Newer version of the genprotimg command checks if the given image/kernel is a > > After having my first cup of coffee, one question: at which version > did this behaviour change? 2.36.0 (https://github.com/ibm-s390-linux/s390-tools/commit/0cd063e40d12d7ca5bc59a09b2ee4803653678bd) -- Kind regards / Beste Grüße Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
