From 46368556afee7a1f3a1685609942438ef2d9d6c1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 6 Jun 2024 23:00:44 +0100 Subject: [PATCH 1/2] mkosi: enable noble-backports for ubuntu Required to get the new dh-dlopenlibdeps package --- mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf | 3 +++ .../system/mkosi.conf.d/10-ubuntu/noble-backports.sources | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports.sources diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf index 86f9736ed9..25957b1e92 100644 --- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf @@ -3,6 +3,9 @@ [Match] Distribution=ubuntu +[Distribution] +PackageManagerTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources + [Content] Packages= linux-image-generic diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports.sources b/mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports.sources new file mode 100644 index 0000000000..d10c1e86b4 --- /dev/null +++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/noble-backports.sources @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +Types: deb +URIs: http://archive.ubuntu.com/ubuntu +Suites: noble-backports +Components: main universe +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg From 9f7f02bc71b72493e13bc68f323b4b346bee3ce7 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 6 Jun 2024 23:01:10 +0100 Subject: [PATCH 2/2] mkosi: update debian packaging commit id --- mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf index 964ade7325..ae014fa966 100644 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf @@ -9,7 +9,7 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=5b9607385d49c09440e6e3b35c03ceec73162aec + GIT_COMMIT=596a70511736d78c1d8a5a27dca3989806cfa733 VolatilePackages= libnss-myhostname