From 600fde6c483c75c8bdb68e6a04d181ded9ea2c8c Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:33:48 -0800 Subject: [PATCH 1/7] Update packages.pp --- modules/ocf_desktop/manifests/packages.pp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/ocf_desktop/manifests/packages.pp b/modules/ocf_desktop/manifests/packages.pp index d39cfaa07..0cef6d539 100644 --- a/modules/ocf_desktop/manifests/packages.pp +++ b/modules/ocf_desktop/manifests/packages.pp @@ -103,6 +103,23 @@ ]:; } } + if $::lsbdistcodename == 'bookworm' { + package { + [ + # OpenJDK 17 (LTS) is in bullseye + 'openjdk-17-jdk', + + # Matchbox is what we use on our RPi + 'matchbox-keyboard', + + # x4vncviewer is no longer present + 'tigervnc-viewer', + + # sshfs depends on fuse3 on bullseye + 'fuse3', + ]:; + } + } # Remove some packages package { From 2ad4078f8b5a207883ccb40550dc66b84e3b235c Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:36:56 -0800 Subject: [PATCH 2/7] Update apt.pp --- modules/ocf/manifests/apt.pp | 57 +++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp index d4e12f06e..dc291fe17 100644 --- a/modules/ocf/manifests/apt.pp +++ b/modules/ocf/manifests/apt.pp @@ -12,7 +12,62 @@ $repos = 'main contrib non-free' if $::lsbdistid == 'Debian' { - if $::operatingsystemmajrelease != '11' { + if $::operatingsystemmajrelease == '12' { + apt::source { + 'debian': + location => 'http://mirrors/debian/', + release => $::lsbdistcodename, + repos => $repos, + include => { + src => true + }; + + 'debian-updates': + location => 'http://mirrors/debian/', + release => "${::lsbdistcodename}-updates", + repos => $repos, + include => { + src => true + }; + + 'debian-security': + location => 'http://mirrors/debian-security/', + release => "${::lsbdistcodename}-security", + repos => $repos, + include => { + src => true + }; + + 'ocf': + location => 'http://apt/', + release => 'buster', + repos => 'main', + include => { + src => true + }; + + 'ocf-backports': + location => 'http://apt/', + release => 'buster-backports', + repos => 'main', + include => { + src => true + }; + } + + # Pin anything coming from *-backports to be lower than normal priority + apt::pin { 'ocf-backports': + priority => 200, + codename => "${::lsbdistcodename}-backports", + } + + # TODO: Submit patch to puppetlabs-apt to enable having includes for + # apt::backports (so that we can include the source too) + class { 'apt::backports': + location => 'http://mirrors/debian/'; + } + } + else if $::operatingsystemmajrelease != '11' { apt::source { 'debian': location => 'http://mirrors/debian/', From 4e35b5d4af5df5ff2a4c154f33765e1b05d3fa4f Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:37:56 -0800 Subject: [PATCH 3/7] Update apt.pp --- modules/ocf/manifests/packages/powershell/apt.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/packages/powershell/apt.pp b/modules/ocf/manifests/packages/powershell/apt.pp index 04bf69e85..ca672e08e 100644 --- a/modules/ocf/manifests/packages/powershell/apt.pp +++ b/modules/ocf/manifests/packages/powershell/apt.pp @@ -15,7 +15,7 @@ } else { apt::source { 'powershell': architecture => 'amd64', - location => "https://packages.microsoft.com/debian/${::operatingsystemmajrelease}/prod", + location => "https://packages.microsoft.com/debian/11/prod", release => $::lsbdistcodename, repos => 'main', require => Apt::Key['powershell repo key'], From e8b8fa5cce9d737b166585c6b5b3a49b06a5782a Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:42:55 -0800 Subject: [PATCH 4/7] Update apt.pp --- modules/ocf/manifests/apt.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp index dc291fe17..4befc8a65 100644 --- a/modules/ocf/manifests/apt.pp +++ b/modules/ocf/manifests/apt.pp @@ -67,7 +67,7 @@ location => 'http://mirrors/debian/'; } } - else if $::operatingsystemmajrelease != '11' { + elsif $::operatingsystemmajrelease != '11' { apt::source { 'debian': location => 'http://mirrors/debian/', From bcaaae030ca313caddbd864b3248480dfa8eabb3 Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:46:20 -0800 Subject: [PATCH 5/7] Update apt.pp --- modules/ocf/manifests/apt.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp index 4befc8a65..9eeb0cc85 100644 --- a/modules/ocf/manifests/apt.pp +++ b/modules/ocf/manifests/apt.pp @@ -12,7 +12,7 @@ $repos = 'main contrib non-free' if $::lsbdistid == 'Debian' { - if $::operatingsystemmajrelease == '12' { + if $::operatingsystemmajrelease == 'bookworm/sid' { apt::source { 'debian': location => 'http://mirrors/debian/', From ff89847b6d7ba87d15bb884b16b138710ee1a3d2 Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:47:39 -0800 Subject: [PATCH 6/7] Update apt.pp --- modules/ocf/manifests/apt.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp index 9eeb0cc85..36508ac54 100644 --- a/modules/ocf/manifests/apt.pp +++ b/modules/ocf/manifests/apt.pp @@ -202,7 +202,7 @@ apt::source { 'puppetlabs': location => 'http://mirrors/puppetlabs/apt/', - release => $::lsbdistcodename, + release => 'bullseye', repos => 'puppet', } From 14654276047752a8699231fa6e4cfd8af2ebda1d Mon Sep 17 00:00:00 2001 From: Jonathan Zhang Date: Sat, 8 Jan 2022 19:47:58 -0800 Subject: [PATCH 7/7] Update apt.pp --- modules/ocf/manifests/packages/powershell/apt.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ocf/manifests/packages/powershell/apt.pp b/modules/ocf/manifests/packages/powershell/apt.pp index ca672e08e..620b31085 100644 --- a/modules/ocf/manifests/packages/powershell/apt.pp +++ b/modules/ocf/manifests/packages/powershell/apt.pp @@ -16,7 +16,7 @@ apt::source { 'powershell': architecture => 'amd64', location => "https://packages.microsoft.com/debian/11/prod", - release => $::lsbdistcodename, + release => 'bullseye', repos => 'main', require => Apt::Key['powershell repo key'], }