3143ae25cb
- kvm-accel-kvm-check-for-KVM_CAP_READONLY_MEM-on-VM.patch [RHEL-58928] - kvm-hw-s390x-ipl-Provide-more-memory-to-the-s390-ccw.img.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Use-the-libc-from-SLOF-and-remove-s.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Link-the-netboot-code-into-the-main.patch [RHEL-58153] - kvm-redhat-Remove-the-s390-netboot.img-from-the-spec-fil.patch [RHEL-58153] - kvm-hw-s390x-Remove-the-possibility-to-load-the-s390-net.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Merge-netboot.mak-into-the-main-Mak.patch [RHEL-58153] - kvm-docs-system-s390x-bootdevices-Update-the-documentati.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Remove-panics-from-ISO-IPL-path.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Remove-panics-from-ECKD-IPL-path.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Remove-panics-from-SCSI-IPL-path.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Remove-panics-from-DASD-IPL-path.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Remove-panics-from-Netboot-IPL-path.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Enable-failed-IPL-to-return-after-e.patch [RHEL-58153] - kvm-include-hw-s390x-Add-include-files-for-common-IPL-st.patch [RHEL-58153] - kvm-s390x-Add-individual-loadparm-assignment-to-CCW-devi.patch [RHEL-58153] - kvm-hw-s390x-Build-an-IPLB-for-each-boot-device.patch [RHEL-58153] - kvm-s390x-Rebuild-IPLB-for-SCSI-device-directly-from-DIA.patch [RHEL-58153] - kvm-pc-bios-s390x-Enable-multi-device-boot-loop.patch [RHEL-58153] - kvm-docs-system-Update-documentation-for-s390x-IPL.patch [RHEL-58153] - kvm-tests-qtest-Add-s390x-boot-order-tests-to-cdrom-test.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Clarify-alignment-is-in-bytes.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Don-t-generate-TEXTRELs.patch [RHEL-58153] - kvm-pc-bios-s390-ccw-Introduce-EXTRA_LDFLAGS.patch [RHEL-58153] - kvm-vnc-fix-crash-when-no-console-attached.patch [RHEL-50529] - kvm-vfio-migration-Report-only-stop-copy-size-in-vfio_st.patch [RHEL-64308] - kvm-vfio-migration-Change-trace-formats-from-hex-to-deci.patch [RHEL-64308] - kvm-kvm-Allow-kvm_arch_get-put_registers-to-accept-Error.patch [RHEL-20574] - kvm-target-i386-kvm-Report-which-action-failed-in-kvm_ar.patch [RHEL-20574] - kvm-target-i386-cpu-set-correct-supported-XCR0-features-.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-do-not-rely-on-ExtSaveArea-for-accelerat.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-return-bool-from-x86_cpu_filter_features.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-add-AVX10-feature-and-AVX10-version-prop.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-add-CPUID.24-features-for-AVX10.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-Add-feature-dependencies-for-AVX10.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-Add-AVX512-state-when-AVX10-is-supported.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-Introduce-GraniteRapids-v2-model.patch [RHEL-30315 RHEL-45110] - kvm-target-i386-add-sha512-sm3-sm4-feature-bits.patch [RHEL-30315 RHEL-45110] - Resolves: RHEL-58928 (Boot SNP guests failed with qemu-kvm: kvm_set_user_memory_region) - Resolves: RHEL-58153 ([IBM 10.0 FEAT] KVM: Full boot order support - qemu part) - Resolves: RHEL-50529 (Qemu-kvm crashed if no display device setting and switching display by remote-viewer) - Resolves: RHEL-64308 (High threshold value observed in vGPU live migration) - Resolves: RHEL-20574 (Fail migration properly when put cpu register fails) - Resolves: RHEL-30315 ([Intel 10.0 FEAT] [GNR] Virt-QEMU: Add AVX10.1 instruction support) - Resolves: RHEL-45110 ([Intel 10.0 FEAT] [CWF][DMR] Virt-QEMU: Advertise new instructions SHA2-512NI, SM3, and SM4)
142 lines
5.2 KiB
Diff
142 lines
5.2 KiB
Diff
From 56030483f01524ee7021218e07c8d0ce1b588c62 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Fri, 21 Jun 2024 09:40:11 +0200
|
|
Subject: [PATCH 07/38] pc-bios/s390-ccw: Merge netboot.mak into the main
|
|
Makefile
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
RH-MergeRequest: 278: Full boot order support for s390x [Centos 10]
|
|
RH-Jira: RHEL-58153
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [6/23] 9ce64794a5c328673cdee6fa058088c3426efad8 (thuth/qemu-kvm-cs9)
|
|
|
|
Now that the netboot code has been merged into the main s390-ccw.img,
|
|
it also does not make sense to keep the build rules in a separate
|
|
file. Thus let's merge netboot.mak into the main Makefile.
|
|
|
|
Message-Id: <20240621082422.136217-7-thuth@redhat.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit f1fdadda36f73c9a4a96f92deb3062528cd12acc)
|
|
---
|
|
pc-bios/s390-ccw/Makefile | 47 +++++++++++++++++++++++++++++++++++-
|
|
pc-bios/s390-ccw/netboot.mak | 45 ----------------------------------
|
|
2 files changed, 46 insertions(+), 46 deletions(-)
|
|
delete mode 100644 pc-bios/s390-ccw/netboot.mak
|
|
|
|
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
|
|
index cf6859823a..27cbb354af 100644
|
|
--- a/pc-bios/s390-ccw/Makefile
|
|
+++ b/pc-bios/s390-ccw/Makefile
|
|
@@ -61,7 +61,52 @@ config-cc.mak: Makefile
|
|
$(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak
|
|
-include config-cc.mak
|
|
|
|
-include $(SRC_PATH)/netboot.mak
|
|
+# libc files:
|
|
+
|
|
+LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
|
|
+ -MMD -MP -MT $@ -MF $(@:%.o=%.d)
|
|
+
|
|
+CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
|
|
+%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
|
|
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
|
|
+ strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
|
|
+ memset.o memcpy.o memmove.o memcmp.o
|
|
+%.o : $(SLOF_DIR)/lib/libc/string/%.c
|
|
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
|
|
+%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
|
|
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
|
|
+ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
|
|
+%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
|
|
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+sbrk.o: $(SLOF_DIR)/slof/sbrk.c
|
|
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
|
|
+
|
|
+libc.a: $(LIBCOBJS)
|
|
+ $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
|
|
+
|
|
+# libnet files:
|
|
+
|
|
+LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
|
|
+ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
|
|
+LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
|
|
+ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
|
|
+
|
|
+%.o : $(SLOF_DIR)/lib/libnet/%.c
|
|
+ $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,Compiling)
|
|
+
|
|
+libnet.a: $(LIBNETOBJS)
|
|
+ $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
|
|
+
|
|
+# Main targets:
|
|
|
|
build-all: s390-ccw.img
|
|
|
|
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
|
|
deleted file mode 100644
|
|
index 0a24257ff4..0000000000
|
|
--- a/pc-bios/s390-ccw/netboot.mak
|
|
+++ /dev/null
|
|
@@ -1,45 +0,0 @@
|
|
-
|
|
-# libc files:
|
|
-
|
|
-LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
|
|
- -MMD -MP -MT $@ -MF $(@:%.o=%.d)
|
|
-
|
|
-CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
|
|
-%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
|
|
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
|
|
- strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
|
|
- memset.o memcpy.o memmove.o memcmp.o
|
|
-%.o : $(SLOF_DIR)/lib/libc/string/%.c
|
|
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
|
|
-%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
|
|
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
|
|
- printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
|
|
-%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
|
|
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-sbrk.o: $(SLOF_DIR)/slof/sbrk.c
|
|
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
|
|
-
|
|
-libc.a: $(LIBCOBJS)
|
|
- $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
|
|
-
|
|
-# libnet files:
|
|
-
|
|
-LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
|
|
- dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
|
|
-LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
|
|
- -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
|
|
-
|
|
-%.o : $(SLOF_DIR)/lib/libnet/%.c
|
|
- $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,Compiling)
|
|
-
|
|
-libnet.a: $(LIBNETOBJS)
|
|
- $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
|
|
--
|
|
2.39.3
|
|
|