summaryrefslogtreecommitdiff
path: root/.mkosi
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-05-05 21:18:44 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-05-05 21:18:44 -0400
commit6c3444cb03cd676719787e61cc794fa6edd8ce9a (patch)
tree4a6eb0afe6f451880787ebca995c34ad5da24b13 /.mkosi
parenta3645cc6dd84ea2bde71ff23c1bed1c38315ce0a (diff)
downloadsystemd-6c3444cb03cd676719787e61cc794fa6edd8ce9a.tar.gz
mkosi: switch build to meson
For Fedora, the version is bumped to 26. In F25, ninja is still called ninja-build (while the package with the rename is going through QA).
Diffstat (limited to '.mkosi')
-rw-r--r--.mkosi/mkosi.arch4
-rw-r--r--.mkosi/mkosi.debian4
-rw-r--r--.mkosi/mkosi.fedora6
3 files changed, 4 insertions, 10 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