mirror of
https://github.com/systemd/systemd.git
synced 2025-02-09 13:57:42 +03:00
00bcc619db
In https://github.com/systemd/mkosi/pull/2847, the '@' specifier is removed, CLI arguments take priority over configuration files again and the "main" image is defined at the top level instead of in mkosi.images/. Additionally, not every setting from the top level configuration is inherited by the images in mkosi.images/ anymore, only settings which make sense to be inherited are inherited. This commit gets rid of all the usages of '@', moves the "main" image configuration from mkosi.images/system to the top level and gets rid of various hacks we had in place to deal with quirks of the old configuration parsing logic. We also remove usages of Images= and --append as these options are removed by the mentioned PR. (cherry picked from commit 20345a86b7157e229c1c7e3976005548bad159a4)
71 lines
1.2 KiB
Plaintext
71 lines
1.2 KiB
Plaintext
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
|
|
[Match]
|
|
Distribution=arch
|
|
|
|
[Content]
|
|
Environment=
|
|
GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
|
|
GIT_BRANCH=main
|
|
GIT_COMMIT=d74b24c7c6077740c35a876445febe6d26bf013c
|
|
|
|
VolatilePackages=
|
|
systemd
|
|
systemd-libs
|
|
systemd-resolvconf
|
|
systemd-sysvcompat
|
|
systemd-tests
|
|
systemd-ukify
|
|
|
|
Packages=
|
|
bind
|
|
bpf
|
|
compiler-rt
|
|
compsize
|
|
cryptsetup
|
|
dbus-broker
|
|
dbus-broker-units
|
|
debugedit
|
|
dhcp
|
|
f2fs-tools
|
|
fakeroot
|
|
git
|
|
gnutls
|
|
gnutls
|
|
iproute
|
|
iputils
|
|
linux
|
|
man-db
|
|
multipath-tools
|
|
open-iscsi
|
|
openbsd-netcat
|
|
openssh
|
|
openssl
|
|
pacman
|
|
perf
|
|
pkgconf
|
|
polkit
|
|
procps-ng
|
|
psmisc
|
|
python-pexpect
|
|
python-psutil
|
|
quota-tools
|
|
sbsigntools
|
|
shadow
|
|
softhsm
|
|
squashfs-tools
|
|
stress
|
|
tgt
|
|
tpm2-tools
|
|
tpm2-tss
|
|
vim
|
|
|
|
InitrdPackages=
|
|
compiler-rt
|
|
tpm2-tools
|
|
|
|
InitrdVolatilePackages=
|
|
systemd
|
|
systemd-libs
|
|
systemd-sysvcompat
|