From cdd8c956123711e6752582132e1efb67b1a8880d Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 4 Jan 2022 16:38:50 -0500 Subject: [PATCH] 17417: apparently the arm64 repos have a different url on Ubuntu. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/package-build-dockerfiles/ubuntu1804/Dockerfile | 4 +++- build/package-build-dockerfiles/ubuntu1804/ports.list | 8 ++++++++ build/package-build-dockerfiles/ubuntu2004/Dockerfile | 4 +++- build/package-build-dockerfiles/ubuntu2004/ports.list | 8 ++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 build/package-build-dockerfiles/ubuntu1804/ports.list create mode 100644 build/package-build-dockerfiles/ubuntu2004/ports.list diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile index b1a85d202e..db55a33d47 100644 --- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile @@ -14,7 +14,9 @@ ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ # On x86, we want some cross-compilation support for arm64 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y gcc-aarch64-linux-gnu -# We also need libpam compiled for arm64 +# We also need libpam compiled for arm64, and that requires some sources.list mangling +ONBUILD RUN /bin/sed -i 's/deb http/deb [ arch=amd64 ] http/' /etc/apt/sources.list +ONBUILD ADD ports.list /etc/apt/sources.list.d/ ONBUILD RUN /usr/bin/dpkg --add-architecture arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediate-Configure=0 -q -y libpam0g-dev:arm64 diff --git a/build/package-build-dockerfiles/ubuntu1804/ports.list b/build/package-build-dockerfiles/ubuntu1804/ports.list new file mode 100644 index 0000000000..1947c46013 --- /dev/null +++ b/build/package-build-dockerfiles/ubuntu1804/ports.list @@ -0,0 +1,8 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile index 1de328029c..438bf878a3 100644 --- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile @@ -14,7 +14,9 @@ ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ # On x86, we want some cross-compilation support for arm64 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y gcc-aarch64-linux-gnu -# We also need libpam compiled for arm64 +# We also need libpam compiled for arm64, and that requires some sources.list mangling +ONBUILD RUN /bin/sed -i 's/deb http/deb [ arch=amd64 ] http/' /etc/apt/sources.list +ONBUILD ADD ports.list /etc/apt/sources.list.d/ ONBUILD RUN /usr/bin/dpkg --add-architecture arm64 ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediate-Configure=0 -q -y libpam0g-dev:arm64 diff --git a/build/package-build-dockerfiles/ubuntu2004/ports.list b/build/package-build-dockerfiles/ubuntu2004/ports.list new file mode 100644 index 0000000000..5feda777c5 --- /dev/null +++ b/build/package-build-dockerfiles/ubuntu2004/ports.list @@ -0,0 +1,8 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse -- 2.30.2