diff options
| -rwxr-xr-x | mkosi.build | 15 | ||||
| -rw-r--r-- | mkosi.conf.d/10-systemd.conf | 1 | ||||
| -rw-r--r-- | mkosi.conf.d/arch/10-mkosi.arch | 7 | ||||
| -rw-r--r-- | mkosi.conf.d/centos_epel/10-mkosi.centos_epel | 17 | ||||
| -rw-r--r-- | mkosi.conf.d/debian/10-mkosi.debian | 17 | ||||
| -rw-r--r-- | mkosi.conf.d/fedora/10-mkosi.fedora | 18 | ||||
| -rw-r--r-- | mkosi.conf.d/opensuse/10-mkosi.opensuse | 22 | ||||
| -rw-r--r-- | mkosi.conf.d/ubuntu/10-mkosi.ubuntu | 17 |
8 files changed, 110 insertions, 4 deletions
diff --git a/mkosi.build b/mkosi.build index f02a15ad4d..cbf82811cf 100755 --- a/mkosi.build +++ b/mkosi.build @@ -280,10 +280,14 @@ if [ -d mkosi.kernel/ ]; then cd "$SRCDIR/mkosi.kernel" mkdir -p "$BUILDDIR/mkosi.kernel" + # Ensure fast incremental builds by fixating these values which usually change for each build. + export KBUILD_BUILD_TIMESTAMP="Fri Jun 5 15:58:00 CEST 2015" + export KBUILD_BUILD_HOST="mkosi" + make O="$BUILDDIR/mkosi.kernel" defconfig scripts/config \ - --file $BUILDDIR/mkosi.kernel/.config \ + --file "$BUILDDIR/mkosi.kernel/.config" \ --enable BPF_SYSCALL \ --enable BPF_JIT \ --enable BPF_JIT_ALWAYS_ON \ @@ -293,6 +297,8 @@ if [ -d mkosi.kernel/ ]; then --enable BPF_PRELOAD \ --enable BPF_PRELOAD_UMD \ --enable BPF_LSM \ + --enable DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT \ + --enable DEBUG_INFO_BTF \ --enable BTRFS_FS \ --enable BTRFS_FS_POSIX_ACL \ --enable PSI \ @@ -300,7 +306,9 @@ if [ -d mkosi.kernel/ ]; then --enable CGROUP_BPF \ --enable MEMCG \ --enable MEMCG_SWAP \ - --enable MEMCG_KMEM + --enable MEMCG_KMEM \ + --enable NETFILTER_ADVANCED \ + --enable NF_CONNTRACK_MARK # Make sure all unset options are set to their default value. make O="$BUILDDIR/mkosi.kernel" olddefconfig @@ -309,6 +317,9 @@ if [ -d mkosi.kernel/ ]; then KERNEL_RELEASE="$(make O=$BUILDDIR/mkosi.kernel -s kernelrelease)" mkdir -p "$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" + make O="$BUILDDIR/mkosi.kernel" INSTALL_HDR_PATH=/usr headers_install make O="$BUILDDIR/mkosi.kernel" INSTALL_MOD_PATH="$DESTDIR/usr" modules_install make O="$BUILDDIR/mkosi.kernel" INSTALL_PATH="$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" install + mkdir -p "$DESTDIR/usr/lib/kernel/selftests" + make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR/mkosi.kernel" KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install fi diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf index c144c86816..5bc13f919a 100644 --- a/mkosi.conf.d/10-systemd.conf +++ b/mkosi.conf.d/10-systemd.conf @@ -53,6 +53,7 @@ BuildPackages= git gnu-efi gperf + lld llvm make meson diff --git a/mkosi.conf.d/arch/10-mkosi.arch b/mkosi.conf.d/arch/10-mkosi.arch index 50194b960b..883dc1fcd5 100644 --- a/mkosi.conf.d/arch/10-mkosi.arch +++ b/mkosi.conf.d/arch/10-mkosi.arch @@ -10,18 +10,24 @@ Distribution=arch [Content] Packages= + alsa-lib compsize dhcp + fuse2 gnutls iproute libbpf + libcap-ng libfido2 libmicrohttpd + libmnl libpwquality libxkbcommon man-db + numactl openbsd-netcat polkit + popt quota-tools tpm2-tss vim @@ -33,5 +39,6 @@ BuildPackages= linux-api-headers pahole perl + python-docutils python-jinja python-lxml diff --git a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel b/mkosi.conf.d/centos_epel/10-mkosi.centos_epel index 0b1e5ee315..768403f7cf 100644 --- a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel +++ b/mkosi.conf.d/centos_epel/10-mkosi.centos_epel @@ -12,26 +12,33 @@ HostonlyInitrd=no [Content] Packages= + alsa-lib audit cryptsetup dhcp-server + fuse glib2 glibc-minimal-langpack + glibc.i686 gnutls iproute iproute-tc kernel-modules-extra libasan libbpf + libcap-ng libfido2 libmicrohttpd + libmnl libubsan libxcrypt libxkbcommon netcat + numactl-libs p11-kit pam polkit + popt procps-ng quota tpm2-tss @@ -41,20 +48,26 @@ BuildPackages= bpftool docbook-xsl dwarves + glibc-devel.i686 + glibc-static + glibc-static.i686 gnu-efi-devel 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) @@ -63,19 +76,23 @@ BuildPackages= 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) + python3dist(docutils) python3dist(jinja2) python3dist(lxml) diff --git a/mkosi.conf.d/debian/10-mkosi.debian b/mkosi.conf.d/debian/10-mkosi.debian index 6224c338af..b2da9b6232 100644 --- a/mkosi.conf.d/debian/10-mkosi.debian +++ b/mkosi.conf.d/debian/10-mkosi.debian @@ -11,17 +11,24 @@ Release=testing Packages= cryptsetup-bin fdisk + fuse gcc # Provides libasan/libubsan iproute2 isc-dhcp-server + libasound2 libbpf0 + libc6-i386 + 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 @@ -35,18 +42,24 @@ BuildPackages= bpftool docbook-xsl 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 @@ -54,9 +67,12 @@ BuildPackages= 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 @@ -66,6 +82,7 @@ BuildPackages= libxkbcommon-dev libzstd-dev pahole + python3-docutils python3-jinja2 python3-lxml xsltproc diff --git a/mkosi.conf.d/fedora/10-mkosi.fedora b/mkosi.conf.d/fedora/10-mkosi.fedora index 60ed21ecef..c76f479956 100644 --- a/mkosi.conf.d/fedora/10-mkosi.fedora +++ b/mkosi.conf.d/fedora/10-mkosi.fedora @@ -9,25 +9,32 @@ Release=37 [Content] Packages= + alsa-lib compsize cryptsetup dhcp-server + fuse glib2 glibc-minimal-langpack + glibc.i686 gnutls iproute iproute-tc libasan libbpf + libcap-ng libfido2 libgcrypt libmicrohttpd + libmnl libubsan libxcrypt libxkbcommon netcat + numactl-libs pam polkit + popt procps-ng quota tpm2-tss @@ -37,16 +44,23 @@ BuildPackages= bpftool docbook-xsl dwarves + glibc-devel.i686 + glibc-static + glibc-static.i686 gnu-efi-devel + 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) @@ -56,14 +70,17 @@ BuildPackages= 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) @@ -71,5 +88,6 @@ BuildPackages= pkgconfig(valgrind) pkgconfig(xencontrol) pkgconfig(xkbcommon) + python3dist(docutils) python3dist(jinja2) python3dist(lxml) diff --git a/mkosi.conf.d/opensuse/10-mkosi.opensuse b/mkosi.conf.d/opensuse/10-mkosi.opensuse index 16e44dc69d..7a212237f2 100644 --- a/mkosi.conf.d/opensuse/10-mkosi.opensuse +++ b/mkosi.conf.d/opensuse/10-mkosi.opensuse @@ -10,9 +10,13 @@ Release=tumbleweed [Content] Packages= dbus-1 + fuse gcc # Provides libasan/libubsan + glibc-32bit glibc-locale-base + libasound2 libbpf1 + libcap-ng0 libcrypt1 libcryptsetup12 libdw1 @@ -22,8 +26,11 @@ Packages= libglib-2_0-0 libkmod2 liblz4-1 + libmnl0 libmount1 + libnuma1 libp11-kit0 + libpopt0 libqrencode4 libseccomp2 libxkbcommon0 @@ -32,15 +39,21 @@ Packages= 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 @@ -48,6 +61,7 @@ BuildPackages= libbpf-devel libbz2-devel libcap-devel + libcap-ng-devel libcryptsetup-devel libcurl-devel libdw-devel @@ -57,18 +71,22 @@ BuildPackages= 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 - liblz4-devel openssl-devel pam-devel - pcre-devel pciutils-devel + pcre-devel + popt-devel + python3-docutils python3-Jinja2 python3-lxml qrencode-devel diff --git a/mkosi.conf.d/ubuntu/10-mkosi.ubuntu b/mkosi.conf.d/ubuntu/10-mkosi.ubuntu index 35ba863eca..c7badf5742 100644 --- a/mkosi.conf.d/ubuntu/10-mkosi.ubuntu +++ b/mkosi.conf.d/ubuntu/10-mkosi.ubuntu @@ -12,16 +12,23 @@ Repositories=main,universe Packages= cryptsetup-bin fdisk + fuse gcc # Provides libasan/libubsan iproute2 isc-dhcp-server + libasound2 libbpf0 + libc6-i386 + 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 @@ -36,18 +43,24 @@ Packages= BuildPackages= docbook-xsl 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 @@ -55,9 +68,12 @@ BuildPackages= 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 @@ -67,6 +83,7 @@ BuildPackages= libxkbcommon-dev libzstd-dev pahole + python3-docutils python3-jinja2 python3-lxml xsltproc |