diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-02 14:39:37 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-03 13:18:38 +0200 |
commit | d55ad7fe96eb1edf438a7a41a465723bd29d4b10 (patch) | |
tree | 6f357fcd48fd63d53818fc4d2173690d0ab090a4 /.mkosi | |
parent | 6ad92aaf901a47bc96cb42192f26f03c48fbd702 (diff) | |
download | systemd-d55ad7fe96eb1edf438a7a41a465723bd29d4b10.tar.gz |
mkosi: move distro files to mkosi.default.d/
With this change, "mkosi build" will automatically build systemd for the
current distro without any further configuration. If people want to do a
cross-distro build by default, they can still create mkosi.default, but I
assume that this is relatively rare.
If people have symlinked mkosi.default to one of the files in .mkosi/, they'll
need to adjust the symlink.
(Building without configuration would always fail, since systemd has many many
required dependencies. I think it's nicer to do the most commonly expected
thing by default, i.e. rebuild for the current distro.)
Mkosi is nowadays packaged for most distros, so recommend installing of distro
packages as the primary installation mechanism.
Diffstat (limited to '.mkosi')
-rw-r--r-- | .mkosi/mkosi.arch | 61 | ||||
-rw-r--r-- | .mkosi/mkosi.debian | 70 | ||||
-rw-r--r-- | .mkosi/mkosi.fedora | 73 | ||||
-rw-r--r-- | .mkosi/mkosi.opensuse | 72 | ||||
-rw-r--r-- | .mkosi/mkosi.ubuntu | 73 |
5 files changed, 0 insertions, 349 deletions
diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch deleted file mode 100644 index f584d2d126..0000000000 --- a/.mkosi/mkosi.arch +++ /dev/null @@ -1,61 +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.default in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=arch - -[Packages] -BuildPackages= - acl - bzip2 - cryptsetup - curl - dbus - diffutils - docbook-xsl - elfutils - gcc - git - gnu-efi-libs - gnutls - gperf - inetutils - iptables - kmod - libcap - libgcrypt - libidn2 - libmicrohttpd - libseccomp - libutil-linux - libxkbcommon - libxslt - lz4 - meson - pam - pkgconfig - python - python-lxml - python-jinja - qrencode - rsync - xz - zstd - -Packages= - gdb - libidn2 - nano - qrencode - strace - # For testing "systemd-analyze verify". - man-db - # For testing systemd's bash completion scripts. - bash-completion - # For testing systemd's zsh completion scripts - # Run `autoload -Uz compinit; compinit` from a zsh shell in the booted image to enable completions. - zsh diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian deleted file mode 100644 index 9bd504bf57..0000000000 --- a/.mkosi/mkosi.debian +++ /dev/null @@ -1,70 +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.default in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=debian -Release=unstable - -[Packages] -BuildPackages= - acl - docbook-xml - docbook-xsl - gcc - gettext - git - gnu-efi - gperf - libacl1-dev - libaudit-dev - libblkid-dev - libbz2-dev - libcap-dev - libcryptsetup-dev - libcurl4-gnutls-dev - libdbus-1-dev - libdw-dev - libfdisk-dev - libfido2-dev - libgcrypt20-dev - libgnutls28-dev - libidn2-0-dev - libiptc-dev - libkmod-dev - liblz4-dev - liblz4-tool - liblzma-dev - libmicrohttpd-dev - libmount-dev - libpam0g-dev - libqrencode-dev - libseccomp-dev - libsmartcols-dev - libssl-dev - libtss2-dev - libxkbcommon-dev - libzstd-dev - meson - pkg-config - python3 - python3-lxml - python3-jinja2 - tree - uuid-dev - xsltproc - xz-utils - zstd - -Packages= - gdb - libfdisk1 - libfido2-1 - libidn2-0 - libqrencode4 - # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically - libtss2-dev - locales - nano - strace diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora deleted file mode 100644 index cc3a5a2d1a..0000000000 --- a/.mkosi/mkosi.fedora +++ /dev/null @@ -1,73 +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.default in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=fedora -Release=34 - -[Packages] -BuildPackages= - diffutils - docbook-style-xsl - findutils - gcc - gettext - git - glibc-minimal-langpack - gnu-efi - gnu-efi-devel - gperf - lz4 - meson - ninja-build - pam-devel - pkgconfig - pkgconfig(audit) - pkgconfig(blkid) - pkgconfig(bzip2) - pkgconfig(dbus-1) - pkgconfig(fdisk) - pkgconfig(gnutls) - pkgconfig(libacl) - pkgconfig(libcap) - pkgconfig(libcryptsetup) - pkgconfig(libcurl) - pkgconfig(libdw) - pkgconfig(libfido2) - pkgconfig(libgcrypt) - pkgconfig(libidn2) - pkgconfig(libiptc) - pkgconfig(libkmod) - pkgconfig(liblz4) - pkgconfig(liblzma) - pkgconfig(libmicrohttpd) - pkgconfig(libpcre2-8) - pkgconfig(libqrencode) - pkgconfig(libseccomp) - pkgconfig(libselinux) - pkgconfig(libzstd) - pkgconfig(mount) - pkgconfig(openssl) - pkgconfig(p11-kit-1) - pkgconfig(pwquality) - pkgconfig(tss2-esys) - pkgconfig(tss2-mu) - pkgconfig(tss2-rc) - pkgconfig(valgrind) - pkgconfig(xkbcommon) - python3dist(jinja2) - python3dist(lxml) - rpm - tree - zstd - /usr/bin/xsltproc - -Packages= - gdb - nano - # procps-ng provides a set of useful utilies (ps, free, etc) - procps-ng - strace - tpm2-tss diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse deleted file mode 100644 index 7eb7b857ca..0000000000 --- a/.mkosi/mkosi.opensuse +++ /dev/null @@ -1,72 +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.default in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=opensuse -Release=tumbleweed - -[Packages] -BuildPackages= - docbook-xsl-stylesheets - fdupes - gcc - gnu-efi - gperf - intltool - libacl-devel - libapparmor-devel - libblkid-devel - libbz2-devel - libcap-devel - libcryptsetup-devel - libcurl-devel - libgcrypt-devel - libkmod-devel - liblz4-devel - libmicrohttpd-devel - libmount-devel - libseccomp-devel - libselinux-devel - libxslt-tools - meson - pam-devel - pciutils-devel - pcre-devel - python3 - python3-lxml - python3-Jinja2 - qrencode-devel - system-user-nobody - systemd-sysvinit - zlib-devel -# to satisfy tests - acl - diffutils - glibc-locale - system-group-obsolete - system-user-bin - system-user-daemon - system-user-root - timezone - -Packages= - gdb - # brought in via meson->python3 - libp11-kit0 - # --bootable=no - dbus-1 - libapparmor1 - libcrypt1 - libcryptsetup12 - libgcrypt20 - libkmod2 - liblz4-1 - libmount1 - libqrencode4 - libseccomp2 - pam - nano - strace - util-linux diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu deleted file mode 100644 index c9c473e7ba..0000000000 --- a/.mkosi/mkosi.ubuntu +++ /dev/null @@ -1,73 +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.default in the project root directory and invoke "mkosi" to build an OS image. - -[Distribution] -Distribution=ubuntu -Release=focal -Repositories=main,universe - -[Packages] -BuildPackages= - acl - docbook-xml - docbook-xsl - gcc - gettext - git - gnu-efi - gperf - libacl1-dev - libaudit-dev - libblkid-dev - libbz2-dev - libcap-dev - libcryptsetup-dev - libcurl4-gnutls-dev - libdbus-1-dev - libdw-dev - libfdisk-dev - libfido2-dev - libgcrypt20-dev - libgnutls28-dev - libidn2-0-dev - libip4tc-dev - libip6tc-dev - libkmod-dev - liblz4-dev - liblz4-tool - liblzma-dev - libmicrohttpd-dev - libmount-dev - libpam0g-dev - libqrencode-dev - libseccomp-dev - libsmartcols-dev - libssl-dev - libtss2-dev - libxkbcommon-dev - libxtables-dev - libzstd-dev - meson - pkg-config - python3 - python3-lxml - python3-jinja2 - tree - tzdata - uuid-dev - xsltproc - xz-utils - zstd - -Packages= - gdb - libfido2-1 - libidn2-0 - libqrencode4 - # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically - libtss2-dev - locales - nano - strace |