X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/936ba2824bc791490f7320452c2afa7d68739ac1..7db74f672f64b3e647a98c1d8e5978b50d79538d:/build/package-build-dockerfiles/Makefile diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index 2592d8686b..416e746d20 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0 SHELL := '/bin/bash' -all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated +all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated centos7/generated: common-generated-all test -d centos7/generated || mkdir centos7/generated @@ -17,6 +17,10 @@ debian11/generated: common-generated-all test -d debian11/generated || mkdir debian11/generated cp -f -rlt debian11/generated common-generated/* +rocky8/generated: common-generated-all + test -d rocky8/generated || mkdir rocky8/generated + cp -f -rlt rocky8/generated common-generated/* + ubuntu1804/generated: common-generated-all test -d ubuntu1804/generated || mkdir ubuntu1804/generated cp -f -rlt ubuntu1804/generated common-generated/* @@ -27,9 +31,10 @@ ubuntu2004/generated: common-generated-all GOTARBALL_=DOES_NOT_EXIST NODETARBALL_=DOES_NOT_EXIST -GOTARBALL_x86_64=go1.17.1.linux-amd64.tar.gz +GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}') +GOTARBALL_x86_64=go$(GOVERSION).linux-amd64.tar.gz NODETARBALL_x86_64=node-v10.23.1-linux-x64.tar.xz -GOTARBALL_aarch64=go1.17.1.linux-arm64.tar.gz +GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz # Get the bash variable $HOSTTYPE (this requires the SHELL line above)