From af6c5c7025e2b4059ae38026a4bdffca4ff36b79 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 6 Apr 2023 21:41:14 +0200 Subject: mkosi: Update to latest This also migrates the configuration to the new format that was just merged in mkosi. Specifically, we make use of the new [Match] sections to only include specific config snippets per distro. --- mkosi.conf.d/10-systemd.conf | 4 +- mkosi.conf.d/20-arch.conf | 48 +++++++++ mkosi.conf.d/20-centos.conf | 93 +++++++++++++++++ mkosi.conf.d/20-debian.conf | 96 ++++++++++++++++++ mkosi.conf.d/20-fedora.conf | 97 ++++++++++++++++++ mkosi.conf.d/20-opensuse.conf | 110 ++++++++++++++++++++ mkosi.conf.d/20-ubuntu.conf | 97 ++++++++++++++++++ mkosi.conf.d/21-centos-8/mkosi.conf | 19 ++++ .../21-centos-8/mkosi.reposdir/powertools.repo | 10 ++ mkosi.conf.d/21-centos-9.conf | 18 ++++ mkosi.conf.d/arch/10-arch.conf | 51 ---------- mkosi.conf.d/centos/10-centos.conf | 108 -------------------- mkosi.conf.d/centos/mkosi.reposdir/powertools.repo | 8 -- mkosi.conf.d/debian/10-debian.conf | 97 ------------------ mkosi.conf.d/fedora/10-fedora.conf | 98 ------------------ mkosi.conf.d/opensuse/10-opensuse.conf | 111 --------------------- mkosi.conf.d/ubuntu/10-ubuntu.conf | 98 ------------------ 17 files changed, 589 insertions(+), 574 deletions(-) create mode 100644 mkosi.conf.d/20-arch.conf create mode 100644 mkosi.conf.d/20-centos.conf create mode 100644 mkosi.conf.d/20-debian.conf create mode 100644 mkosi.conf.d/20-fedora.conf create mode 100644 mkosi.conf.d/20-opensuse.conf create mode 100644 mkosi.conf.d/20-ubuntu.conf create mode 100644 mkosi.conf.d/21-centos-8/mkosi.conf create mode 100644 mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo create mode 100644 mkosi.conf.d/21-centos-9.conf delete mode 100644 mkosi.conf.d/arch/10-arch.conf delete mode 100644 mkosi.conf.d/centos/10-centos.conf delete mode 100644 mkosi.conf.d/centos/mkosi.reposdir/powertools.repo delete mode 100644 mkosi.conf.d/debian/10-debian.conf delete mode 100644 mkosi.conf.d/fedora/10-fedora.conf delete mode 100644 mkosi.conf.d/opensuse/10-opensuse.conf delete mode 100644 mkosi.conf.d/ubuntu/10-ubuntu.conf (limited to 'mkosi.conf.d') diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index bbb3544f1f..2c7eb63e71 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -1,7 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). - [Output] Bootable=yes # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_. @@ -12,7 +10,7 @@ OutputDirectory=mkosi.output [Content] BuildDirectory=mkosi.builddir -Cache=mkosi.cache +CacheDirectory=mkosi.cache ExtraTrees=src:/root/src Packages= acl diff --git a/mkosi.conf.d/20-arch.conf b/mkosi.conf.d/20-arch.conf new file mode 100644 index 0000000000..c926c88c1a --- /dev/null +++ b/mkosi.conf.d/20-arch.conf @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Copyright © 2016 Zeal Jagannatha + +[Match] +Distribution=arch + +[Content] +Packages= + alsa-lib + btrfs-progs + compsize + dhcp + f2fs-tools + fuse2 + gnutls + iproute + libbpf + libcap-ng + libfido2 + libmicrohttpd + libmnl + libpwquality + libxkbcommon + man-db + numactl + openbsd-netcat + polkit + popt + python-pefile + python-psutil + python-pytest + quota-tools + shadow + tpm2-tss + vim + +BuildPackages= + bpf + docbook-xsl + libxslt + linux-api-headers + pahole + perl + python-docutils + python-jinja + python-lxml + python-pyelftools diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf new file mode 100644 index 0000000000..09b7973195 --- /dev/null +++ b/mkosi.conf.d/20-centos.conf @@ -0,0 +1,93 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=centos + +[Distribution] +Repositories=epel + +[Content] +Packages= + alsa-lib + audit + cryptsetup + dhcp-server + dnf + fuse + glib2 + glibc-minimal-langpack + glibc.i686 + gnutls + iproute + iproute-tc + kernel-modules-extra + libasan + libbpf + libcap-ng + libcap-ng-utils + libfido2 + libmicrohttpd + libmnl + libubsan + libxcrypt + libxkbcommon + netcat + numactl-libs + p11-kit + pam + passwd + polkit + popt + procps-ng + python3-docutils + quota + tpm2-tss + vim-common + +BuildPackages= + bpftool + docbook-xsl + dwarves + glibc-devel.i686 + glibc-static + glibc-static.i686 + libxslt + pam-devel + perl-interpreter + pkgconfig(alsa) + pkgconfig(audit) + pkgconfig(blkid) + pkgconfig(bzip2) + pkgconfig(dbus-1) + pkgconfig(fdisk) + pkgconfig(fuse) + pkgconfig(glib-2.0) + pkgconfig(gnutls) + pkgconfig(libacl) + pkgconfig(libbpf) + pkgconfig(libcap-ng) + pkgconfig(libcap) + pkgconfig(libcryptsetup) + pkgconfig(libcurl) + pkgconfig(libdw) + pkgconfig(libfido2) + pkgconfig(libidn2) + pkgconfig(libkmod) + pkgconfig(libmicrohttpd) + pkgconfig(libmnl) + pkgconfig(libpcre2-8) + pkgconfig(libqrencode) + pkgconfig(libseccomp) + pkgconfig(libselinux) + pkgconfig(libzstd) + pkgconfig(mount) + pkgconfig(numa) + pkgconfig(openssl) + pkgconfig(p11-kit-1) + pkgconfig(popt) + pkgconfig(pwquality) + pkgconfig(tss2-esys) + pkgconfig(tss2-mu) + pkgconfig(tss2-rc) + pkgconfig(valgrind) + pkgconfig(xkbcommon) diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf new file mode 100644 index 0000000000..5244194a01 --- /dev/null +++ b/mkosi.conf.d/20-debian.conf @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=debian + +[Distribution] +Release=testing + +[Content] +Packages= + btrfs-progs + cryptsetup-bin + f2fs-tools + fdisk + fuse + gcc # Provides libasan/libubsan + iproute2 + isc-dhcp-server + libasound2 + libbpf1 + libc6-i386 + libcap-ng-utils + libcap-ng0 + libfido2-1 + libglib2.0-0 + libgnutls30 + libidn2-0 + libmicrohttpd12 + libmnl0 + libnuma1 + libp11-kit0 + libpam0g + libpopt0 + libpwquality1 + libqrencode4 + libtss2-dev # Use the -dev package to avoid churn in updating version numbers + netcat-openbsd + passwd + policykit-1 + procps + python3-pefile + python3-psutil + python3-pytest + quota + xxd + +BuildPackages= + bpftool + docbook-xsl + dpkg-dev + g++ + gcc-multilib + libacl1-dev + libasound-dev + libaudit-dev + libblkid-dev + libbpf-dev + libbz2-dev + libc6-dev + libc6-dev-i386 + libcap-dev + libcap-ng-dev + libcryptsetup-dev + libcurl4-openssl-dev + libdbus-1-dev + libdw-dev + libfdisk-dev + libfido2-dev + libfuse-dev + libgcrypt20-dev + libglib2.0-dev + libgnutls28-dev + libidn2-dev + libiptc-dev + libkmod-dev + libmicrohttpd-dev + libmnl-dev + libmount-dev + libnuma-dev + libp11-kit-dev + libpam0g-dev + libpopt-dev + libpwquality-dev + libqrencode-dev + libseccomp-dev + libsmartcols-dev + libssl-dev + libxen-dev + libxkbcommon-dev + libzstd-dev + pahole + python3-docutils + python3-jinja2 + python3-lxml + python3-pyelftools + xsltproc diff --git a/mkosi.conf.d/20-fedora.conf b/mkosi.conf.d/20-fedora.conf new file mode 100644 index 0000000000..5967c3670f --- /dev/null +++ b/mkosi.conf.d/20-fedora.conf @@ -0,0 +1,97 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=fedora + +[Distribution] +Release=37 + +[Content] +Packages= + alsa-lib + btrfs-progs + compsize + cryptsetup + dhcp-server + dnf + f2fs-tools + fuse + glib2 + glibc-minimal-langpack + gnutls + iproute + iproute-tc + libasan + libbpf + libcap-ng + libcap-ng-utils + libfido2 + libgcrypt + libmicrohttpd + libmnl + libubsan + libxcrypt + libxkbcommon + netcat + numactl-libs + pam + passwd + polkit + popt + procps-ng + python3dist(pefile) + python3dist(psutil) + python3dist(pytest) + quota + tpm2-tss + vim-common + +BuildPackages= + bpftool + docbook-xsl + dwarves + glibc-static + libcap-static + pam-devel + pkgconfig # pkgconf shim to provide /usr/bin/pkg-config + pkgconfig(alsa) + pkgconfig(audit) + pkgconfig(blkid) + pkgconfig(dbus-1) + pkgconfig(fdisk) + pkgconfig(fuse) + pkgconfig(glib-2.0) + pkgconfig(libacl) + pkgconfig(libbpf) + pkgconfig(libcap-ng) + pkgconfig(libcap) + pkgconfig(libcryptsetup) + pkgconfig(libcurl) + pkgconfig(libdw) + pkgconfig(libfido2) + pkgconfig(libgcrypt) + pkgconfig(libidn2) + pkgconfig(libkmod) + pkgconfig(libmicrohttpd) + pkgconfig(libmnl) + pkgconfig(libpcre2-8) + pkgconfig(libqrencode) + pkgconfig(libseccomp) + pkgconfig(libselinux) + pkgconfig(libzstd) + pkgconfig(mount) + pkgconfig(numa) + pkgconfig(openssl) + pkgconfig(p11-kit-1) + pkgconfig(popt) + pkgconfig(pwquality) + pkgconfig(tss2-esys) + pkgconfig(tss2-mu) + pkgconfig(tss2-rc) + pkgconfig(valgrind) + pkgconfig(xencontrol) + pkgconfig(xkbcommon) + python3-docutils + python3dist(jinja2) + python3dist(lxml) + python3dist(pyelftools) diff --git a/mkosi.conf.d/20-opensuse.conf b/mkosi.conf.d/20-opensuse.conf new file mode 100644 index 0000000000..96093951e1 --- /dev/null +++ b/mkosi.conf.d/20-opensuse.conf @@ -0,0 +1,110 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=opensuse + +[Distribution] +Release=tumbleweed + +[Content] +Packages= + btrfs-progs + dbus-1 + f2fs-tools + fuse + gcc # Provides libasan/libubsan + glibc-32bit + glibc-locale-base + libasound2 + libbpf1 + libcap-ng-utils + libcap-ng0 + libcrypt1 + libcryptsetup12 + libdw1 + libelf1 + libfido2 + libgcrypt20 + libglib-2_0-0 + libkmod2 + liblz4-1 + libmnl0 + libmount1 + libnuma1 + libp11-kit0 + libpopt0 + libqrencode4 + libseccomp2 + libxkbcommon0 + pam + python3-pefile + python3-psutil + python3-pytest + shadow + tpm2-0-tss + vim + +BuildPackages= + alsa-devel + audit-devel + bpftool + dbus-1-devel + docbook-xsl-stylesheets + dwarves + fdupes + fuse-devel + gcc-32bit + gcc-c++ + glib2-devel + glibc-devel-32bit + glibc-devel-static-32bit + glibc-locale + glibc-static + intltool + libacl-devel + libapparmor-devel + libblkid-devel + libbpf-devel + libbz2-devel + libcap-devel + libcap-ng-devel + libcryptsetup-devel + libcurl-devel + libdw-devel + libelf-devel + libfdisk-devel + libfido2-devel + libgcrypt-devel + libgnutls-devel + libkmod-devel + liblz4-devel + libmicrohttpd-devel + libmnl-devel + libmount-devel + libnuma-devel + libpwquality-devel + libseccomp-devel + libselinux-devel + libxkbcommon-devel + libxslt-tools + openssl-devel + pam-devel + pciutils-devel + pcre-devel + popt-devel + python3-docutils + python3-Jinja2 + python3-lxml + python3-pyelftools + qrencode-devel + shadow + system-group-obsolete + system-user-bin + system-user-daemon + system-user-nobody + system-user-root + systemd-sysvinit + timezone + tpm2-0-tss-devel + xen-devel + zlib-devel diff --git a/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf new file mode 100644 index 0000000000..97deb70947 --- /dev/null +++ b/mkosi.conf.d/20-ubuntu.conf @@ -0,0 +1,97 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=ubuntu + +[Distribution] +Release=jammy +Repositories=main,universe + +[Content] +Packages= + btrfs-progs + cryptsetup-bin + f2fs-tools + fdisk + fuse + gcc # Provides libasan/libubsan + iproute2 + isc-dhcp-server + libasound2 + libbpf0 + libc6-i386 + libcap-ng-utils + libcap-ng0 + libfdisk1 + libfido2-1 + libglib2.0-0 + libidn2-0 + libmicrohttpd12 + libmnl0 + libnuma1 + libp11-kit0 + libpopt0 + libpwquality1 + libqrencode4 + libtss2-dev # Use the -dev package to avoid churn in updating version numbers + linux-tools-common + linux-tools-generic + netcat-openbsd + passwd + policykit-1 + procps + python3-pefile + python3-psutil + python3-pytest + quota + xxd + +BuildPackages= + docbook-xsl + dpkg-dev + g++ + gcc-multilib + libacl1-dev + libasound-dev + libaudit-dev + libblkid-dev + libbpf-dev + libbz2-dev + libc6-dev + libc6-dev-i386 + libcap-dev + libcap-ng-dev + libcryptsetup-dev + libcurl4-openssl-dev + libdbus-1-dev + libdw-dev + libfdisk-dev + libfido2-dev + libfuse-dev + libgcrypt20-dev + libglib2.0-dev + libgnutls28-dev + libidn2-dev + libiptc-dev + libkmod-dev + libmicrohttpd-dev + libmnl-dev + libmount-dev + libnuma-dev + libp11-kit-dev + libpam0g-dev + libpopt-dev + libpwquality-dev + libqrencode-dev + libseccomp-dev + libsmartcols-dev + libssl-dev + libxen-dev + libxkbcommon-dev + libzstd-dev + pahole + python3-docutils + python3-jinja2 + python3-lxml + python3-pyelftools + xsltproc diff --git a/mkosi.conf.d/21-centos-8/mkosi.conf b/mkosi.conf.d/21-centos-8/mkosi.conf new file mode 100644 index 0000000000..d610212b61 --- /dev/null +++ b/mkosi.conf.d/21-centos-8/mkosi.conf @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=centos +Release=8 + +[Content] +Packages= + python39 + python3.9dist(pefile) + python3.9dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason. + python3.9dist(psutil) + python3.9dist(pytest) + +BuildPackages= + libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file. + python3.9dist(jinja2) + python3.9dist(lxml) + python3.9dist(pyelftools) diff --git a/mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo b/mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo new file mode 100644 index 0000000000..1462257c08 --- /dev/null +++ b/mkosi.conf.d/21-centos-8/mkosi.reposdir/powertools.repo @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[powertools-hotfixes] +name=powertools-hotfixes +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools +gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official +gpgcheck=1 +enabled=1 +module_hotfixes=1 +skip_if_unavailable=1 diff --git a/mkosi.conf.d/21-centos-9.conf b/mkosi.conf.d/21-centos-9.conf new file mode 100644 index 0000000000..0febf2c2ee --- /dev/null +++ b/mkosi.conf.d/21-centos-9.conf @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=centos +Release=9 + +[Content] +Packages= + python3dist(pefile) + python3dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason. + python3dist(psutil) + python3dist(pytest) + +BuildPackages= + pkgconfig(libgcrypt) + python3dist(jinja2) + python3dist(lxml) + python3dist(pyelftools) diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/arch/10-arch.conf deleted file mode 100644 index 30333cff3a..0000000000 --- a/mkosi.conf.d/arch/10-arch.conf +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# Copyright © 2016 Zeal Jagannatha - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=arch - -[Content] -Packages= - alsa-lib - btrfs-progs - compsize - dhcp - f2fs-tools - fuse2 - gnutls - iproute - libbpf - libcap-ng - libfido2 - libmicrohttpd - libmnl - libpwquality - libxkbcommon - man-db - numactl - openbsd-netcat - polkit - popt - python-pefile - python-psutil - python-pytest - quota-tools - shadow - tpm2-tss - vim - -BuildPackages= - bpf - docbook-xsl - libxslt - linux-api-headers - pahole - perl - python-docutils - python-jinja - python-lxml - python-pyelftools diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf deleted file mode 100644 index ff26e3611f..0000000000 --- a/mkosi.conf.d/centos/10-centos.conf +++ /dev/null @@ -1,108 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -# We use python3[.][9]dist() throughout this file because we need to make sure the python3.9dis() packages -# are installed on CentOS Stream 8. mkosi doesn't support release specific configuration yet so we use the -# globs to get the necessary packages on both CentOS Stream 8 and CentOS Stream 9. - -[Distribution] -Distribution=centos -Repositories=epel -RepositoryDirectory=mkosi.conf.d/centos/mkosi.reposdir - -[Content] -Packages= - alsa-lib - audit - cryptsetup - dhcp-server - dnf - fuse - glib2 - glibc-minimal-langpack - glibc.i686 - gnutls - iproute - iproute-tc - kernel-modules-extra - libasan - libbpf - libcap-ng - libcap-ng-utils - libfido2 - libmicrohttpd - libmnl - libubsan - libxcrypt - libxkbcommon - netcat - numactl-libs - p11-kit - pam - passwd - polkit - popt - procps-ng - python3[.][9]dist(pefile) - python3[.][9]dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason. - python3[.][9]dist(psutil) - python3[.][9]dist(pytest) - python39 - quota - tpm2-tss - vim-common - -BuildPackages= - bpftool - docbook-xsl - dwarves - glibc-devel.i686 - glibc-static - glibc-static.i686 - libgcrypt-devel # CentOS Stream 8 libgcrypt-devel doesn't ship a pkg-config file. - libxslt - pam-devel - perl-interpreter - pkgconfig(alsa) - pkgconfig(audit) - pkgconfig(blkid) - pkgconfig(bzip2) - pkgconfig(dbus-1) - pkgconfig(fdisk) - pkgconfig(fuse) - pkgconfig(glib-2.0) - pkgconfig(gnutls) - pkgconfig(libacl) - pkgconfig(libbpf) - pkgconfig(libcap-ng) - pkgconfig(libcap) - pkgconfig(libcryptsetup) - pkgconfig(libcurl) - pkgconfig(libdw) - pkgconfig(libfido2) - pkgconfig(libidn2) - pkgconfig(libkmod) - pkgconfig(libmicrohttpd) - pkgconfig(libmnl) - pkgconfig(libpcre2-8) - pkgconfig(libqrencode) - pkgconfig(libseccomp) - pkgconfig(libselinux) - pkgconfig(libzstd) - pkgconfig(mount) - pkgconfig(numa) - pkgconfig(openssl) - pkgconfig(p11-kit-1) - pkgconfig(popt) - pkgconfig(pwquality) - pkgconfig(tss2-esys) - pkgconfig(tss2-mu) - pkgconfig(tss2-rc) - pkgconfig(valgrind) - pkgconfig(xkbcommon) - python3-docutils - python3[.][9]dist(jinja2) - python3[.][9]dist(lxml) - python3[.][9]dist(pyelftools) diff --git a/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo b/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo deleted file mode 100644 index 5c7149a123..0000000000 --- a/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo +++ /dev/null @@ -1,8 +0,0 @@ -[powertools-hotfixes] -name=powertools-hotfixes -mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools -gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official -gpgcheck=1 -enabled=1 -module_hotfixes=1 -skip_if_unavailable=1 diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/debian/10-debian.conf deleted file mode 100644 index c3e582b8ec..0000000000 --- a/mkosi.conf.d/debian/10-debian.conf +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=debian -Release=testing - -[Content] -Packages= - btrfs-progs - cryptsetup-bin - f2fs-tools - fdisk - fuse - gcc # Provides libasan/libubsan - iproute2 - isc-dhcp-server - libasound2 - libbpf1 - libc6-i386 - libcap-ng-utils - libcap-ng0 - libfido2-1 - libglib2.0-0 - libgnutls30 - libidn2-0 - libmicrohttpd12 - libmnl0 - libnuma1 - libp11-kit0 - libpam0g - libpopt0 - libpwquality1 - libqrencode4 - libtss2-dev # Use the -dev package to avoid churn in updating version numbers - netcat-openbsd - passwd - policykit-1 - procps - python3-pefile - python3-psutil - python3-pytest - quota - xxd - -BuildPackages= - bpftool - docbook-xsl - dpkg-dev - g++ - gcc-multilib - libacl1-dev - libasound-dev - libaudit-dev - libblkid-dev - libbpf-dev - libbz2-dev - libc6-dev - libc6-dev-i386 - libcap-dev - libcap-ng-dev - libcryptsetup-dev - libcurl4-openssl-dev - libdbus-1-dev - libdw-dev - libfdisk-dev - libfido2-dev - libfuse-dev - libgcrypt20-dev - libglib2.0-dev - libgnutls28-dev - libidn2-dev - libiptc-dev - libkmod-dev - libmicrohttpd-dev - libmnl-dev - libmount-dev - libnuma-dev - libp11-kit-dev - libpam0g-dev - libpopt-dev - libpwquality-dev - libqrencode-dev - libseccomp-dev - libsmartcols-dev - libssl-dev - libxen-dev - libxkbcommon-dev - libzstd-dev - pahole - python3-docutils - python3-jinja2 - python3-lxml - python3-pyelftools - xsltproc diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/fedora/10-fedora.conf deleted file mode 100644 index b263cce673..0000000000 --- a/mkosi.conf.d/fedora/10-fedora.conf +++ /dev/null @@ -1,98 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=fedora -Release=37 - -[Content] -Packages= - alsa-lib - btrfs-progs - compsize - cryptsetup - dhcp-server - dnf - f2fs-tools - fuse - glib2 - glibc-minimal-langpack - gnutls - iproute - iproute-tc - libasan - libbpf - libcap-ng - libcap-ng-utils - libfido2 - libgcrypt - libmicrohttpd - libmnl - libubsan - libxcrypt - libxkbcommon - netcat - numactl-libs - pam - passwd - polkit - popt - procps-ng - python3dist(pefile) - python3dist(psutil) - python3dist(pytest) - quota - tpm2-tss - vim-common - -BuildPackages= - bpftool - docbook-xsl - dwarves - glibc-static - libcap-static - pam-devel - pkgconfig # pkgconf shim to provide /usr/bin/pkg-config - pkgconfig(alsa) - pkgconfig(audit) - pkgconfig(blkid) - pkgconfig(dbus-1) - pkgconfig(fdisk) - pkgconfig(fuse) - pkgconfig(glib-2.0) - pkgconfig(libacl) - pkgconfig(libbpf) - pkgconfig(libcap-ng) - pkgconfig(libcap) - pkgconfig(libcryptsetup) - pkgconfig(libcurl) - pkgconfig(libdw) - pkgconfig(libfido2) - pkgconfig(libgcrypt) - pkgconfig(libidn2) - pkgconfig(libkmod) - pkgconfig(libmicrohttpd) - pkgconfig(libmnl) - pkgconfig(libpcre2-8) - pkgconfig(libqrencode) - pkgconfig(libseccomp) - pkgconfig(libselinux) - pkgconfig(libzstd) - pkgconfig(mount) - pkgconfig(numa) - pkgconfig(openssl) - pkgconfig(p11-kit-1) - pkgconfig(popt) - pkgconfig(pwquality) - pkgconfig(tss2-esys) - pkgconfig(tss2-mu) - pkgconfig(tss2-rc) - pkgconfig(valgrind) - pkgconfig(xencontrol) - pkgconfig(xkbcommon) - python3-docutils - python3dist(jinja2) - python3dist(lxml) - python3dist(pyelftools) diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/opensuse/10-opensuse.conf deleted file mode 100644 index 1e03c79cff..0000000000 --- a/mkosi.conf.d/opensuse/10-opensuse.conf +++ /dev/null @@ -1,111 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=opensuse -Release=tumbleweed - -[Content] -Packages= - btrfs-progs - dbus-1 - f2fs-tools - fuse - gcc # Provides libasan/libubsan - glibc-32bit - glibc-locale-base - libasound2 - libbpf1 - libcap-ng-utils - libcap-ng0 - libcrypt1 - libcryptsetup12 - libdw1 - libelf1 - libfido2 - libgcrypt20 - libglib-2_0-0 - libkmod2 - liblz4-1 - libmnl0 - libmount1 - libnuma1 - libp11-kit0 - libpopt0 - libqrencode4 - libseccomp2 - libxkbcommon0 - pam - python3-pefile - python3-psutil - python3-pytest - shadow - tpm2-0-tss - vim - -BuildPackages= - alsa-devel - audit-devel - bpftool - dbus-1-devel - docbook-xsl-stylesheets - dwarves - fdupes - fuse-devel - gcc-32bit - gcc-c++ - glib2-devel - glibc-devel-32bit - glibc-devel-static-32bit - glibc-locale - glibc-static - intltool - libacl-devel - libapparmor-devel - libblkid-devel - libbpf-devel - libbz2-devel - libcap-devel - libcap-ng-devel - libcryptsetup-devel - libcurl-devel - libdw-devel - libelf-devel - libfdisk-devel - libfido2-devel - libgcrypt-devel - libgnutls-devel - libkmod-devel - liblz4-devel - libmicrohttpd-devel - libmnl-devel - libmount-devel - libnuma-devel - libpwquality-devel - libseccomp-devel - libselinux-devel - libxkbcommon-devel - libxslt-tools - openssl-devel - pam-devel - pciutils-devel - pcre-devel - popt-devel - python3-docutils - python3-Jinja2 - python3-lxml - python3-pyelftools - qrencode-devel - shadow - system-group-obsolete - system-user-bin - system-user-daemon - system-user-nobody - system-user-root - systemd-sysvinit - timezone - tpm2-0-tss-devel - xen-devel - zlib-devel diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/ubuntu/10-ubuntu.conf deleted file mode 100644 index 51898475b0..0000000000 --- a/mkosi.conf.d/ubuntu/10-ubuntu.conf +++ /dev/null @@ -1,98 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). -# Symlink this file to mkosi.conf in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=ubuntu -Release=jammy -Repositories=main,universe - -[Content] -Packages= - btrfs-progs - cryptsetup-bin - f2fs-tools - fdisk - fuse - gcc # Provides libasan/libubsan - iproute2 - isc-dhcp-server - libasound2 - libbpf0 - libc6-i386 - libcap-ng-utils - libcap-ng0 - libfdisk1 - libfido2-1 - libglib2.0-0 - libidn2-0 - libmicrohttpd12 - libmnl0 - libnuma1 - libp11-kit0 - libpopt0 - libpwquality1 - libqrencode4 - libtss2-dev # Use the -dev package to avoid churn in updating version numbers - linux-tools-common - linux-tools-generic - netcat-openbsd - passwd - policykit-1 - procps - python3-pefile - python3-psutil - python3-pytest - quota - xxd - -BuildPackages= - docbook-xsl - dpkg-dev - g++ - gcc-multilib - libacl1-dev - libasound-dev - libaudit-dev - libblkid-dev - libbpf-dev - libbz2-dev - libc6-dev - libc6-dev-i386 - libcap-dev - libcap-ng-dev - libcryptsetup-dev - libcurl4-openssl-dev - libdbus-1-dev - libdw-dev - libfdisk-dev - libfido2-dev - libfuse-dev - libgcrypt20-dev - libglib2.0-dev - libgnutls28-dev - libidn2-dev - libiptc-dev - libkmod-dev - libmicrohttpd-dev - libmnl-dev - libmount-dev - libnuma-dev - libp11-kit-dev - libpam0g-dev - libpopt-dev - libpwquality-dev - libqrencode-dev - libseccomp-dev - libsmartcols-dev - libssl-dev - libxen-dev - libxkbcommon-dev - libzstd-dev - pahole - python3-docutils - python3-jinja2 - python3-lxml - python3-pyelftools - xsltproc -- cgit v1.2.1