From 7dc15c28f8468a6d3453b20e8f64442cbc5da93a Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Mon, 24 Jun 2019 15:51:01 +0800 Subject: [PATCH 1/2] rootfs-builder: exclude unsupported archs from clearlinux For clearlinux, for now, it is only designed for amd64. Fixes: #320 Signed-off-by: Penny Zheng --- rootfs-builder/clearlinux/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs-builder/clearlinux/config.sh b/rootfs-builder/clearlinux/config.sh index 25da8e030f..7b3b954268 100644 --- a/rootfs-builder/clearlinux/config.sh +++ b/rootfs-builder/clearlinux/config.sh @@ -26,6 +26,6 @@ PACKAGES="util-linux-bin iptables-bin libudev0-shim chrony" INIT_PROCESS=systemd # List of zero or more architectures to exclude from build, # as reported by `uname -m` -ARCH_EXCLUDE_LIST=(ppc64le) +ARCH_EXCLUDE_LIST=( aarch64 ppc64le s390x ) [ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true From 5a5ffa4493962552fff3c2701095a3a77c4ca04e Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Mon, 24 Jun 2019 16:01:40 +0800 Subject: [PATCH 2/2] rootfs-builder: exclude unsupported archs from euleros For euleros, it has supported aarch64 starting from v2.3, but here is the sad part, there existed bugs in their 2.3.x image, this bug existed in both x86_64 and aarch64 image. related issue euleros/euleros-docker-images/#13 (https://github.com/euleros/euleros-docker-images/issues/13) has been raised. Fixes: #320 Signed-off-by: Penny Zheng --- rootfs-builder/euleros/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs-builder/euleros/config.sh b/rootfs-builder/euleros/config.sh index 3d5762fb3a..d522e844b3 100644 --- a/rootfs-builder/euleros/config.sh +++ b/rootfs-builder/euleros/config.sh @@ -21,7 +21,7 @@ PACKAGES="iptables chrony" INIT_PROCESS=systemd # List of zero or more architectures to exclude from build, # as reported by `uname -m` -ARCH_EXCLUDE_LIST=() +ARCH_EXCLUDE_LIST=( aarch64 ppc64le s390x ) # Allow the build to fail without generating an error. # For more info see: https://github.com/kata-containers/osbuilder/issues/190 BUILD_CAN_FAIL=1