Update mkosi and debian commit references (#42474)

2026-06-04 19:10:06 +01:00
parent 7b2c004345 b0effdc1f6
commit 9e5fde9364
11 changed files with 28 additions and 18 deletions
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Config]
-MinimumVersion=commit:3e15f6734a3455a008c3617f89a6c5010d5bb9bf
+MinimumVersion=commit:60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7
 Dependencies=
        minimal-base
        minimal-0
@@ -2,15 +2,15 @@

 [TriggerMatch]
 Distribution=debian
-Release=bullseye
-Release=bookworm
-Release=trixie
+Release=|bullseye
+Release=|bookworm
+Release=|trixie

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
-Release=questing
+Release=|jammy
+Release=|noble
+Release=|questing

 [Content]
 Packages=isc-dhcp-server
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# bpftool was untangled in resolute, needs linux-tools-generic in older releases
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=|jammy
+Release=|noble
+
+[Content]
+Packages=linux-tools-generic
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=
@@ -9,5 +9,5 @@ Environment=
        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
        GIT_SUBDIR=debian
        GIT_BRANCH=debian/master
-        GIT_COMMIT=3e1930512d1efee7e11b619a5f493b3229594a51
+        GIT_COMMIT=cde07547abb088a20acd28593e6d0ee25d403b63
        PKG_SUBDIR=debian