20846: Merge branch '19213-ubuntu2204-support' into 20846-ubuntu2204

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc build/package-build-dockerfiles/Makefile
index 416e746d20e284402dbf82fc1d32df053bc0a895,9b3f772de742be06f3ee479dc7c07bed6b8275ed..ac5242bc28b5e8a919f605baca388adbb20435b9
--- 1/build/package-build-dockerfiles/Makefile
--- 2/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  # SPDX-License-Identifier: AGPL-3.0
  
  SHELL := '/bin/bash'
- all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated
 -all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated
++all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated
  
  centos7/generated: common-generated-all
        test -d centos7/generated || mkdir centos7/generated

diff --cc build/package-test-dockerfiles/Makefile
index 96a80055ac9a84e5256e5bba65a93dac3c4a48f0,2164c7246e751b39150b5ce0fa6a5e276022ad9b..8b04fb14801b65ec1d006180998fb0e4e344ff29
--- 1/build/package-test-dockerfiles/Makefile
--- 2/build/package-test-dockerfiles/Makefile
+++ b/build/package-test-dockerfiles/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  #
  # SPDX-License-Identifier: AGPL-3.0
  
- all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated
 -all: centos7/generated debian10/generated debian11/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated
++all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated
  
  centos7/generated: common-generated-all
        test -d centos7/generated || mkdir centos7/generated