X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/87236b449bd37c6c2980eeabcb105613a72c0843..HEAD:/build/package-build-dockerfiles/Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 1d8066312b..58ba04f386 100644
--- 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
@@ -44,6 +29,11 @@ ubuntu2204/generated: common-generated-all
 	test -d ubuntu2204/generated || mkdir ubuntu2204/generated
 	cp -f -rlt ubuntu2204/generated common-generated/*
 
+all: ubuntu2404/generated
+ubuntu2404/generated: common-generated-all
+	test -d ubuntu2404/generated || mkdir ubuntu2404/generated
+	cp -f -rlt ubuntu2404/generated common-generated/*
+
 GOTARBALL_=DOES_NOT_EXIST
 NODETARBALL_=DOES_NOT_EXIST
 GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}')
@@ -58,10 +48,7 @@ HOSTTYPE=$(shell echo $${HOSTTYPE})
 GOTARBALL=${GOTARBALL_$(HOSTTYPE)}
 NODETARBALL=${NODETARBALL_$(HOSTTYPE)}
 
-RVMKEY1=mpapis.asc
-RVMKEY2=pkuczynski.asc
-
-common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY1) common-generated/$(RVMKEY2)
+common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL)
 
 common-generated/$(GOTARBALL): common-generated
 	wget -cqO common-generated/$(GOTARBALL) https://dl.google.com/go/$(GOTARBALL)
@@ -69,11 +56,5 @@ common-generated/$(GOTARBALL): common-generated
 common-generated/$(NODETARBALL): common-generated
 	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
-
-common-generated/$(RVMKEY2): common-generated
-	wget -cqO common-generated/$(RVMKEY2) https://rvm.io/pkuczynski.asc
-
 common-generated:
 	mkdir common-generated