shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

mkosi: Remove usage of deprecated option names/sections

Browse Source 
(cherry picked from commit 7ca9563ca1)
This commit is contained in:
Daan De Meyer 2022-07-18 12:43:37 +02:00 committed by Luca Boccassi
parent 47404f1802
commit a38a0504ec
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/HACKING.md
View File

@ -66,7 +66,7 @@ reuse the host's package cache. To do this, create a mkosi override file in
mkosi.default.d/ (e.g 20-local.conf) and add the following contents: mkosi.default.d/ (e.g 20-local.conf) and add the following contents:
``` ```
[Packages] [Content]
Cache=<full-path-to-package-manager-cache> # (e.g. /var/cache/dnf) Cache=<full-path-to-package-manager-cache> # (e.g. /var/cache/dnf)
``` ```
@ -212,7 +212,7 @@ mkosi's config. The easiest way to set the option is to create a file 20-local.c
add the following contents: add the following contents:
``` ```
[Packages] [Content]
IncludeDirectory=mkosi.includedir IncludeDirectory=mkosi.includedir
``` ```
@ -221,7 +221,7 @@ We already configured clangd to map any paths in /usr/include in the build image
host in the mkosi-clangd.sh script. host in the mkosi-clangd.sh script.
We also need to make sure clangd is installed in the build image. To have mkosi install clangd in the build We also need to make sure clangd is installed in the build image. To have mkosi install clangd in the build
image, edit the 20-local.conf file we created earlier and add the following contents under the `[Packages]` image, edit the 20-local.conf file we created earlier and add the following contents under the `[Content]`
section: section:
``` ```

4
mkosi.default.d/10-systemd.conf
View File

@ -9,7 +9,7 @@ HostonlyInitrd=yes
# Prevent ASAN warnings when building the image # Prevent ASAN warnings when building the image
Environment=ASAN_OPTIONS=verify_asan_link_order=false Environment=ASAN_OPTIONS=verify_asan_link_order=false
[Packages] [Content]
BuildDirectory=mkosi.builddir BuildDirectory=mkosi.builddir
Cache=mkosi.cache Cache=mkosi.cache
InstallDirectory=mkosi.installdir InstallDirectory=mkosi.installdir
@ -17,7 +17,7 @@ SourceFileTransferFinal=copy-git-others
[Host] [Host]
QemuHeadless=yes QemuHeadless=yes
NetworkVeth=yes Netdev=yes
QemuMem=2G QemuMem=2G
[Validation] [Validation]

2
mkosi.default.d/arch/10-mkosi.arch
View File

@ -8,7 +8,7 @@
[Distribution] [Distribution]
Distribution=arch Distribution=arch
[Packages] [Content]
BuildPackages= BuildPackages=
acl acl
bzip2 bzip2

2
mkosi.default.d/centos_epel/10-mkosi.centos_epel
View File

@ -10,7 +10,7 @@ Distribution=centos_epel
Format=gpt_xfs Format=gpt_xfs
HostonlyInitrd=no HostonlyInitrd=no
[Packages] [Content]
BuildPackages= BuildPackages=
diffutils diffutils
docbook-style-xsl docbook-style-xsl

2
mkosi.default.d/debian/10-mkosi.debian
View File

@ -7,7 +7,7 @@
Distribution=debian Distribution=debian
Release=testing Release=testing
[Packages] [Content]
BuildPackages= BuildPackages=
acl acl
clang clang

2
mkosi.default.d/fedora/10-mkosi.fedora
View File

@ -7,7 +7,7 @@
Distribution=fedora Distribution=fedora
Release=36 Release=36
[Packages] [Content]
BuildPackages= BuildPackages=
diffutils diffutils
docbook-style-xsl docbook-style-xsl

2
mkosi.default.d/opensuse/10-mkosi.opensuse
View File

@ -7,7 +7,7 @@
Distribution=opensuse Distribution=opensuse
Release=tumbleweed Release=tumbleweed
[Packages] [Content]
BuildPackages= BuildPackages=
docbook-xsl-stylesheets docbook-xsl-stylesheets
fdupes fdupes

2
mkosi.default.d/ubuntu/10-mkosi.ubuntu
View File

@ -8,7 +8,7 @@ Distribution=ubuntu
Release=jammy Release=jammy
Repositories=main,universe Repositories=main,universe
[Packages] [Content]
BuildPackages= BuildPackages=
acl acl
docbook-xml docbook-xml

2
test/mkosi.default.networkd-test
View File

@ -21,7 +21,7 @@ Output=networkd-test.raw
[Partitions] [Partitions]
RootSize=3G RootSize=3G
[Packages] [Content]
BuildPackages= BuildPackages=
audit-libs-devel audit-libs-devel
bzip2-devel bzip2-devel