[dts] [PATCH V2 8/8] conf: power suite series support meson

[Tu, Lijuan]

CONFLICT (content): Merge conflict in conf/app_name.cfg

> -----Original Message-----
> From: dts <dts-bounces at dpdk.org> On Behalf Of yufengmx
> Sent: 2020年9月17日 9:05
> To: dts at dpdk.org; Yao, Lei A <lei.a.yao at intel.com>
> Cc: Mo, YufengX <yufengx.mo at intel.com>
> Subject: [dts] [PATCH V2 8/8] conf: power suite series support meson
> 
> 
> support meson build.
> 
> Signed-off-by: yufengmx <yufengx.mo at intel.com>
> ---
>  conf/app_name.cfg | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/conf/app_name.cfg b/conf/app_name.cfg index ff58137..c283c03
> 100644
> --- a/conf/app_name.cfg
> +++ b/conf/app_name.cfg
> @@ -62,6 +62,9 @@ hotplug_mp=target/examples/dpdk-hotplug_mp
>  mp_server=target/examples/dpdk-mp_server
>  simple_mp=target/examples/dpdk-simple_mp
>  symmetric_mp=target/examples/dpdk-symmetric_mp
> +vm_power_manager=target/examples/dpdk-vm_power_manager
> +guest_cli=target/examples/dpdk-guest_cli
> +distributor=target/examples/dpdk-distributor
>  [makefile]
>  pdump=target/app/dpdk-pdump
>  proc-info=target/app/dpdk-procinfo
> @@ -119,3 +122,7 @@
> hotplug_mp=examples/multi_process/hotplug_mp/build/app/hotplug_mp
> 
> mp_server=examples/multi_process/client_server_mp/mp_server/build/app/mp
> _server
>  simple_mp=examples/multi_process/simple_mp/build/app/simple_mp
> 
> symmetric_mp=examples/multi_process/symmetric_mp/build/app/symmetric_
> mp
> +vm_power_manager=examples/vm_power_manager/build/vm_power_mgr
> +guest_cli=examples/vm_power_manager/guest_cli/build/guest_vm_power_m
> gr
> +distributor=examples/distributor/build/distributor_app
> +
> --
> 2.21.0