diff options
| -rw-r--r-- | docs/HACKING.md | 6 | ||||
| -rw-r--r-- | mkosi.default.d/10-systemd.conf | 4 | ||||
| -rw-r--r-- | mkosi.default.d/arch/10-mkosi.arch | 2 | ||||
| -rw-r--r-- | mkosi.default.d/centos_epel/10-mkosi.centos_epel | 2 | ||||
| -rw-r--r-- | mkosi.default.d/debian/10-mkosi.debian | 2 | ||||
| -rw-r--r-- | mkosi.default.d/fedora/10-mkosi.fedora | 2 | ||||
| -rw-r--r-- | mkosi.default.d/opensuse/10-mkosi.opensuse | 2 | ||||
| -rw-r--r-- | mkosi.default.d/ubuntu/10-mkosi.ubuntu | 2 | ||||
| -rw-r--r-- | test/mkosi.default.networkd-test | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/docs/HACKING.md b/docs/HACKING.md index a74d0468e5..2015a40193 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -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: ``` -[Packages] +[Content] Cache=<full-path-to-package-manager-cache> # (e.g. /var/cache/dnf) ``` @@ -229,7 +229,7 @@ mkosi's config. The easiest way to set the option is to create a file 20-local.c add the following contents: ``` -[Packages] +[Content] IncludeDirectory=mkosi.includedir ``` @@ -238,7 +238,7 @@ We already configured clangd to map any paths in /usr/include in the build image 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 -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: ``` diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf index 24b85ddd0b..58b84cae98 100644 --- a/mkosi.default.d/10-systemd.conf +++ b/mkosi.default.d/10-systemd.conf @@ -9,7 +9,7 @@ HostonlyInitrd=yes # Prevent ASAN warnings when building the image Environment=ASAN_OPTIONS=verify_asan_link_order=false -[Packages] +[Content] BuildDirectory=mkosi.builddir Cache=mkosi.cache InstallDirectory=mkosi.installdir @@ -17,7 +17,7 @@ SourceFileTransferFinal=copy-git-others [Host] QemuHeadless=yes -NetworkVeth=yes +Netdev=yes QemuMem=2G [Validation] diff --git a/mkosi.default.d/arch/10-mkosi.arch b/mkosi.default.d/arch/10-mkosi.arch index 822da035d8..12f46c71c7 100644 --- a/mkosi.default.d/arch/10-mkosi.arch +++ b/mkosi.default.d/arch/10-mkosi.arch @@ -8,7 +8,7 @@ [Distribution] Distribution=arch -[Packages] +[Content] BuildPackages= acl bzip2 diff --git a/mkosi.default.d/centos_epel/10-mkosi.centos_epel b/mkosi.default.d/centos_epel/10-mkosi.centos_epel index 086fcdb555..5e726d4aef 100644 --- a/mkosi.default.d/centos_epel/10-mkosi.centos_epel +++ b/mkosi.default.d/centos_epel/10-mkosi.centos_epel @@ -10,7 +10,7 @@ Distribution=centos_epel Format=gpt_xfs HostonlyInitrd=no -[Packages] +[Content] BuildPackages= diffutils docbook-style-xsl diff --git a/mkosi.default.d/debian/10-mkosi.debian b/mkosi.default.d/debian/10-mkosi.debian index 9b77b5b832..2488eeb557 100644 --- a/mkosi.default.d/debian/10-mkosi.debian +++ b/mkosi.default.d/debian/10-mkosi.debian @@ -7,7 +7,7 @@ Distribution=debian Release=testing -[Packages] +[Content] BuildPackages= acl clang diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora index 0314a2faab..c1d8a57557 100644 --- a/mkosi.default.d/fedora/10-mkosi.fedora +++ b/mkosi.default.d/fedora/10-mkosi.fedora @@ -7,7 +7,7 @@ Distribution=fedora Release=36 -[Packages] +[Content] BuildPackages= diffutils docbook-style-xsl diff --git a/mkosi.default.d/opensuse/10-mkosi.opensuse b/mkosi.default.d/opensuse/10-mkosi.opensuse index b1ca381759..16fdecdede 100644 --- a/mkosi.default.d/opensuse/10-mkosi.opensuse +++ b/mkosi.default.d/opensuse/10-mkosi.opensuse @@ -7,7 +7,7 @@ Distribution=opensuse Release=tumbleweed -[Packages] +[Content] BuildPackages= docbook-xsl-stylesheets fdupes diff --git a/mkosi.default.d/ubuntu/10-mkosi.ubuntu b/mkosi.default.d/ubuntu/10-mkosi.ubuntu index dfb0ec0fd5..9492e791cd 100644 --- a/mkosi.default.d/ubuntu/10-mkosi.ubuntu +++ b/mkosi.default.d/ubuntu/10-mkosi.ubuntu @@ -8,7 +8,7 @@ Distribution=ubuntu Release=jammy Repositories=main,universe -[Packages] +[Content] BuildPackages= acl docbook-xml diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test index 6423417b81..ed3604ccdf 100644 --- a/test/mkosi.default.networkd-test +++ b/test/mkosi.default.networkd-test @@ -21,7 +21,7 @@ Output=networkd-test.raw [Partitions] RootSize=3G -[Packages] +[Content] BuildPackages= audit-libs-devel bzip2-devel |