21361: Change variable names to match Go style

[arvados.git] / build / package-build-dockerfiles / Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index cfc8ccd358cefc67a57b83342bb4846647a3d945..be27fffab75037f4095bd5b17464b603095871db 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -4,16 +4,6 @@
 
 SHELL := '/bin/bash'
 
-all: centos7/generated
-centos7/generated: common-generated-all
-       test -d centos7/generated || mkdir centos7/generated
-       cp -f -rlt centos7/generated common-generated/*
-
-all: debian10/generated
-debian10/generated: common-generated-all
-       test -d debian10/generated || mkdir debian10/generated
-       cp -f -rlt debian10/generated common-generated/*
-
 all: debian11/generated
 debian11/generated: common-generated-all
        test -d debian11/generated || mkdir debian11/generated
@@ -29,11 +19,6 @@ rocky8/generated: common-generated-all
        test -d rocky8/generated || mkdir rocky8/generated
        cp -f -rlt rocky8/generated common-generated/*
 
-all: ubuntu1804/generated
-ubuntu1804/generated: common-generated-all
-       test -d ubuntu1804/generated || mkdir ubuntu1804/generated
-       cp -f -rlt ubuntu1804/generated common-generated/*
-
 all: ubuntu2004/generated
 ubuntu2004/generated: common-generated-all
        test -d ubuntu2004/generated || mkdir ubuntu2004/generated
@@ -48,9 +33,9 @@ GOTARBALL_=DOES_NOT_EXIST
 NODETARBALL_=DOES_NOT_EXIST
 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
+NODETARBALL_x86_64=node-v12.22.12-linux-x64.tar.xz
 GOTARBALL_aarch64=go$(GOVERSION).linux-arm64.tar.gz
-NODETARBALL_aarch64=node-v10.23.1-linux-arm64.tar.xz
+NODETARBALL_aarch64=node-v12.22.12-linux-arm64.tar.xz
 
 # Get the bash variable $HOSTTYPE (this requires the SHELL line above)
 HOSTTYPE=$(shell echo $${HOSTTYPE})
@@ -67,7 +52,7 @@ common-generated/$(GOTARBALL): common-generated
        wget -cqO common-generated/$(GOTARBALL) https://dl.google.com/go/$(GOTARBALL)
 
 common-generated/$(NODETARBALL): common-generated
-       wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v10.23.1/$(NODETARBALL)
+       wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v12.22.12/$(NODETARBALL)
 
 common-generated/$(RVMKEY1): common-generated
        wget -cqO common-generated/$(RVMKEY1) https://rvm.io/mpapis.asc