fix(genesis): keep s390x metadata composable

xCAT-genesis-builder/oe/meta-xcat-genesis/conf/machine/xcat-genesis-s390x.conf

@@ -10,8 +10,6 @@ require conf/machine/include/qemu.inc
 ARCH:s390x = "s390"
 QEMU_TARGETS:append = " s390x"
 
-MACHINEOVERRIDES =. "qemus390x:"
-
 KERNEL_IMAGETYPE = "bzImage"
 SERIAL_CONSOLES = "115200;ttysclp0"
 XCAT_GENESIS_CONSOLE_TTY = "ttysclp0"

xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-core/zlib/files/0001-configure-disable-s390x-crcvx-by-default.patch

@@ -0,0 +1,26 @@
+From: xCAT Project <xcat-user@lists.sourceforge.net>
+Subject: [PATCH] configure: disable s390x CRC vector code by default
+
+The Genesis s390x baseline is z10, which lacks the vector facility.
+
+Upstream-Status: Inappropriate [xCAT Genesis targets z10]
+Signed-off-by: xCAT Project <xcat-user@lists.sourceforge.net>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 08b9e98..1ae8a98 100755
+--- a/configure
++++ b/configure
+@@ -95,7 +95,7 @@ memory=0
+ undefined=0
+ insecure=0
+ unknown=0
+-enable_crcvx=1
++enable_crcvx=0
+ old_cc="$CC"
+ old_cflags="$CFLAGS"
+ OBJC='$(OBJZ) $(OBJG)'
+--
+2.51.0

xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-core/zlib/zlib_%.bbappend

@@ -1,3 +1,3 @@
-do_configure:s390x() {
-    LDCONFIG=true ${S}/configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU --disable-crcvx
-}
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI:append:s390x = " file://0001-configure-disable-s390x-crcvx-by-default.patch"

xCAT-genesis-builder/oe/meta-xcat-genesis/recipes-extensions/images/xcat-genesis-extension-smoke.bb

@@ -7,7 +7,5 @@ inherit xcat-genesis-extension
 IMAGE_INSTALL = "xcat-genesis-extension-smoke-payload"
 
 XCAT_GENESIS_EXTENSION_NAME = "xcat-smoke"
-XCAT_GENESIS_EXTENSION_ARCHITECTURE = "x86_64"
+XCAT_GENESIS_EXTENSION_ARCHITECTURE = "${XCAT_GENESIS_ARCHITECTURE}"
 XCAT_GENESIS_EXTENSION_CAPABILITIES = '["diagnostic.smoke"]'
-
-COMPATIBLE_HOST = "x86_64.*-linux"