From 2d2fcf8e83870114fe6ee20746aac362927d92aa Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 4 Jan 2022 20:11:43 -0500 Subject: [PATCH] 17417: fix bug to enable arm64 cross-compilation on amd64 for our go packages. Also make sure package testing works (at least for amd64). Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/run-build-packages-one-target.sh | 2 +- build/run-library.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index f208963832..0c474d00fd 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -170,7 +170,7 @@ if [[ -n "$test_packages" ]]; then fi set -e (cd $WORKSPACE/packages/$TARGET - dpkg-scanpackages . 2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz + dpkg-scanpackages --multiversion . 2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz apt-ftparchive -o APT::FTPArchive::Release::Origin=Arvados release . > Release ) fi diff --git a/build/run-library.sh b/build/run-library.sh index ed3211c2a1..3434f1ae89 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -183,12 +183,12 @@ package_go_binary() { # 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 - archs=('amd64' 'arm64') + archs+=("arm64") fi - for ta in $archs; do + for ta in ${archs[@]}; do package_go_binary_worker "$src_path" "$prog" "$package_format" "$description" "$native_arch" "$ta" "$license_file" retval=$? - if [[ "$retval" != 0 ]]; then + if [[ $retval -ne 0 ]]; then return $retval fi done @@ -216,8 +216,8 @@ package_go_binary_worker() { cd $WORKSPACE/packages/$TARGET test_package_presence "$prog" "$go_package_version" "go" "" "$target_arch" - if [[ "$?" != "0" ]]; then - return 1 + if [[ $? -ne 0 ]]; then + return 0 fi echo "Building $package_format ($target_arch) package for $prog from $src_path" -- 2.30.2