diff --git a/Dockerfile b/Dockerfile index 920b6e3ae..03475b8b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN KEYFILE=/usr/share/keyrings/criu-repo-keyring.gpg; \ crossbuild-essential-armel \ crossbuild-essential-armhf \ crossbuild-essential-ppc64el \ + crossbuild-essential-s390x \ curl \ gawk \ gcc \ @@ -54,7 +55,7 @@ RUN cd /tmp \ ARG LIBSECCOMP_VERSION COPY script/* /tmp/script/ RUN mkdir -p /opt/libseccomp \ - && /tmp/script/seccomp.sh "$LIBSECCOMP_VERSION" /opt/libseccomp arm64 armel armhf ppc64le + && /tmp/script/seccomp.sh "$LIBSECCOMP_VERSION" /opt/libseccomp arm64 armel armhf ppc64le s390x ENV LIBSECCOMP_VERSION=$LIBSECCOMP_VERSION ENV LD_LIBRARY_PATH=/opt/libseccomp/lib ENV PKG_CONFIG_PATH=/opt/libseccomp/lib/pkgconfig diff --git a/Makefile b/Makefile index 4c68ac651..aeb62f8c3 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ recvtty sd-helper seccompagent: static: $(GO_BUILD_STATIC) -o runc . -releaseall: RELEASE_ARGS := "-a arm64 -a armel -a armhf -a ppc64le" +releaseall: RELEASE_ARGS := "-a arm64 -a armel -a armhf -a ppc64le -a s390x" releaseall: release release: runcimage diff --git a/script/lib.sh b/script/lib.sh index 4000d2a94..9afa0b4cb 100644 --- a/script/lib.sh +++ b/script/lib.sh @@ -23,6 +23,9 @@ function set_cross_vars() { ppc64le) HOST=powerpc64le-linux-gnu ;; + s390x) + HOST=s390x-linux-gnu + ;; *) echo "set_cross_vars: unsupported architecture: $1" >&2 exit 1