* [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
@ 2022-03-10 17:03 Joe Slater
2022-03-10 19:41 ` [meta-virtualization] " Bruce Ashfield
0 siblings, 1 reply; 3+ messages in thread
From: Joe Slater @ 2022-03-10 17:03 UTC (permalink / raw)
To: meta-virtualization; +Cc: joe.slater, randy.macleod
src/remote/meson.build does not create a dependency on
the generated lxc_protocol.h for remote_daemon.c. Restructure
how this file is generated to allow the dependency.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
.../libvirt/libvirt/lxc_protocol.patch | 104 ++++++++++++++++++
recipes-extended/libvirt/libvirt_7.2.0.bb | 1 +
2 files changed, 105 insertions(+)
create mode 100644 recipes-extended/libvirt/libvirt/lxc_protocol.patch
diff --git a/recipes-extended/libvirt/libvirt/lxc_protocol.patch b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
new file mode 100644
index 00000000..595c3fe4
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
@@ -0,0 +1,104 @@
+From 38af66c1a9c4cdeb256eeaf563c6807757c370ce Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Wed, 9 Mar 2022 23:17:33 +0000
+Subject: [PATCH] working commit
+
+remote_daemon.c and others need the generated header lxc_protocol.h,
+but do not have it as a dependency in meson.build. This means that
+builds will randomly (ok, very occasionally) fail. Restructure how the
+header is built so that remote_daemon can have it as a dependency.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+---
+ src/remote/meson.build | 48 ++++++++++++++++++++++++------------------
+ 1 file changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/remote/meson.build b/src/remote/meson.build
+index 0a18826..31a30ee 100644
+--- a/src/remote/meson.build
++++ b/src/remote/meson.build
+@@ -1,27 +1,11 @@
+-remote_driver_sources = [
+- 'remote_driver.c',
+- 'remote_sockets.c',
+-]
+-
+-remote_driver_generated = []
++remote_xxx_generated = []
+
+ foreach name : [ 'remote', 'qemu', 'lxc' ]
+- client_bodies_h = '@0@_client_bodies.h'.format(name)
+ protocol_c = '@0@_protocol.c'.format(name)
+ protocol_h = '@0@_protocol.h'.format(name)
+ protocol_x = '@0@_protocol.x'.format(name)
+
+- remote_driver_generated += custom_target(
+- client_bodies_h,
+- input: protocol_x,
+- output: client_bodies_h,
+- command: [
+- gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
+- ],
+- capture: true,
+- )
+-
+- remote_driver_generated += custom_target(
++ remote_xxx_generated += custom_target(
+ protocol_h,
+ input: protocol_x,
+ output: protocol_h,
+@@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
+ ],
+ )
+
+- remote_driver_generated += custom_target(
++ remote_xxx_generated += custom_target(
+ protocol_c,
+ input: protocol_x,
+ output: protocol_c,
+@@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
+ rpc_probe_files += files(protocol_x)
+ endforeach
+
++
++remote_driver_sources = [
++ 'remote_driver.c',
++ 'remote_sockets.c',
++]
++
++remote_driver_generated =remote_xxx_generated
++
++foreach name : [ 'remote', 'qemu', 'lxc' ]
++ client_bodies_h = '@0@_client_bodies.h'.format(name)
++ protocol_x = '@0@_protocol.x'.format(name)
++
++ remote_driver_generated += custom_target(
++ client_bodies_h,
++ input: protocol_x,
++ output: client_bodies_h,
++ command: [
++ gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
++ ],
++ capture: true,
++ )
++
++endforeach
++
+ remote_daemon_sources = files(
+ 'remote_daemon.c',
+ 'remote_daemon_config.c',
+@@ -49,7 +57,7 @@ remote_daemon_sources = files(
+ 'remote_daemon_stream.c',
+ )
+
+-remote_daemon_generated = []
++remote_daemon_generated = remote_xxx_generated
+
+ virt_ssh_helper_sources = files(
+ 'remote_sockets.c',
+--
+2.32.0
+
diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb b/recipes-extended/libvirt/libvirt_7.2.0.bb
index 5ad7d59e..04c66eb5 100644
--- a/recipes-extended/libvirt/libvirt_7.2.0.bb
+++ b/recipes-extended/libvirt/libvirt_7.2.0.bb
@@ -31,6 +31,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \
file://0001-security-fix-SELinux-label-generation-logic.patch \
file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch \
+ file://lxc_protocol.patch \
"
SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3"
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-virtualization] [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
2022-03-10 17:03 [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h Joe Slater
@ 2022-03-10 19:41 ` Bruce Ashfield
2022-03-10 20:22 ` Slater, Joseph
0 siblings, 1 reply; 3+ messages in thread
From: Bruce Ashfield @ 2022-03-10 19:41 UTC (permalink / raw)
To: Joe Slater; +Cc: meta-virtualization, randy.macleod
s/libvert/libvirt/
In message: [meta-virtualization] [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
on 10/03/2022 Joe Slater wrote:
> src/remote/meson.build does not create a dependency on
> the generated lxc_protocol.h for remote_daemon.c. Restructure
> how this file is generated to allow the dependency.
Can you document the configuration (i.e. packageconfigs, etc) that
are causing this ? I'm not seeing the same thing, so something
different is going on.
>
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
> .../libvirt/libvirt/lxc_protocol.patch | 104 ++++++++++++++++++
> recipes-extended/libvirt/libvirt_7.2.0.bb | 1 +
> 2 files changed, 105 insertions(+)
> create mode 100644 recipes-extended/libvirt/libvirt/lxc_protocol.patch
>
> diff --git a/recipes-extended/libvirt/libvirt/lxc_protocol.patch b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> new file mode 100644
> index 00000000..595c3fe4
> --- /dev/null
> +++ b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> @@ -0,0 +1,104 @@
> +From 38af66c1a9c4cdeb256eeaf563c6807757c370ce Mon Sep 17 00:00:00 2001
> +From: Joe Slater <joe.slater@windriver.com>
> +Date: Wed, 9 Mar 2022 23:17:33 +0000
> +Subject: [PATCH] working commit
> +
> +remote_daemon.c and others need the generated header lxc_protocol.h,
> +but do not have it as a dependency in meson.build. This means that
> +builds will randomly (ok, very occasionally) fail. Restructure how the
> +header is built so that remote_daemon can have it as a dependency.
> +
> +Upstream-Status: Pending
Is there a link to the upstream submission ? That way we can
follow along ?
Bruce
> +
> +Signed-off-by: Joe Slater <joe.slater@windriver.com>
> +
> +---
> + src/remote/meson.build | 48 ++++++++++++++++++++++++------------------
> + 1 file changed, 28 insertions(+), 20 deletions(-)
> +
> +diff --git a/src/remote/meson.build b/src/remote/meson.build
> +index 0a18826..31a30ee 100644
> +--- a/src/remote/meson.build
> ++++ b/src/remote/meson.build
> +@@ -1,27 +1,11 @@
> +-remote_driver_sources = [
> +- 'remote_driver.c',
> +- 'remote_sockets.c',
> +-]
> +-
> +-remote_driver_generated = []
> ++remote_xxx_generated = []
> +
> + foreach name : [ 'remote', 'qemu', 'lxc' ]
> +- client_bodies_h = '@0@_client_bodies.h'.format(name)
> + protocol_c = '@0@_protocol.c'.format(name)
> + protocol_h = '@0@_protocol.h'.format(name)
> + protocol_x = '@0@_protocol.x'.format(name)
> +
> +- remote_driver_generated += custom_target(
> +- client_bodies_h,
> +- input: protocol_x,
> +- output: client_bodies_h,
> +- command: [
> +- gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
> +- ],
> +- capture: true,
> +- )
> +-
> +- remote_driver_generated += custom_target(
> ++ remote_xxx_generated += custom_target(
> + protocol_h,
> + input: protocol_x,
> + output: protocol_h,
> +@@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> + ],
> + )
> +
> +- remote_driver_generated += custom_target(
> ++ remote_xxx_generated += custom_target(
> + protocol_c,
> + input: protocol_x,
> + output: protocol_c,
> +@@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> + rpc_probe_files += files(protocol_x)
> + endforeach
> +
> ++
> ++remote_driver_sources = [
> ++ 'remote_driver.c',
> ++ 'remote_sockets.c',
> ++]
> ++
> ++remote_driver_generated =remote_xxx_generated
> ++
> ++foreach name : [ 'remote', 'qemu', 'lxc' ]
> ++ client_bodies_h = '@0@_client_bodies.h'.format(name)
> ++ protocol_x = '@0@_protocol.x'.format(name)
> ++
> ++ remote_driver_generated += custom_target(
> ++ client_bodies_h,
> ++ input: protocol_x,
> ++ output: client_bodies_h,
> ++ command: [
> ++ gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
> ++ ],
> ++ capture: true,
> ++ )
> ++
> ++endforeach
> ++
> + remote_daemon_sources = files(
> + 'remote_daemon.c',
> + 'remote_daemon_config.c',
> +@@ -49,7 +57,7 @@ remote_daemon_sources = files(
> + 'remote_daemon_stream.c',
> + )
> +
> +-remote_daemon_generated = []
> ++remote_daemon_generated = remote_xxx_generated
> +
> + virt_ssh_helper_sources = files(
> + 'remote_sockets.c',
> +--
> +2.32.0
> +
> diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb b/recipes-extended/libvirt/libvirt_7.2.0.bb
> index 5ad7d59e..04c66eb5 100644
> --- a/recipes-extended/libvirt/libvirt_7.2.0.bb
> +++ b/recipes-extended/libvirt/libvirt_7.2.0.bb
> @@ -31,6 +31,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
> file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \
> file://0001-security-fix-SELinux-label-generation-logic.patch \
> file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch \
> + file://lxc_protocol.patch \
> "
>
> SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3"
> --
> 2.35.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7084): https://lists.yoctoproject.org/g/meta-virtualization/message/7084
> Mute This Topic: https://lists.yoctoproject.org/mt/89691200/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [meta-virtualization] [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h
2022-03-10 19:41 ` [meta-virtualization] " Bruce Ashfield
@ 2022-03-10 20:22 ` Slater, Joseph
0 siblings, 0 replies; 3+ messages in thread
From: Slater, Joseph @ 2022-03-10 20:22 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization@lists.yoctoproject.org, MacLeod, Randy
I have never seen the failure. This is from a build that did see it.
NOTE: recipe qemu-6.2.0-r0: task do_package_qa: Succeeded
NOTE: recipe libvirt-7.2.0-r0: task do_configure: Succeeded
NOTE: Running task 7977 of 8013 (/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/layers/meta-virtualization/recipes-extended/libvirt/libvirt_7.2.0.bb:do_compile)
NOTE: recipe libvirt-7.2.0-r0: task do_compile: Started
ERROR: libvirt-7.2.0-r0 do_compile: ExecutionError('/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/temp/run.do_compile.3629283', 1, None, None)
Transferring /buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/temp/log.do_compile.3629283 to /buildarea1/master-wr/log/Benchmark/intel-x86-64/customized_systemd/builder_preempt-rt_ovp-kvm_OE_systemd/220308-063739/boottime/intel-x86-64_platform/builder.None.preemptrt.true.ovpkvm.lpgbuildcdcWASSP_LINUX_MASTER_WRtestcaseswrlinuxutilsfrags/errorlogs
ERROR: Logfile of failure stored in: /buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/temp/log.do_compile.3629283
Log data follows:
| DEBUG: Executing shell function do_compile
| [1/1274] Generating src/esx/virtesxgensources with a custom command
| [2/1274] Generating src/rpc/virkeepaliveprotocol.h with a custom command
| [3/1274] Generating src/rpc/virkeepaliveprotocol.c with a custom command
...
Wold-style-definition -Wopenmp-simd -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wpacked-not-aligned -Wparentheses -Wpointer-arith -Wpointer-compare -Wpointer-sign -Wpointer-to-int-cast -Wpragmas -Wpsabi -Wrestrict -Wreturn-local-addr -Wreturn-type -Wscalar-storage-order -Wsequence-point -Wshadow -Wshift-count-negative -Wshift-count-overflow -Wshift-negative-value -Wsizeof-array-argument -Wsizeof-pointer-div -Wsizeof-pointer-memaccess -Wstrict-aliasing -Wstrict-prototypes -Wstringop-truncation -Wsuggest-attribute=cold -Wsuggest-attribute=const -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wsuggest-final-methods -Wsuggest-final-types -Wswitch -Wswitch-bool -Wswitch-unreachable -Wsync-nand -Wtautological-compare -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized -Wunknown-pragmas -Wunused -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function -Wunused-label -Wunused-local-typedefs -Wunused-parameter -Wunused-result -Wunused-value -Wunused-variable -Wvarargs -Wvariadic-macros -Wvector-operation-performance -Wvla -Wvolatile-register-var -Wwrite-strings -Walloc-size-larger-than=9223372036854775807 -Warray-bounds=2 -Wattribute-alias=2 -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=5 -Wnormalized=nfc -Wshift-overflow=2 -Wstringop-overflow=2 -Wunused-const-variable=2 -Wno-sign-compare -Wno-cast-function-type -Wjump-misses-init -Wswitch-enum -Wno-format-nonliteral -Wno-format-truncation -Wframe-larger-than=4096 -fexceptions -fasynchronous-unwind-tables -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -fstack-protector-strong -Wdouble-promotion -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0=/usr/src/debug/libvirt/7.2.0-r0 -fdebug-prefix-map=/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0=/usr/src/debug/libvirt/7.2.0-r0 -fdebug-prefix-map=/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/recipe-sysroot= -fdebug-prefix-map=/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/recipe-sysroot-native= -fPIE -pthread -DIN_LIBVIRT '-Dabs_top_builddir="/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/build"' '-Dabs_top_srcdir="/buildarea1/master-wr/build/Benchmark/customized_systemd/220308-063739/lxbuilds/builder_platform_up/intel-x86-64-preempt-rt-ovp-kvm/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/libvirt/7.2.0-r0/libvirt-7.2.0"' '-DDAEMON_NAME="virtstoraged"' '-DMODULE_NAME="storage"' -MD -MQ src/virtstoraged.p/remote_remote_daemon.c.o -MF src/virtstoraged.p/remote_remote_daemon.c.o.d -o src/virtstoraged.p/remote_remote_daemon.c.o -c ../libvirt-7.2.0/src/remote/remote_daemon.c
| In file included from ../libvirt-7.2.0/src/remote/remote_daemon.c:39:
| ../libvirt-7.2.0/src/remote/remote_daemon.h:29:10: fatal error: lxc_protocol.h: No such file or directory
| 29 | #include "lxc_protocol.h"
| | ^~~~~~~~~~~~~~~~
| compilation terminated.
| [293/1274] Compiling C object src/admin/libvirt_admin_driver.a.p/meson-generated_.._admin_protocol.c.o
| [294/1274] Linking static target src/node_device/libvirt_driver_nodedev_impl.a
| [295/1274] Compiling C object src/admin/libvirt_admin_driver.a.p/admin_server.c.o
| [296/1274] Linking static target src/security/libvirt_security_manager.a
| [297/1274] Compiling C object src/openvz/libvirt_openvz.a.p/openvz_conf.c.o
| [298/1274] Compiling C object src/qemu/libvirt_driver_qemu_impl.a.p/qemu_alias.c.o
| [299/1274] Compiling C object src/esx/libvirt_driver_esx.a.p/esx_network_driver.c.o
| [300/1274] Compiling C object src/hypervisor/libvirt_hypervisor.a.p/virhostdev.c.o
| [301/1274] Compiling C object src/qemu/libvirt_driver_qemu_impl.a.p/qemu_interop_config.c.o
| [302/1274] Compiling C object src/admin/libvirt_admin_driver.a.p/admin_server_dispatch.c.o
| [303/1274] Compiling C object src/lxc/libvirt_driver_lxc_impl.a.p/lxc_monitor.c.o
| [304/1274] Compiling C object src/qemu/libvirt_driver_qemu_impl.a.p/qemu_hostdev.c.o
| [305/1274] Compiling C object src/lxc/libvirt_driver_lxc_impl.a.p/lxc_hostdev.c.o
| [306/1274] Compiling C object src/qemu/libvirt_driver_qemu_impl.a.p/qemu_virtiofs.c.o
| [307/1274] Compiling C object src/esx/libvirt_driver_esx.a.p/esx_storage_backend_iscsi.c.o
| [308/1274] Compiling C object src/qemu/libvirt_driver_qemu_impl.a.p/qemu_qapi.c.o
...
You have to look at the ninja.build file to see that remote_daemon.c.o is not dependent on lxc_protocol.h
existing. But, remote_driver.c.o does have the dependency.
I haven't sent it upstream yet.
Joe
> -----Original Message-----
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> Sent: Thursday, March 10, 2022 11:42 AM
> To: Slater, Joseph <joe.slater@windriver.com>
> Cc: meta-virtualization@lists.yoctoproject.org; MacLeod, Randy
> <Randy.MacLeod@windriver.com>
> Subject: Re: [meta-virtualization] [meta-virt][PATCH 1/1] libvert: modify
> dependencies on lxc_protocol.h
>
> s/libvert/libvirt/
>
> In message: [meta-virtualization] [meta-virt][PATCH 1/1] libvert: modify
> dependencies on lxc_protocol.h on 10/03/2022 Joe Slater wrote:
>
> > src/remote/meson.build does not create a dependency on the generated
> > lxc_protocol.h for remote_daemon.c. Restructure how this file is
> > generated to allow the dependency.
>
> Can you document the configuration (i.e. packageconfigs, etc) that are causing
> this ? I'm not seeing the same thing, so something different is going on.
>
> >
> > Signed-off-by: Joe Slater <joe.slater@windriver.com>
> > ---
> > .../libvirt/libvirt/lxc_protocol.patch | 104 ++++++++++++++++++
> > recipes-extended/libvirt/libvirt_7.2.0.bb | 1 +
> > 2 files changed, 105 insertions(+)
> > create mode 100644
> > recipes-extended/libvirt/libvirt/lxc_protocol.patch
> >
> > diff --git a/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> > b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> > new file mode 100644
> > index 00000000..595c3fe4
> > --- /dev/null
> > +++ b/recipes-extended/libvirt/libvirt/lxc_protocol.patch
> > @@ -0,0 +1,104 @@
> > +From 38af66c1a9c4cdeb256eeaf563c6807757c370ce Mon Sep 17 00:00:00
> > +2001
> > +From: Joe Slater <joe.slater@windriver.com>
> > +Date: Wed, 9 Mar 2022 23:17:33 +0000
> > +Subject: [PATCH] working commit
> > +
> > +remote_daemon.c and others need the generated header lxc_protocol.h,
> > +but do not have it as a dependency in meson.build. This means that
> > +builds will randomly (ok, very occasionally) fail. Restructure how
> > +the header is built so that remote_daemon can have it as a dependency.
> > +
> > +Upstream-Status: Pending
>
> Is there a link to the upstream submission ? That way we can follow along ?
>
> Bruce
>
> > +
> > +Signed-off-by: Joe Slater <joe.slater@windriver.com>
> > +
> > +---
> > + src/remote/meson.build | 48
> > +++++++++++++++++++++++++------------------
> > + 1 file changed, 28 insertions(+), 20 deletions(-)
> > +
> > +diff --git a/src/remote/meson.build b/src/remote/meson.build index
> > +0a18826..31a30ee 100644
> > +--- a/src/remote/meson.build
> > ++++ b/src/remote/meson.build
> > +@@ -1,27 +1,11 @@
> > +-remote_driver_sources = [
> > +- 'remote_driver.c',
> > +- 'remote_sockets.c',
> > +-]
> > +-
> > +-remote_driver_generated = []
> > ++remote_xxx_generated = []
> > +
> > + foreach name : [ 'remote', 'qemu', 'lxc' ]
> > +- client_bodies_h = '@0@_client_bodies.h'.format(name)
> > + protocol_c = '@0@_protocol.c'.format(name)
> > + protocol_h = '@0@_protocol.h'.format(name)
> > + protocol_x = '@0@_protocol.x'.format(name)
> > +
> > +- remote_driver_generated += custom_target(
> > +- client_bodies_h,
> > +- input: protocol_x,
> > +- output: client_bodies_h,
> > +- command: [
> > +- gendispatch_prog, '--mode=client', name, name.to_upper(), '@INPUT@',
> > +- ],
> > +- capture: true,
> > +- )
> > +-
> > +- remote_driver_generated += custom_target(
> > ++ remote_xxx_generated += custom_target(
> > + protocol_h,
> > + input: protocol_x,
> > + output: protocol_h,
> > +@@ -30,7 +14,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> > + ],
> > + )
> > +
> > +- remote_driver_generated += custom_target(
> > ++ remote_xxx_generated += custom_target(
> > + protocol_c,
> > + input: protocol_x,
> > + output: protocol_c,
> > +@@ -42,6 +26,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
> > + rpc_probe_files += files(protocol_x) endforeach
> > +
> > ++
> > ++remote_driver_sources = [
> > ++ 'remote_driver.c',
> > ++ 'remote_sockets.c',
> > ++]
> > ++
> > ++remote_driver_generated =remote_xxx_generated
> > ++
> > ++foreach name : [ 'remote', 'qemu', 'lxc' ]
> > ++ client_bodies_h = '@0@_client_bodies.h'.format(name)
> > ++ protocol_x = '@0@_protocol.x'.format(name)
> > ++
> > ++ remote_driver_generated += custom_target(
> > ++ client_bodies_h,
> > ++ input: protocol_x,
> > ++ output: client_bodies_h,
> > ++ command: [
> > ++ gendispatch_prog, '--mode=client', name, name.to_upper(),
> '@INPUT@',
> > ++ ],
> > ++ capture: true,
> > ++ )
> > ++
> > ++endforeach
> > ++
> > + remote_daemon_sources = files(
> > + 'remote_daemon.c',
> > + 'remote_daemon_config.c',
> > +@@ -49,7 +57,7 @@ remote_daemon_sources = files(
> > + 'remote_daemon_stream.c',
> > + )
> > +
> > +-remote_daemon_generated = []
> > ++remote_daemon_generated = remote_xxx_generated
> > +
> > + virt_ssh_helper_sources = files(
> > + 'remote_sockets.c',
> > +--
> > +2.32.0
> > +
> > diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb
> > b/recipes-extended/libvirt/libvirt_7.2.0.bb
> > index 5ad7d59e..04c66eb5 100644
> > --- a/recipes-extended/libvirt/libvirt_7.2.0.bb
> > +++ b/recipes-extended/libvirt/libvirt_7.2.0.bb
> > @@ -31,6 +31,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-
> ${PV}.tar.xz;name=libvirt \
> > file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \
> > file://0001-security-fix-SELinux-label-generation-logic.patch \
> >
> > file://0001-storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch
> > \
> > + file://lxc_protocol.patch \
> > "
> >
> > SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3"
> > --
> > 2.35.1
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#7084): https://lists.yoctoproject.org/g/meta-
> virtualization/message/7084
> > Mute This Topic: https://lists.yoctoproject.org/mt/89691200/1050810
> > Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
> [bruce.ashfield@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-10 20:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-10 17:03 [meta-virt][PATCH 1/1] libvert: modify dependencies on lxc_protocol.h Joe Slater
2022-03-10 19:41 ` [meta-virtualization] " Bruce Ashfield
2022-03-10 20:22 ` Slater, Joseph
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.