March 2020 - Devel - libvirt List Archives

[PATCH v2 0/4] add support for QEMU 9pfs 'multidevs' option
by Christian Schoenebeck 30 Mar '20

30 Mar '20

QEMU 4.2 added a new option 'multidevs' for 9pfs. The following patch adds support for this new option to libvirt. In short, what is this about: to distinguish files uniquely from each other in general, numeric file IDs are typically used for comparison, which in practice is the combination of a file's device ID and the file's inode number. Unfortunately 9p protocol's QID field used for this purpose, currently is too small to fit both the device ID and inode number in, which hence is a problem if one 9pfs export contains multiple devices and may thus lead to misbheaviours on guest (e.g. with SAMBA file servers) in that case due to potential file ID collisions. To mitigate this problem with 9pfs a 'multidevs' option was introduced in QEMU 4.2 for defining how to deal with this, e.g. multidevs=remap will cause QEMU's 9pfs implementation to remap all inodes from host side to different inode numbers on guest side in a way that prevents file ID collisions. NOTE: In the libvirt docs changes of this libvirt patch I simply assumed "since 6.2.0". So the final libvirt version number would need to be adjusted in that text if necessary. See QEMU discussion with following Message-ID for details: 8a2ffe17fda3a86b9a5a437e1245276881f1e235.1567680121.git.qemu_oss(a)crudebyte.com v1->v2: * Unrelated docs/formatdomain.html.in changes to separate patch. [patch 1] * Added new capability QEMU_CAPS_VIRTFS_MULTIDEVS. [patch 2] * XML changes as isolated patch. [patch 3] * Code style fix. [patch 3] * QEMU 'multidevs' command handling as isolated patch. [patch 4] * Error out if not QEMU_CAPS_VIRTFS_MULTIDEVS capability. [patch 4] * Error out on virtiofs (since it does not have the 'multidevs' option). [patch 4] TODO: * Capabilities test cases would fail if <flag name='virtfs-multidevs'/> was added to the other architectures' test case xml files, why? [patch 2] * The requested test cases to add: Sorry, the libvirt test case environment is yet a mystery to me, I would not even know where to start here. Message-ID of v1: E1jEFpL-00028n-Qj(a)lizzy.crudebyte.com Christian Schoenebeck (4): docs: virtfs: add section separators qemu: capabilities: add QEMU_CAPS_VIRTFS_MULTIDEVS conf: add 'multidevs' option qemu: add support for 'multidevs' option docs/formatdomain.html.in | 47 ++++++++++++++++++- docs/schemas/domaincommon.rng | 10 ++++ src/conf/domain_conf.c | 29 ++++++++++++ src/conf/domain_conf.h | 13 +++++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 +++ src/qemu/qemu_domain.c | 12 +++++ .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + 11 files changed, 126 insertions(+), 1 deletion(-) -- 2.20.1

2 11

RFC: qemu: use uuid instead of name for misc filenames
by Nikolay Shirokovskiy 30 Mar '20

30 Mar '20

Hi, everyone. I'm working on supporting domain renaming when it has snapshots which is not supported now. And it strikes me things will be much simplier to manage on renaming if we use uuid in filenames instead of domain names. 1. Renaming will only involve saving updated config. The saving is atomic thanx to tmp file and rename(2) approach. In constast current renaming on error paths can leave config with old or new name. Thus on libvirt restart extra VM will appear. And we don't need to rename autostart links, snapshot directories etc. 2. Renaming will be possible for running domains with no efforts. We only need to pass uuid instead of name in '-name guest=...' command line. 3. Mgmt can stop using autogenerated names for domains. I guess openstack for example uses names like instance-000002ff because we have many limitations on domain renaming. And if these limitations are removed then openstack can just use user supplied names for domains. 4. No issues with long domain names and filename length limit If the above conversion makes sense I guess the good time to apply it is on domain start (and rename to support renaming with snapshots). I guess we can also have tool (some virsh command) for developers to generate symlinks so one can access logs, configs etc by name instead of uuid. Nikolay

3 8

[PATCH v2 0/4] Preserve query component of path for HTTP disks
by Peter Krempa 30 Mar '20

30 Mar '20

v2: - fixed docs to mention http/ftp/tftp protocols - query part is stored separately to prevent ambiguity in using of the '?' sign - added checks that query is valid only for http - added tests for pre-blockdev configurations Peter Krempa (4): docs: formatdomain: Mention missing protocols conf: Add support for http(s) query strings qemuBlockStorageSourceGetURI: Pass through query component virStorageSourceParseBackingURI: Preserve query string of URI for http(s) docs/formatdomain.html.in | 14 ++++++++++---- docs/schemas/domaincommon.rng | 6 ++++++ src/conf/domain_conf.c | 5 +++++ src/qemu/qemu_block.c | 2 ++ src/qemu/qemu_domain.c | 9 +++++++++ src/util/virstoragefile.c | 14 +++++++++++--- src/util/virstoragefile.h | 1 + tests/qemuxml2argvdata/disk-cdrom-network.args | 4 ++-- .../disk-cdrom-network.x86_64-2.12.0.args | 4 ++-- .../disk-cdrom-network.x86_64-latest.args | 3 ++- tests/qemuxml2argvdata/disk-cdrom-network.xml | 2 +- .../disk-network-http.x86_64-latest.args | 5 +++-- tests/qemuxml2argvdata/disk-network-http.xml | 2 +- .../disk-network-http.x86_64-latest.xml | 2 +- tests/virstoragetest.c | 4 ++-- 15 files changed, 58 insertions(+), 19 deletions(-) -- 2.24.1

2 10

[PATCH] qemu-shim: add a --with-config option
by marcandre.lureau＠redhat.com 30 Mar '20

30 Mar '20

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Add an option to ease setting up a VM with existing libvirt qemu.conf. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1817776 Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/manpages/virt-qemu-run.rst | 6 ++++++ src/libvirt_private.syms | 1 - src/qemu/qemu_shim.c | 36 +++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.rst index b06c311b1d..3196b4c8f4 100644 --- a/docs/manpages/virt-qemu-run.rst +++ b/docs/manpages/virt-qemu-run.rst @@ -71,6 +71,12 @@ is a path to the XML description of the secret, whose UUID should match a secret referenced in the guest domain XML. The ``VALUE-FILE`` is a path containing the raw value of the secret. +``-c``, ``--with-config`` + +Copy the libvirt qemu.conf configuration to the root directory. If +there is already a qemu.conf file in the $ROOT/etc directory, exit +with failure. + EXIT STATUS =========== diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 88fea4fc43..cb2b279401 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1899,7 +1899,6 @@ virConfWalk; virConfWriteFile; virConfWriteMem; - # util/vircrypto.h virCryptoEncryptData; virCryptoHashBuf; diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7e87b8fb96..553a37ab60 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -24,6 +24,7 @@ #include <stdbool.h> #include <unistd.h> +#include "virconf.h" #include "virfile.h" #include "virstring.h" #include "virgettext.h" @@ -99,6 +100,7 @@ int main(int argc, char **argv) g_auto(GStrv) secrets = NULL; gboolean verbose = false; gboolean debug = false; + gboolean with_config = false; GStrv tmpsecrets; GOptionContext *ctx; GOptionEntry entries[] = { @@ -106,6 +108,7 @@ int main(int argc, char **argv) { "root", 'r', 0, G_OPTION_ARG_STRING, &root, "Root directory", "DIR" }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "Debug output", NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Verbose output", NULL }, + { "with-config", 'c', 0, G_OPTION_ARG_NONE, &with_config, "Use system/home qemu.conf", NULL }, { 0 } }; int quitfd[2] = {-1, -1}; @@ -167,6 +170,39 @@ int main(int argc, char **argv) } } + if (with_config) { + g_autofree char *src = virConfLoadConfigPath("qemu.conf"); + g_autofree char *dir = g_build_filename(root, "etc", NULL); + g_autofree char *dst = g_build_filename(dir, "qemu.conf", NULL); + g_autofree char *contents = NULL; + gsize len; + + if (g_mkdir_with_parents(dir, 0755) < 0) { + g_printerr("%s: cannot create %s dir: %s\n", + argv[0], dir, g_strerror(errno)); + goto cleanup; + } + + + if (g_file_test(dst, G_FILE_TEST_EXISTS)) { + g_printerr("%s: %s file already exists\n", + argv[0], dst); + goto cleanup; + } + + if (!g_file_get_contents(src, &contents, &len, &error)) { + g_printerr("%s: cannot read %s: %s\n", + argv[0], src, error->message); + goto cleanup; + } + + if (!g_file_set_contents(dst, contents, len, &error)) { + g_printerr("%s: cannot write %s: %s\n", + argv[0], dst, error->message); + goto cleanup; + } + } + virFileActivateDirOverrideForProg(argv[0]); if (verbose) -- 2.26.0.rc2.42.g98cedd0233

3 2

[PATCH 0/2] qemu: Fix --keep-relative for block-commit/pull with blockdev
by Peter Krempa 30 Mar '20

30 Mar '20

Peter Krempa (2): qemu: block: Support VIR_DOMAIN_BLOCK_COMMIT/PULL/REBASE_RELATIVE with blockdev qemuDomainSnapshotDiskPrepareOne: Don't load the relative path with blockdev src/qemu/qemu_block.c | 46 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_block.h | 5 +++++ src/qemu/qemu_driver.c | 13 ++++++++++-- 3 files changed, 62 insertions(+), 2 deletions(-) -- 2.24.1

2 3

[libvirt-dockerfiles PATCH] Refresh after recent changes
by Andrea Bolognani 30 Mar '20

30 Mar '20

Paths to commands such as $MAKE and $NINJA are now exposed in the container's environment, and the symlinks necessary to make ccache work transparently are also included. The corresponding libvirt-jenkins-ci commit is 2563aebb6c5c. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile update rule. Plain text diff included for your convenience. buildenv-libosinfo-centos-7.zip | Bin 1665 -> 1782 bytes buildenv-libosinfo-centos-8.zip | Bin 594 -> 716 bytes buildenv-libosinfo-debian-10.zip | Bin 663 -> 783 bytes buildenv-libosinfo-debian-9.zip | Bin 683 -> 804 bytes buildenv-libosinfo-debian-sid.zip | Bin 663 -> 783 bytes ...denv-libosinfo-fedora-30-cross-mingw32.zip | Bin 629 -> 754 bytes ...denv-libosinfo-fedora-30-cross-mingw64.zip | Bin 631 -> 757 bytes buildenv-libosinfo-fedora-30.zip | Bin 544 -> 668 bytes buildenv-libosinfo-fedora-31.zip | Bin 544 -> 668 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 564 -> 688 bytes buildenv-libosinfo-opensuse-151.zip | Bin 570 -> 694 bytes buildenv-libosinfo-ubuntu-1604.zip | Bin 686 -> 808 bytes buildenv-libosinfo-ubuntu-1804.zip | Bin 686 -> 808 bytes buildenv-libvirt-centos-7.zip | Bin 1888 -> 2006 bytes buildenv-libvirt-centos-8.zip | Bin 802 -> 928 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 982 -> 1110 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 974 -> 1102 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 983 -> 1108 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 981 -> 1105 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 974 -> 1103 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 985 -> 1114 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 982 -> 1105 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 985 -> 1115 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 977 -> 1105 bytes buildenv-libvirt-debian-10.zip | Bin 908 -> 1032 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1018 -> 1143 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1009 -> 1134 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1014 -> 1140 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1010 -> 1134 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1021 -> 1145 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1014 -> 1137 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1017 -> 1147 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1013 -> 1137 bytes buildenv-libvirt-debian-9.zip | Bin 938 -> 1063 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 986 -> 1110 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 978 -> 1102 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 982 -> 1108 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 981 -> 1104 bytes ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 985 -> 1114 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 974 -> 1102 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 986 -> 1115 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 977 -> 1105 bytes buildenv-libvirt-debian-sid.zip | Bin 908 -> 1032 bytes buildenv-libvirt-fedora-30-cross-mingw32.zip | Bin 897 -> 1031 bytes buildenv-libvirt-fedora-30-cross-mingw64.zip | Bin 899 -> 1034 bytes buildenv-libvirt-fedora-30.zip | Bin 776 -> 904 bytes buildenv-libvirt-fedora-31.zip | Bin 776 -> 904 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 796 -> 925 bytes buildenv-libvirt-opensuse-151.zip | Bin 785 -> 914 bytes buildenv-libvirt-ubuntu-1604.zip | Bin 942 -> 1069 bytes buildenv-libvirt-ubuntu-1804.zip | Bin 943 -> 1069 bytes 51 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip index e4f5b87..185f258 100644 --- a/buildenv-libosinfo-centos-7.zip +++ b/buildenv-libosinfo-centos-7.zip @@ -80,9 +80,18 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ vala \ vim && \ yum autoremove -y && \ - yum clean all -y + yum clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja-build" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-centos-8.zip b/buildenv-libosinfo-centos-8.zip index 53a49d0..ce7c071 100644 --- a/buildenv-libosinfo-centos-8.zip +++ b/buildenv-libosinfo-centos-8.zip @@ -52,6 +52,15 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-debian-10.zip b/buildenv-libosinfo-debian-10.zip index 2592910..c97187e 100644 --- a/buildenv-libosinfo-debian-10.zip +++ b/buildenv-libosinfo-debian-10.zip @@ -53,6 +53,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-debian-9.zip b/buildenv-libosinfo-debian-9.zip index 72b04a2..16243b9 100644 --- a/buildenv-libosinfo-debian-9.zip +++ b/buildenv-libosinfo-debian-9.zip @@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-debian-sid.zip b/buildenv-libosinfo-debian-sid.zip index f81f758..ddb2598 100644 --- a/buildenv-libosinfo-debian-sid.zip +++ b/buildenv-libosinfo-debian-sid.zip @@ -53,6 +53,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-fedora-30-cross-mingw32.zip b/buildenv-libosinfo-fedora-30-cross-mingw32.zip index ff8776c..01cc808 100644 --- a/buildenv-libosinfo-fedora-30-cross-mingw32.zip +++ b/buildenv-libosinfo-fedora-30-cross-mingw32.zip @@ -50,7 +50,10 @@ RUN dnf update -y && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc) RUN dnf install -y \ mingw32-glib2 \ @@ -64,5 +67,11 @@ RUN dnf install -y \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "i686-w64-mingw32" ENV CONFIGURE_OPTS "--host=i686-w64-mingw32" diff --git a/buildenv-libosinfo-fedora-30-cross-mingw64.zip b/buildenv-libosinfo-fedora-30-cross-mingw64.zip index 24f38bc..a67bf61 100644 --- a/buildenv-libosinfo-fedora-30-cross-mingw64.zip +++ b/buildenv-libosinfo-fedora-30-cross-mingw64.zip @@ -50,7 +50,10 @@ RUN dnf update -y && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc) RUN dnf install -y \ mingw64-glib2 \ @@ -64,5 +67,11 @@ RUN dnf install -y \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "x86_64-w64-mingw32" ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32" diff --git a/buildenv-libosinfo-fedora-30.zip b/buildenv-libosinfo-fedora-30.zip index 69ea788..9d3773d 100644 --- a/buildenv-libosinfo-fedora-30.zip +++ b/buildenv-libosinfo-fedora-30.zip @@ -50,6 +50,15 @@ RUN dnf update -y && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-fedora-31.zip b/buildenv-libosinfo-fedora-31.zip index 4462104..22bb401 100644 --- a/buildenv-libosinfo-fedora-31.zip +++ b/buildenv-libosinfo-fedora-31.zip @@ -50,6 +50,15 @@ RUN dnf update -y && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-fedora-rawhide.zip b/buildenv-libosinfo-fedora-rawhide.zip index 6d6cefd..6ec74e8 100644 --- a/buildenv-libosinfo-fedora-rawhide.zip +++ b/buildenv-libosinfo-fedora-rawhide.zip @@ -51,6 +51,15 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ vala \ vim && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-opensuse-151.zip b/buildenv-libosinfo-opensuse-151.zip index 689344b..0998af6 100644 --- a/buildenv-libosinfo-opensuse-151.zip +++ b/buildenv-libosinfo-opensuse-151.zip @@ -49,9 +49,18 @@ RUN zypper update -y && \ sudo \ vala \ vim && \ - zypper clean --all + zypper clean --all && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-ubuntu-1604.zip b/buildenv-libosinfo-ubuntu-1604.zip index 5e3bc10..261edc5 100644 --- a/buildenv-libosinfo-ubuntu-1604.zip +++ b/buildenv-libosinfo-ubuntu-1604.zip @@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libosinfo-ubuntu-1804.zip b/buildenv-libosinfo-ubuntu-1804.zip index ff8df9a..0ccfade 100644 --- a/buildenv-libosinfo-ubuntu-1804.zip +++ b/buildenv-libosinfo-ubuntu-1804.zip @@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-centos-7.zip b/buildenv-libvirt-centos-7.zip index 96cd758..d6dc2e6 100644 --- a/buildenv-libvirt-centos-7.zip +++ b/buildenv-libvirt-centos-7.zip @@ -118,9 +118,18 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ xfsprogs-devel \ yajl-devel && \ yum autoremove -y && \ - yum clean all -y + yum clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja-build" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-centos-8.zip b/buildenv-libvirt-centos-8.zip index a63524b..a83cd07 100644 --- a/buildenv-libvirt-centos-8.zip +++ b/buildenv-libvirt-centos-8.zip @@ -91,6 +91,15 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ xfsprogs-devel \ yajl-devel && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip index 9bdfe9c..65c1169 100644 --- a/buildenv-libvirt-debian-10-cross-aarch64.zip +++ b/buildenv-libvirt-debian-10-cross-aarch64.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -108,5 +111,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "aarch64-linux-gnu" ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip index 84df535..0291ad7 100644 --- a/buildenv-libvirt-debian-10-cross-armv6l.zip +++ b/buildenv-libvirt-debian-10-cross-armv6l.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabi" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip index fa1b9ce..3a804ce 100644 --- a/buildenv-libvirt-debian-10-cross-armv7l.zip +++ b/buildenv-libvirt-debian-10-cross-armv7l.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabihf" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip index 22903cf..7ae41c0 100644 --- a/buildenv-libvirt-debian-10-cross-i686.zip +++ b/buildenv-libvirt-debian-10-cross-i686.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "i686-linux-gnu" ENV CONFIGURE_OPTS "--host=i686-linux-gnu" diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip index 2beba75..e09c5b8 100644 --- a/buildenv-libvirt-debian-10-cross-mips.zip +++ b/buildenv-libvirt-debian-10-cross-mips.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mips-linux-gnu" ENV CONFIGURE_OPTS "--host=mips-linux-gnu" diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip index c900d7a..bb4b78c 100644 --- a/buildenv-libvirt-debian-10-cross-mips64el.zip +++ b/buildenv-libvirt-debian-10-cross-mips64el.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mips64el-linux-gnuabi64" ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip index ae436b6..3b26f2d 100644 --- a/buildenv-libvirt-debian-10-cross-mipsel.zip +++ b/buildenv-libvirt-debian-10-cross-mipsel.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mipsel-linux-gnu" ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip index 475681a..ff3eabb 100644 --- a/buildenv-libvirt-debian-10-cross-ppc64le.zip +++ b/buildenv-libvirt-debian-10-cross-ppc64le.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "powerpc64le-linux-gnu" ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip index 6e88d47..3a2dd96 100644 --- a/buildenv-libvirt-debian-10-cross-s390x.zip +++ b/buildenv-libvirt-debian-10-cross-s390x.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "s390x-linux-gnu" ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" diff --git a/buildenv-libvirt-debian-10.zip b/buildenv-libvirt-debian-10.zip index 4b4a6e2..56022ea 100644 --- a/buildenv-libvirt-debian-10.zip +++ b/buildenv-libvirt-debian-10.zip @@ -97,6 +97,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip index 37752fc..204b547 100644 --- a/buildenv-libvirt-debian-9-cross-aarch64.zip +++ b/buildenv-libvirt-debian-9-cross-aarch64.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -112,5 +115,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "aarch64-linux-gnu" ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip index 66c50ae..97787a3 100644 --- a/buildenv-libvirt-debian-9-cross-armv6l.zip +++ b/buildenv-libvirt-debian-9-cross-armv6l.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -110,5 +113,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabi" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip index 8102db9..52f4e2f 100644 --- a/buildenv-libvirt-debian-9-cross-armv7l.zip +++ b/buildenv-libvirt-debian-9-cross-armv7l.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabihf" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip index 739fc5e..16f1b91 100644 --- a/buildenv-libvirt-debian-9-cross-mips.zip +++ b/buildenv-libvirt-debian-9-cross-mips.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mips-linux-gnu" ENV CONFIGURE_OPTS "--host=mips-linux-gnu" diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip index 3d38e7c..8090a60 100644 --- a/buildenv-libvirt-debian-9-cross-mips64el.zip +++ b/buildenv-libvirt-debian-9-cross-mips64el.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mips64el-linux-gnuabi64" ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip index d8af5f5..a7829ee 100644 --- a/buildenv-libvirt-debian-9-cross-mipsel.zip +++ b/buildenv-libvirt-debian-9-cross-mipsel.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mipsel-linux-gnu" ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip index b53581c..8707f80 100644 --- a/buildenv-libvirt-debian-9-cross-ppc64le.zip +++ b/buildenv-libvirt-debian-9-cross-ppc64le.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "powerpc64le-linux-gnu" ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip index 2c9273f..503828f 100644 --- a/buildenv-libvirt-debian-9-cross-s390x.zip +++ b/buildenv-libvirt-debian-9-cross-s390x.zip @@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -111,5 +114,11 @@ RUN pip3 install \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "s390x-linux-gnu" ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip index 66ca52f..b4cf4c9 100644 --- a/buildenv-libvirt-debian-9.zip +++ b/buildenv-libvirt-debian-9.zip @@ -98,9 +98,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip index 79262a1..bb3edc2 100644 --- a/buildenv-libvirt-debian-sid-cross-aarch64.zip +++ b/buildenv-libvirt-debian-sid-cross-aarch64.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -108,5 +111,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "aarch64-linux-gnu" ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip index 682334f..d7ba3d1 100644 --- a/buildenv-libvirt-debian-sid-cross-armv6l.zip +++ b/buildenv-libvirt-debian-sid-cross-armv6l.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabi" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip index 529676e..532722b 100644 --- a/buildenv-libvirt-debian-sid-cross-armv7l.zip +++ b/buildenv-libvirt-debian-sid-cross-armv7l.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "arm-linux-gnueabihf" ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip index 46abb22..1fcde39 100644 --- a/buildenv-libvirt-debian-sid-cross-i686.zip +++ b/buildenv-libvirt-debian-sid-cross-i686.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "i686-linux-gnu" ENV CONFIGURE_OPTS "--host=i686-linux-gnu" diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip index 799c6f1..4ef667d 100644 --- a/buildenv-libvirt-debian-sid-cross-mips64el.zip +++ b/buildenv-libvirt-debian-sid-cross-mips64el.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mips64el-linux-gnuabi64" ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip index 2cfbe46..15e3674 100644 --- a/buildenv-libvirt-debian-sid-cross-mipsel.zip +++ b/buildenv-libvirt-debian-sid-cross-mipsel.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "mipsel-linux-gnu" ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip index da70b99..314d5f7 100644 --- a/buildenv-libvirt-debian-sid-cross-ppc64le.zip +++ b/buildenv-libvirt-debian-sid-cross-ppc64le.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "powerpc64le-linux-gnu" ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip index d5b1174..a765a13 100644 --- a/buildenv-libvirt-debian-sid-cross-s390x.zip +++ b/buildenv-libvirt-debian-sid-cross-s390x.zip @@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "s390x-linux-gnu" ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" diff --git a/buildenv-libvirt-debian-sid.zip b/buildenv-libvirt-debian-sid.zip index 46b1f52..b1daf91 100644 --- a/buildenv-libvirt-debian-sid.zip +++ b/buildenv-libvirt-debian-sid.zip @@ -97,6 +97,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-fedora-30-cross-mingw32.zip b/buildenv-libvirt-fedora-30-cross-mingw32.zip index df8f7a7..ba90aa6 100644 --- a/buildenv-libvirt-fedora-30-cross-mingw32.zip +++ b/buildenv-libvirt-fedora-30-cross-mingw32.zip @@ -94,7 +94,10 @@ RUN dnf update -y && \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc) RUN dnf install -y \ mingw32-curl \ @@ -114,5 +117,11 @@ RUN dnf install -y \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "i686-w64-mingw32" ENV CONFIGURE_OPTS "--host=i686-w64-mingw32" diff --git a/buildenv-libvirt-fedora-30-cross-mingw64.zip b/buildenv-libvirt-fedora-30-cross-mingw64.zip index d2b79b8..ade62a8 100644 --- a/buildenv-libvirt-fedora-30-cross-mingw64.zip +++ b/buildenv-libvirt-fedora-30-cross-mingw64.zip @@ -94,7 +94,10 @@ RUN dnf update -y && \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc) RUN dnf install -y \ mingw64-curl \ @@ -114,5 +117,11 @@ RUN dnf install -y \ ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + ENV ABI "x86_64-w64-mingw32" ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32" diff --git a/buildenv-libvirt-fedora-30.zip b/buildenv-libvirt-fedora-30.zip index ccc549e..dc31603 100644 --- a/buildenv-libvirt-fedora-30.zip +++ b/buildenv-libvirt-fedora-30.zip @@ -94,6 +94,15 @@ RUN dnf update -y && \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-fedora-31.zip b/buildenv-libvirt-fedora-31.zip index 638a89f..10968af 100644 --- a/buildenv-libvirt-fedora-31.zip +++ b/buildenv-libvirt-fedora-31.zip @@ -94,6 +94,15 @@ RUN dnf update -y && \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-fedora-rawhide.zip b/buildenv-libvirt-fedora-rawhide.zip index 5a53c70..cfb5ca9 100644 --- a/buildenv-libvirt-fedora-rawhide.zip +++ b/buildenv-libvirt-fedora-rawhide.zip @@ -95,6 +95,15 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ - dnf clean all -y + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-opensuse-151.zip b/buildenv-libvirt-opensuse-151.zip index 1a835c5..0103270 100644 --- a/buildenv-libvirt-opensuse-151.zip +++ b/buildenv-libvirt-opensuse-151.zip @@ -91,9 +91,18 @@ RUN zypper update -y && \ wireshark-devel \ xen-devel \ xfsprogs-devel && \ - zypper clean --all + zypper clean --all && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-ubuntu-1604.zip b/buildenv-libvirt-ubuntu-1604.zip index 0713bf8..a4910a6 100644 --- a/buildenv-libvirt-ubuntu-1604.zip +++ b/buildenv-libvirt-ubuntu-1604.zip @@ -99,9 +99,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/buildenv-libvirt-ubuntu-1804.zip b/buildenv-libvirt-ubuntu-1804.zip index a18c97a..a52fcfb 100644 --- a/buildenv-libvirt-ubuntu-1804.zip +++ b/buildenv-libvirt-ubuntu-1804.zip @@ -99,9 +99,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales + dpkg-reconfigure locales && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) RUN pip3 install \ meson==0.49.0 ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -- 2.25.1

1 0

[GSoC] Interested Student for the Project: 'Introducing job control to the storage driver'
by Prathamesh Chavan 30 Mar '20

30 Mar '20

Hi Everyone, I'm Prathamesh Chavan, a final year student at studying Computer Science and Engineering at IIT Kharagpur. I've been part of GSoC'17 under the Git Organization and have an internship experience at Nutanix, India during last summer. I'm also currently working on a tired file system with software wear management for nvm technologies as my master project. I was interested in contributing to the project: "Introducing job control to the storage driver" under Google Summer of Code - 2020. I was currently going through the codebase and also was successfully able to build it. It would be great if I was assigned a byte-task regarding the same which could help me understand the project better, Thanks, Prathamesh Chavan

3 5

[PATCH 0/5] Introduce getHost support for ARM cpus
by Zhenyu Zheng 30 Mar '20

30 Mar '20

Introduce getHost support for ARM cpus. First add some common ARM server models to cpu_map, then add some helper methods to parse and load them. The 'lscpu' command from 'util-linux' provides very good data for cpu information, we can parse them directly. Zhenyu Zheng (5): cpu_map: Introduce arm CPU models cpu: Introduce virCPUarmData to virCPUData cpu: Introduce arm related structs cpu: Add helper functions to parse vendor and model for ARM cpu: Introduce getHost supoort for ARM src/cpu/cpu.h | 2 + src/cpu/cpu_arm.c | 412 +++++++++++++++++++++++++++++- src/cpu/cpu_arm_data.h | 32 +++ src/cpu_map/Makefile.inc.am | 7 + src/cpu_map/arm_Falkor.xml | 15 ++ src/cpu_map/arm_Kunpeng-920.xml | 23 ++ src/cpu_map/arm_ThunderX299xx.xml | 15 ++ src/cpu_map/arm_cortex-a53.xml | 15 ++ src/cpu_map/arm_cortex-a57.xml | 14 + src/cpu_map/arm_cortex-a72.xml | 14 + src/cpu_map/arm_vendors.xml | 14 + src/cpu_map/index.xml | 16 ++ 12 files changed, 577 insertions(+), 2 deletions(-) create mode 100644 src/cpu/cpu_arm_data.h create mode 100644 src/cpu_map/arm_Falkor.xml create mode 100644 src/cpu_map/arm_Kunpeng-920.xml create mode 100644 src/cpu_map/arm_ThunderX299xx.xml create mode 100644 src/cpu_map/arm_cortex-a53.xml create mode 100644 src/cpu_map/arm_cortex-a57.xml create mode 100644 src/cpu_map/arm_cortex-a72.xml create mode 100644 src/cpu_map/arm_vendors.xml -- 2.26.0.windows.1

3 8

[libvirt-jenkins-ci PATCH 0/3] lcitool: Include some paths in the generated Dockerfiles
by Andrea Bolognani 30 Mar '20

30 Mar '20

Andrea Bolognani (3): lcitool: Include paths in the inventory lcitool: Refactor varmap generation a bit lcitool: Include some paths in the generated Dockerfiles guests/host_vars/libvirt-centos-7/main.yml | 9 +++ guests/host_vars/libvirt-centos-8/main.yml | 9 +++ guests/host_vars/libvirt-debian-10/main.yml | 9 +++ guests/host_vars/libvirt-debian-9/main.yml | 9 +++ guests/host_vars/libvirt-debian-sid/main.yml | 9 +++ guests/host_vars/libvirt-fedora-30/main.yml | 9 +++ guests/host_vars/libvirt-fedora-31/main.yml | 9 +++ .../host_vars/libvirt-fedora-rawhide/main.yml | 9 +++ guests/host_vars/libvirt-freebsd-11/main.yml | 9 +++ guests/host_vars/libvirt-freebsd-12/main.yml | 9 +++ .../libvirt-freebsd-current/main.yml | 9 +++ .../host_vars/libvirt-opensuse-151/main.yml | 9 +++ guests/host_vars/libvirt-ubuntu-1604/main.yml | 9 +++ guests/host_vars/libvirt-ubuntu-1804/main.yml | 9 +++ guests/lcitool | 22 ++++-- guests/playbooks/update/main.yml | 1 - guests/playbooks/update/tasks/paths.yml | 71 ------------------- 17 files changed, 142 insertions(+), 78 deletions(-) delete mode 100644 guests/playbooks/update/tasks/paths.yml -- 2.25.1

2 6

[PATCH 0/3] Preserve query component of path for HTTP disks
by Peter Krempa 30 Mar '20

30 Mar '20

Peter Krempa (3): virStorageSourceParseBackingURI: Preserve query parts of URI qemuBlockStorageSourceGetURI: Properly preserve query component qemuxml2argv: Test the query portion for HTTP disks src/qemu/qemu_block.c | 6 ++++++ src/util/virstoragefile.c | 15 +++++++++++---- .../disk-network-http.x86_64-latest.args | 5 +++-- tests/qemuxml2argvdata/disk-network-http.xml | 2 +- .../disk-network-http.x86_64-latest.xml | 2 +- tests/virstoragetest.c | 4 ++-- 6 files changed, 24 insertions(+), 10 deletions(-) -- 2.24.1

3 5