From c46d0c5b87656e34e97e43c915144c5422291ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 23 Dec 2021 08:39:12 +0100 Subject: [PATCH] Revert "component/meson: Version up" This reverts commit fc7928fb1af296abce8850d1d17aaaea88c609f4. --- component/meson/buildout.cfg | 9 ++------- component/qemu-kvm/buildout.cfg | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/component/meson/buildout.cfg b/component/meson/buildout.cfg index d39355b4e..ba27decc6 100644 --- a/component/meson/buildout.cfg +++ b/component/meson/buildout.cfg @@ -4,17 +4,12 @@ extends = parts = meson -[meson-0.57.2] -<= meson -version = 0.57.2 -md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa - [meson] recipe = slapos.recipe.cmmi shared = true url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz -version = 0.59.2 -md5sum = 9d65e09b53b1dfab6339a0982176935d +version = 0.57.2 +md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa configure-command = true make-binary = true post-install = diff --git a/component/qemu-kvm/buildout.cfg b/component/qemu-kvm/buildout.cfg index 7719dc403..bfa112d3b 100644 --- a/component/qemu-kvm/buildout.cfg +++ b/component/qemu-kvm/buildout.cfg @@ -32,7 +32,7 @@ pre-configure = sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build configure-options = - --meson=${meson-0.57.2:location}/bin/meson + --meson=${meson:location}/bin/meson --ninja=${ninja:location}/bin/ninja --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu" --enable-system -- 2.30.9