From be0a505910901ad1d81e60259b0e33772b4a6f60 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 29 Nov 2023 07:04:18 -0600 Subject: [PATCH 1/2] (PA-5749) Add Debian 12 bookworm platforms for main Includes amd64 for PA-5553 --- configs/platforms/debian-12-aarch64.rb | 3 +++ configs/platforms/debian-12-amd64.rb | 3 +++ configs/platforms/debian-12-armhf.rb | 10 ++++++++++ 3 files changed, 16 insertions(+) create mode 100644 configs/platforms/debian-12-aarch64.rb create mode 100644 configs/platforms/debian-12-amd64.rb create mode 100644 configs/platforms/debian-12-armhf.rb diff --git a/configs/platforms/debian-12-aarch64.rb b/configs/platforms/debian-12-aarch64.rb new file mode 100644 index 0000000000..0f3c9c0ade --- /dev/null +++ b/configs/platforms/debian-12-aarch64.rb @@ -0,0 +1,3 @@ +platform "debian-12-aarch64" do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/debian-12-amd64.rb b/configs/platforms/debian-12-amd64.rb new file mode 100644 index 0000000000..dcec455c19 --- /dev/null +++ b/configs/platforms/debian-12-amd64.rb @@ -0,0 +1,3 @@ +platform "debian-12-amd64" do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/debian-12-armhf.rb b/configs/platforms/debian-12-armhf.rb new file mode 100644 index 0000000000..6df81a3e3e --- /dev/null +++ b/configs/platforms/debian-12-armhf.rb @@ -0,0 +1,10 @@ +platform "debian-12-armhf" do |plat| + plat.servicedir "/lib/systemd/system" + plat.defaultdir "/etc/default" + plat.servicetype "systemd" + plat.codename "bookworm" + + packages = ['build-essential', 'devscripts', 'rsync', 'fakeroot', 'debhelper'] + plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" + plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " +end From b08f06b9e9fed77957783bda0ead507fd73cb285 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 29 Nov 2023 12:27:10 -0600 Subject: [PATCH 2/2] (maint) remove vanagon overrides --- configs/platforms/debian-11-amd64.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configs/platforms/debian-11-amd64.rb b/configs/platforms/debian-11-amd64.rb index 158baf258b..93239246cc 100644 --- a/configs/platforms/debian-11-amd64.rb +++ b/configs/platforms/debian-11-amd64.rb @@ -1,15 +1,3 @@ platform "debian-11-amd64" do |plat| - # Delete the lines below when a vanagon with Debian 11 support is released - plat.servicedir "/lib/systemd/system" - plat.defaultdir "/etc/default" - plat.servicetype "systemd" - plat.codename "bullseye" - plat.vmpooler_template "debian-11-x86_64" - plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends " - packages = %w(build-essential devscripts debhelper rsync fakeroot) - plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}" - - # Uncomment these when a vanagon with Debian 11 support is released - # plat.inherit_from_default - # plat.clear_provisioning + plat.inherit_from_default end