Update merged config for distribution2018.4.post2

Change-Id: I04e6c1fca113e3f4cab7cd86045790355c27b61a
(cherry picked from commit 0502100fe2a9bd3bbabd5929219b33a832a7f884)

3 files changed, 69 insertions, 6 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index d418debb1..66b0e5664 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -25,7 +25,10 @@ include google_analytics/USAGE
 include lava/dispatcher/lava-run
 include lava/dispatcher/lava-slave
 include lava/lxc-mocker/*
+include lava_dispatcher/dynamic_vm_keys/*
 include lava_dispatcher/lava_test_shell/*
+include lava_dispatcher/lava_test_shell/multi_node/*
+include lava_dispatcher/lava_test_shell/vland/*
 include lava_dispatcher/lava_test_shell/distro/android/*
 include lava_dispatcher/lava_test_shell/distro/archlinux/*
 include lava_dispatcher/lava_test_shell/distro/centos/*
diff --git a/setup.py b/setup.py
index b22e4d201..0af058461 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2010 Linaro Limited
 #
-# Author: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
+# Author: Neil Williams <neil.williams@linaro.org>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ SRCDIR = os.path.join('.', 'lava_scheduler_app', 'tests', 'device-types')
 DEVICE_TYPE_TEMPLATES = find_data_files(SRCDIR, '*.jinja2')
 
 setup(
-    name='lava-server',
+    name='lava',
     version=version_tag(),
     author="Neil Williams",
     author_email="lava-team@linaro.org",
@@ -60,7 +60,7 @@ setup(
     packages=find_packages(),
     test_suite="lava_server.tests.run_tests",
     license="AGPL",
-    description="LAVA Server",
+    description="LAVA",
     long_description="""
      LAVA is a continuous integration system for deploying operating
      systems onto physical and virtual hardware for running tests.
@@ -81,11 +81,71 @@ setup(
         'jinja2',
         'django-auth-ldap >= 1.2.12',
         'voluptuous >= 0.8.8',
-        # scheduler
-        "lava-dispatcher",
         "simplejson",
+        'pexpect >= 4.2',
+        'PyYAML',
+        'pyserial >= 2.6',
+        'requests',
+        'netifaces >= 0.10.0',
+        'nose',
+        'pyudev >= 0.21',
+        'pytz',
+        'file-magic',
+        'configobj',
+        'setproctitle >= 1.1.8'
+    ],
+    package_data={
+        'lava_dispatcher': [
+            'dynamic_vm_keys/lava*',
+            'devices/*.yaml',
+            'lava_test_shell/lava-add-keys',
+            'lava_test_shell/lava-add-sources',
+            'lava_test_shell/lava-background-process-start',
+            'lava_test_shell/lava-background-process-stop',
+            'lava_test_shell/lava-echo-ipv4',
+            'lava_test_shell/lava-installed-packages',
+            'lava_test_shell/lava-install-packages',
+            'lava_test_shell/lava-lxc-device-add',
+            'lava_test_shell/lava-lxc-device-wait-add',
+            'lava_test_shell/lava-os-build',
+            'lava_test_shell/lava-probe-channel',
+            'lava_test_shell/lava-probe-ip',
+            'lava_test_shell/lava-target-ip',
+            'lava_test_shell/lava-target-mac',
+            'lava_test_shell/lava-target-storage',
+            'lava_test_shell/lava-test-case',
+            'lava_test_shell/lava-test-feedback',
+            'lava_test_shell/lava-test-raise',
+            'lava_test_shell/lava-test-reference',
+            'lava_test_shell/lava-test-runner',
+            'lava_test_shell/lava-test-set',
+            'lava_test_shell/lava-test-shell',
+            'lava_test_shell/multi_node/*',
+            'lava_test_shell/vland/*',
+            'lava_test_shell/lmp/*',
+            'lava_test_shell/distro/fedora/*',
+            'lava_test_shell/distro/android/*',
+            'lava_test_shell/distro/ubuntu/*',
+            'lava_test_shell/distro/debian/*',
+            'lava_test_shell/distro/oe/*',
+        ],
+    },
+    scripts=[
+        'lava/dispatcher/lava-run',
+        'lava/dispatcher/lava-slave'
     ],
     data_files=[
+        ('/usr/share/lava-dispatcher/',
+            ['etc/tftpd-hpa',
+             'etc/dispatcher.yaml']),
+        ('/etc/exports.d',
+            ['etc/lava-dispatcher-nfs.exports']),
+        ('/etc/modules-load.d/',
+            ['etc/lava-modules.conf']),
+        ('/etc/logrotate.d/',
+            ['etc/logrotate.d/lava-slave-log']),
+        ('/usr/share/lava-dispatcher/',
+            ['etc/lava-slave.service']),
         ('/etc/lava-server',
          ['etc/settings.conf',
           'etc/env.yaml']),
diff --git a/share/javascript.yaml b/share/javascript.yaml
index b4d6b3fe5..ddb49e11a 100644
--- a/share/javascript.yaml
+++ b/share/javascript.yaml
@@ -1,5 +1,5 @@
 debian:
-  - python_dir: debian/lava-server/usr/lib/python3/dist-packages/
+  - python_dir: debian/lava/usr/lib/python3/dist-packages/
   - package: libjs-jquery
     directory: /usr/share/javascript/jquery/
     lava_directory: lava_server/static/lava_server/js/