Reviewed-by: Benoît Canet <[email protected]> On Sun, Jun 26, 2016 at 4:28 PM, Nadav Har'El <[email protected]> wrote:
> Recent changes to move ifconfig.so out of the main OSv makefile broke the > "mgmt" module build. This patch makes "scripts/build image=mgmt" work > again. > > Signed-off-by: Nadav Har'El <[email protected]> > --- > module.py | 1 + > usr.manifest | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/module.py b/module.py > index 2a2b0cf..fc97e15 100644 > --- a/module.py > +++ b/module.py > @@ -19,6 +19,7 @@ shell = run_java( > '-jar', _crash_jar > ]) > > +require('libtools') > # Some CLI commands depend on httpserver presence > _httpserver_module = require_running('httpserver') > > diff --git a/usr.manifest b/usr.manifest > index f52caad..2c90272 100644 > --- a/usr.manifest > +++ b/usr.manifest > @@ -1,5 +1,5 @@ > /usr/mgmt/crash-1.0.0.jar: ${OSV_BASE}/mgmt/crash/target/crash-1.0.0.jar > /usr/mgmt/config/logging.properties: > ${OSV_BASE}/mgmt/config/logging.properties > -/tools/ifconfig.so: ./tools/ifconfig/ifconfig.so > -/tools/lsroute.so: ./tools/route/lsroute.so > +/tools/ifconfig.so: ${OSV_BASE}/modules/libtools/ifconfig.so > +/tools/lsroute.so: ${OSV_BASE}/modules/libtools/lsroute.so > /&/etc/inputrc: ../../static/& > -- > 2.5.5 > > -- > You received this message because you are subscribed to the Google Groups > "OSv Development" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
