Pekka or Avi, can I please have your opinion on this patch? Is it ok with you that we drop the old "mgmt" shell, and stop building images for it?
-- Nadav Har'El n...@scylladb.com On Mon, Jun 27, 2016 at 11:51 AM, Nadav Har'El <n...@scylladb.com> wrote: > The "mgmt" submodule was a shell (called "Crsh") and ssh implementation > written in Jruby. It predated OSv's REST API and the simple shell written > in Lua on top of it, and once those came out, the old "mgmt" shell became > deprecated and un-recommended. > > Moreover, running "scripts/build image=mgmt" hasn't been working for about > a year, because it relies on some external repository holding an > OSv-specific > version of the Crsh shell, which is no longer available. > > So it's time we get rid of this "mgmt" submodule. Its git repository will > remain (https://github.com/cloudius-systems/mgmt) but it will no longer be > attached to the OSv repository as a submodule. > > Signed-off-by: Nadav Har'El <n...@scylladb.com> > --- > .gitmodules | 4 ---- > config.json | 4 ---- > images/specjvm.py | 5 ----- > mgmt | 1 - > modules/mgmt/bootfs.manifest | 0 > scripts/build-capstan-images | 1 - > scripts/checkpatch.pl | 2 +- > scripts/loader.py | 3 +-- > 8 files changed, 2 insertions(+), 18 deletions(-) > delete mode 100644 images/specjvm.py > delete mode 160000 mgmt > delete mode 100644 modules/mgmt/bootfs.manifest > > diff --git a/.gitmodules b/.gitmodules > index c0cfc52..786db88 100644 > --- a/.gitmodules > +++ b/.gitmodules > @@ -22,10 +22,6 @@ > path = external/x64/misc.bin > url = ../../cloudius-systems/misc.bin.git > ignore = dirty > -[submodule "mgmt"] > - path = mgmt > - url = ../../cloudius-systems/mgmt.git > - ignore = dirty > [submodule "apps"] > path = apps > url = ../../cloudius-systems/osv-apps > diff --git a/config.json b/config.json > index dc610db..097a16f 100644 > --- a/config.json > +++ b/config.json > @@ -4,10 +4,6 @@ > "type": "direct-dir", > "path": "${OSV_BASE}/modules/cloud-init/" > }, > - "mgmt": { > - "type": "direct-dir", > - "path": "${OSV_BASE}/mgmt/" > - }, > "repositories": [ > "${OSV_BASE}/apps", > "${OSV_BASE}/modules" > diff --git a/images/specjvm.py b/images/specjvm.py > deleted file mode 100644 > index 3b8c871..0000000 > --- a/images/specjvm.py > +++ /dev/null > @@ -1,5 +0,0 @@ > -from osv.modules.api import * > - > -_mgmt = require('mgmt') > -_specjvm = require('specjvm') > -run = [ _mgmt.full ] > diff --git a/mgmt b/mgmt > deleted file mode 160000 > index 7e2bcfd..0000000 > --- a/mgmt > +++ /dev/null > @@ -1 +0,0 @@ > -Subproject commit 7e2bcfd943f92747f45b0746214e3be134313424 > diff --git a/modules/mgmt/bootfs.manifest b/modules/mgmt/bootfs.manifest > deleted file mode 100644 > index e69de29..0000000 > diff --git a/scripts/build-capstan-images b/scripts/build-capstan-images > index c07092a..75563c7 100755 > --- a/scripts/build-capstan-images > +++ b/scripts/build-capstan-images > @@ -10,7 +10,6 @@ $build cloudius/osv-base httpserver,cloud-init > "OSv bas > $build cloudius/osv-openjdk java,httpserver,cloud-init > "OpenJDK 7/OSv base image for developers" > $build cloudius/osv-openjdk8 openjdk8-fedora,httpserver,cloud-init > "OpenJDK 8/OSv base image for developers" > $build cloudius/osv-node node,httpserver,cloud-init > "Node/OSv" > -$build cloudius/osv-crash mgmt,httpserver,cloud-init > "OSv/CRaSH shell for developers" > > # Appliances: > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 2598b40..00e02ce 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -333,7 +333,7 @@ sub top_of_kernel_tree { > my @tree_check = ( > "Makefile", "README.md", "arch", "bsd", "compiler", > "core", "documentation", "drivers", > - "fs", "include", "mgmt", "modules", > + "fs", "include", "modules", > ); > > foreach my $check (@tree_check) { > diff --git a/scripts/loader.py b/scripts/loader.py > index 7bd1c11..11ab65a 100644 > --- a/scripts/loader.py > +++ b/scripts/loader.py > @@ -11,7 +11,6 @@ from collections import defaultdict > arch = 'x64' > build_dir = os.path.dirname(gdb.current_objfile().filename) > osv_dir = os.path.abspath(os.path.join(build_dir, '../..')) > -mgmt_dir = os.path.join(osv_dir, 'mgmt') > apps_dir = os.path.join(osv_dir, 'apps') > external = os.path.join(osv_dir, 'external', arch) > modules = os.path.join(osv_dir, 'modules') > @@ -120,7 +119,7 @@ def syminfo(addr): > def translate(path): > '''given a path, try to find it on the host OS''' > name = os.path.basename(path) > - for top in [build_dir, mgmt_dir, external, modules, apps_dir, '/zfs']: > + for top in [build_dir, external, modules, apps_dir, '/zfs']: > for root, dirs, files in os.walk(top): > if name in files: > return os.path.join(root, name) > -- > 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 osv-dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
