Commit 9394886f authored by Julien Muchembled's avatar Julien Muchembled

version up: meson 0.62.1, qemu 7.0.0

parent 0252a737
...@@ -8,8 +8,8 @@ parts = ...@@ -8,8 +8,8 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
version = 0.57.2 version = 0.62.1
md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa md5sum = 2f5301d0e7fd5544ab0004393ba44cbe
configure-command = true configure-command = true
make-binary = true make-binary = true
post-install = post-install =
......
[buildout] [buildout]
extends = extends =
../defaults.cfg
../attr/buildout.cfg ../attr/buildout.cfg
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../gnutls/buildout.cfg ../gnutls/buildout.cfg
...@@ -12,22 +13,19 @@ extends = ...@@ -12,22 +13,19 @@ extends =
../meson/buildout.cfg ../meson/buildout.cfg
../ncurses/buildout.cfg ../ncurses/buildout.cfg
../ninja/buildout.cfg ../ninja/buildout.cfg
../patch/buildout.cfg
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../xorg/buildout.cfg ../xorg/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../glib/buildout.cfg ../glib/buildout.cfg
[gcc]
min_version = 7.4
[qemu] [qemu]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://download.qemu.org/qemu-5.2.0.tar.xz url = https://download.qemu.org/qemu-7.0.0.tar.xz
md5sum = 179f86928835da857c237b42f4b2df73 md5sum = bfb5b09a0d1f887c8c42a6d5f26971ab
patches =
# backport (2021-03-20)
https://gitlab.com/qemu-project/qemu/-/commit/3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.patch#c4330b02f331a827145009d85e4f6862
patch-binary = ${patch:location}/bin/patch
patch-options = -p1
pre-configure = pre-configure =
sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
......
...@@ -203,7 +203,7 @@ slapos.rebootstrap = 4.5 ...@@ -203,7 +203,7 @@ slapos.rebootstrap = 4.5
slapos.recipe.build = 0.54 slapos.recipe.build = 0.54
slapos.recipe.cmmi = 0.19 slapos.recipe.cmmi = 0.19
slapos.recipe.template = 5.0 slapos.recipe.template = 5.0
slapos.toolbox = 0.126 slapos.toolbox = 0.127
stevedore = 1.21.0:whl stevedore = 1.21.0:whl
subprocess32 = 3.5.4 subprocess32 = 3.5.4
unicodecsv = 0.14.1 unicodecsv = 0.14.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment