[ARVADOS] updated: 2.1.0-1787-ge7d6cc087

Wed Jan 5 16:22:41 UTC 2022

Summary of changes:
 build/package-build-dockerfiles/debian10/Dockerfile   | 7 +------
 build/package-build-dockerfiles/debian11/Dockerfile   | 2 +-
 build/package-build-dockerfiles/ubuntu1804/Dockerfile | 9 +--------
 build/package-build-dockerfiles/ubuntu1804/ports.list | 8 --------
 build/package-build-dockerfiles/ubuntu2004/Dockerfile | 4 ++++
 build/run-library.sh                                  | 8 +++++++-
 6 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 build/package-build-dockerfiles/ubuntu1804/ports.list

       via  e7d6cc0876cf1cb72e5eebb88723aa58e1bfab1f (commit)
      from  fe1195005c0e4e86a305f3edd2615e411db13ea1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e7d6cc0876cf1cb72e5eebb88723aa58e1bfab1f
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Jan 5 11:20:23 2022 -0500

    17417: Because of debian bug #983477, libfuse-dev for arm64 does not
           install properly beside the amd64 version. This was fixed in
           debian11. Rather than making run-library.sh even more complicated
           by switching out libfuse-dev before every arm64 cross compiled
           build, I disabled cross compilation the older Debian-based
           distributions we support.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile
index d7c31411f..efff0acc9 100644
--- a/build/package-build-dockerfiles/debian10/Dockerfile
+++ b/build/package-build-dockerfiles/debian10/Dockerfile
@@ -12,12 +12,7 @@ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 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
-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
+# No cross compilation support for debian10 because of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477
 
 FROM debian:buster as build_aarch64
 # Install go
diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index e819a28a7..54a6a0ec1 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -17,7 +17,7 @@ ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/
 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
 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
+ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediate-Configure=0 -q -y libpam0g-dev:arm64 libfuse-dev:arm64
 
 FROM debian:bullseye as build_aarch64
 # Install go
diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index db55a33d4..d37278492 100644
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -11,14 +11,7 @@ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/
 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, 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
+# No cross compilation support for ubuntu1804 because of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477
 
 FROM ubuntu:bionic as build_aarch64
 # Install go
diff --git a/build/package-build-dockerfiles/ubuntu1804/ports.list b/build/package-build-dockerfiles/ubuntu1804/ports.list
deleted file mode 100644
index 1947c4601..000000000
--- a/build/package-build-dockerfiles/ubuntu1804/ports.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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 438bf878a..58b4bc1ed 100644
--- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
@@ -19,6 +19,10 @@ ONBUILD RUN /bin/sed -i 's/deb http/deb [ arch=amd64 ] http/' /etc/apt/sources.l
 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
+# Note that cross compilation support for ubuntu2004 is disabled in
+# run-library.sh because of
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477. Hopefully
+# ubuntu2204 will have the fix introduced in debian11.
 
 FROM ubuntu:focal as build_aarch64
 # Install go
diff --git a/build/run-library.sh b/build/run-library.sh
index b6bb9ab37..9d0dffc0a 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -182,7 +182,13 @@ package_go_binary() {
     # No target architecture specified, default to native target. When on amd64 also crosscompile arm64
     # but only when building deb packages (centos does not have support for crosscompiling userspace).
     archs=($native_arch)
-    if [[ "$native_arch" == "amd64" ]] && [[ "$package_format" == "deb" ]]; then
+    if [[ "$native_arch" == "amd64" ]] &&
+       [[ "$package_format" == "deb" ]] &&
+       [[ "$TARGET" != "debian10" ]] &&
+       [[ "$TARGET" != "ubuntu1804" ]] &&
+       [[ "$TARGET" != "ubuntu2004" ]]; then
+      # Due to bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983477 the libfuse-dev package for arm64 does
+      # not install properly side by side with the amd64 version before Debian 11.
       archs+=("arm64")
     fi
     for ta in ${archs[@]}; do

-----------------------------------------------------------------------


hooks/post-receive
-- 


