diff options
| -rw-r--r-- | .mkosi/mkosi.arch | 4 | ||||
| -rw-r--r-- | .mkosi/mkosi.debian | 4 | ||||
| -rw-r--r-- | .mkosi/mkosi.fedora | 6 | ||||
| -rwxr-xr-x | mkosi.build | 9 |
4 files changed, 8 insertions, 15 deletions
diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch index 4c44f288ae..b2e5e14a92 100644 --- a/.mkosi/mkosi.arch +++ b/.mkosi/mkosi.arch @@ -32,8 +32,6 @@ RootSize=2G Cache=/var/cache/pacman/pkg/ BuildPackages= acl - autoconf - automake bzip2 cryptsetup curl @@ -58,7 +56,7 @@ BuildPackages= libxkbcommon libxslt lz4 - make + meson pam pkgconfig python diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian index a68d9dfa11..468a6d8654 100644 --- a/.mkosi/mkosi.debian +++ b/.mkosi/mkosi.debian @@ -32,8 +32,6 @@ RootSize=2G [Packages] BuildPackages= acl - autoconf - automake diffutils docbook-xml docbook-xsl @@ -68,7 +66,7 @@ BuildPackages= libsmartcols-dev libtool libxkbcommon-dev - make + meson pkg-config python3 python3-lxml diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora index 1b8dd47ca4..5569ce9b75 100644 --- a/.mkosi/mkosi.fedora +++ b/.mkosi/mkosi.fedora @@ -20,7 +20,7 @@ [Distribution] Distribution=fedora -Release=25 +Release=26 [Output] Format=raw_btrfs @@ -32,8 +32,7 @@ RootSize=3G [Packages] BuildPackages= audit-libs-devel - autoconf - automake + meson bzip2-devel cryptsetup-devel dbus-devel @@ -63,7 +62,6 @@ BuildPackages= libxkbcommon-devel libxslt lz4-devel - make pam-devel pkgconfig python3-devel diff --git a/mkosi.build b/mkosi.build index 872841eb63..6bbe8f3942 100755 --- a/mkosi.build +++ b/mkosi.build @@ -20,11 +20,10 @@ # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi). # Simply invoke "mkosi" in the project directory to build an OS image. -./autogen.sh c -make -j `nproc` - -make check -make install +meson build +ninja -C build all +ninja -C build test +ninja -C build install mkdir -p $DESTDIR/etc |