Hi,
On Tuesday, 18 December 2018 09:16:13 CET Szymon Janc wrote:
> Hi Brian,
>
> On Monday, 17 December 2018 19:42:01 CET Gix, Brian wrote:
> > This patch-set has been applied upstream.
>
> There is something wrong with Makefile.mesh
>
> Makefile.am: installing './depcomp'
> parallel-tests: installing './test-driver'
> Makefile.mesh:31: warning: variable 'mesh_btmesh_LDADD' is defined but no
> program or
> Makefile.mesh:31: library has 'mesh_btmesh' as canonical name (possible
> typo) Makefile.am:306: 'Makefile.mesh' included from here
> Makefile.mesh:32: warning: variable 'mesh_btmesh_DEPENDENCIES' is defined
> but no program or
> Makefile.mesh:32: library has 'mesh_btmesh' as canonical name (possible
> typo) Makefile.am:306: 'Makefile.mesh' included from here
>
>
> Enabling commented out code (why is it commented out btw?) in Makefile.mesh
> stil results in:
>
> Makefile.mesh:39: warning: mesh_btmesh_LDADD multiply defined in condition
> MESH ...
> Makefile.am:306: 'Makefile.mesh' included from here
> Makefile.mesh:31: ... 'mesh_btmesh_LDADD' previously defined here
> Makefile.am:306: 'Makefile.mesh' included from here
>
This seems to fix warnign for me. Was ot on purpose that btmesh wasn't added
to noinst ?
diff --git a/Makefile.mesh b/Makefile.mesh
index 5344fbb21..1b8adea7e 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -31,8 +31,8 @@ mesh_meshd_DEPENDENCIES = $(ell_dependencies)
mesh_btmesh_LDADD = src/libshared-mainloop.la $(ell_ldadd) -lreadline -ljson-
c
mesh_btmesh_DEPENDENCIES = $(ell_dependencies)
-#
-# noinst_PROGRAMS += mesh/btmesh
+noinst_PROGRAMS += mesh/btmesh
+
#
# mesh_btmesh_SOURCES = $(mesh_sources) \
# mesh/btmesh.c
> > > -----Original Message-----
> > > From: Gix, Brian
> > > Sent: Friday, December 14, 2018 4:26 PM
> > > To: linux-bluetooth@xxxxxxxxxxxxxxx
> > > Cc: johan.hedberg@xxxxxxxxx; Stotland, Inga <inga.stotland@xxxxxxxxx>;
> > > marcel@xxxxxxxxxxxx; Gix, Brian <brian.gix@xxxxxxxxx>
> > > Subject: [PATCH BlueZ v3 00/30] Major rewrite for Multi-Node and DBus
> > >
> > > The Mesh Daemon has been largely rewritten.
> > >
> > > It matches the API in doc/mesh-api.txt, and is now accessible from non-
> > > privledged DBus clients. The commandline version has been temporarily
> > > removed, although it will probably be re-added in the future. The dBus
> > > privledges need to be adjusted to allow for non-privledged access to
> > > Daemon interfaces. We will shortly also be adding a Mesh Specific
> > > README
> > > and TODO file, but in the meantime, contact Brian and/or Inga with any
> > > questions.
> > >
> > > v3 -- distcheck and pedantic styleguide fixes
> > >
> > > Brian Gix (12):
> > > mesh: Staging for Mesh DBus API rewrite
> > > mesh: Delete obsolete files
> > > mesh: Rewite Network layer for multiple nodes
> > > mesh: Direction agnostic PB-Adv implimentation
> > > mesh: Acceptor side provisioning implimentation
> > > mesh: Initiator side provisioning implimentation
> > > mesh: Rewrite Controler interface for full init
> > > mesh: Unchanged variables set to const
> > > mesh: re-arrange provisioning for DBus API
> > > mesh: restructure I/O for multiple nodes
> > > mesh: Clean-up Comment style
> > > mesh: Enable building Mesh Daemon
> > >
> > > Inga Stotland (18):
> > > mesh: Utilities for DBus support
> > > mesh: Internal errors
> > > mesh: Re-write storage for Multiple Nodes
> > > mesh: Rewrite Node handling for multiple nodes
> > > mesh: centralize generic utilities
> > > mesh: Re-architect for DBus API
> > > mesh: Make config model handle multiple nodes
> > > mesh: Multi node Config Server model
> > > mesh: Restrusture DB to support multiple nodes
> > > mesh: restructure model services for multiple nodes
> > > mesh: DBUS interface for Provisioning Agent
> > > mesh: restructure App Key storage
> > > mesh: Update for DBus API and multi-node support
> > > mesh: Add default location for Mesh Node storage
> > > mesh: Add structural changes for mesh
> > > mesh: Sample Provisioning Agent
> > > mesh: Sample On/Off Client and Server
> > > mesh: Sample Mesh Joiner (provision acceptor)
> > >
> > > Makefile.mesh | 26 +-
> > > configure.ac | 5 +
> > > mesh/agent.c | 665 ++++++++++++++++----
> > > mesh/agent.h | 71 ++-
> > > mesh/appkey.c | 17 +-
> > > mesh/cfgmod-server.c | 173 +++---
> > > mesh/cfgmod.h | 2 +-
> > > mesh/config/composition.json | 44 --
> > > mesh/dbus.c | 181 ++++++
> > > mesh/dbus.h | 40 ++
> > > mesh/display.c | 64 --
> > > mesh/error.h | 35 ++
> > > mesh/friend.c | 76 +--
> > > mesh/main.c | 73 ++-
> > > mesh/mesh-db.c | 454 +++++++++-----
> > > mesh/mesh-db.h | 6 +-
> > > mesh/mesh-io-api.h | 2 +-
> > > mesh/mesh-io-generic.c | 149 ++++-
> > > mesh/mesh-io.c | 3 +-
> > > mesh/mesh-io.h | 3 +-
> > > mesh/mesh.c | 625 ++++++++++++++-----
> > > mesh/mesh.h | 27 +-
> > > mesh/model.c | 811 +++++++++++++++++-------
> > > mesh/model.h | 66 +-
> > > mesh/net.c | 293 +++------
> > > mesh/net.h | 31 +-
> > > mesh/node.c | 1338
> > > +++++++++++++++++++++++++++++++++----
> > >
> > > ---
> > >
> > > mesh/node.h | 42 +-
> > > mesh/pb-adv.c | 444 +++++++++++++
> > > mesh/{display.h => pb-adv.h} | 13 +-
> > > mesh/prov-acceptor.c | 711 +++++++++++++++++++++
> > > mesh/prov-initiator.c | 650 +++++++++++++++++++
> > > mesh/prov.c | 722 ----------------------
> > > mesh/prov.h | 14 +-
> > > mesh/provision.c | 1162
> > > ----------------------------------
> > > mesh/provision.h | 112 +++-
> > > mesh/storage.c | 570 ++++++++---------
> > > mesh/storage.h | 39 +-
> > > mesh/test/agent.py | 40 ++
> > > mesh/test/example-onoff-client | 288 +++++++++ mesh/test/example-
> > >
> > > onoff-server | 365 +++++++++++
> > >
> > > mesh/test/test-join | 408 ++++++++++++
> > > mesh/util.c | 26 +
> > > mesh/util.h | 1 +
> > > 44 files changed, 7188 insertions(+), 3699 deletions(-) delete mode
> > > 100644
> > >
> > > mesh/config/composition.json create mode 100644 mesh/dbus.c create
> > > mode 100644 mesh/dbus.h delete mode 100644 mesh/display.c create
> > > mode 100644 mesh/error.h create mode 100644 mesh/pb-adv.c rename
> > > mesh/{display.h => pb-adv.h} (71%) create mode 100644 mesh/prov-
> > > acceptor.c create mode 100644 mesh/prov-initiator.c delete mode 100644
> > > mesh/prov.c delete mode 100644 mesh/provision.c create mode 100755
> > > mesh/test/agent.py create mode 100644 mesh/test/example-onoff-client
> > > create mode 100644 mesh/test/example-onoff-server create mode 100644
> > > mesh/test/test-join
> > >
> > > --
> > > 2.14.5
--
pozdrawiam
Szymon Janc
