Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apt: avoid ?exact-name for systemd packages #3343

Merged
merged 1 commit into from
Jan 13, 2025
Merged

apt: avoid ?exact-name for systemd packages #3343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Packages=
kmod # Not pulled in as a dependency on Debian/Ubuntu
dmsetup # Not pulled in as a dependency on Debian/Ubuntu

?exact-name(systemd-cryptsetup)
?exact-name(systemd-repart)
libcryptsetup12

# xfsprogs pulls in python on Debian (???) and XFS generally
Expand Down
17 changes: 17 additions & 0 deletions ...s/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-cryptsetup.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye
Release=!bookworm

[TriggerMatch]
Distribution=ubuntu
Release=!jammy
Release=!noble

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-cryptsetup
15 changes: 15 additions & 0 deletions ...urces/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-repart.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye
Release=!bookworm

[TriggerMatch]
Distribution=ubuntu

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-repart
3 changes: 0 additions & 3 deletions mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ Packages=
?exact-name(distribution-gpg-keys)
?exact-name(grub-pc-bin)
?exact-name(kali-archive-keyring)
?exact-name(systemd-boot)
?exact-name(systemd-repart)
?exact-name(systemd-ukify)
?exact-name(virtiofsd)
apt
archlinux-keyring
Expand Down
15 changes: 15 additions & 0 deletions ...i/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye

[TriggerMatch]
Distribution=ubuntu
Release=!jammy

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-boot
15 changes: 15 additions & 0 deletions ...resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/systemd-repart.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye
Release=!bookworm

[TriggerMatch]
Distribution=ubuntu

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-repart
16 changes: 16 additions & 0 deletions .../resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/systemd-ukify.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye
Release=!bookworm

[TriggerMatch]
Distribution=ubuntu
Release=!jammy

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-ukify
2 changes: 0 additions & 2 deletions ...i-vm/mkosi.conf.d/debian-kali-ubuntu.conf → ...kosi.conf.d/debian-kali-ubuntu/mkosi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Distribution=|ubuntu

[Content]
Packages=
?exact-name(systemd-boot)
?exact-name(systemd-resolved)
bash
dbus-broker
iproute2
Expand Down
15 changes: 15 additions & 0 deletions mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye

[TriggerMatch]
Distribution=ubuntu
Release=!jammy

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-boot
15 changes: 15 additions & 0 deletions mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-resolved.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later

[TriggerMatch]
Distribution=debian
Release=!bullseye

[TriggerMatch]
Distribution=ubuntu
Release=!jammy

[TriggerMatch]
Distribution=kali

[Content]
Packages=systemd-resolved