From 643d1341e12c27bff66bb760194bd7d72622aae3 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 29 Dec 2018 11:35:34 +0100
Subject: [PATCH] miscell harmless cleanup in makefile and setup

---
 Makefile | 46 ++--------------------------------------------
 setup.py |  4 +---
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/Makefile b/Makefile
index 437e05e..3e3069f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,20 +9,10 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
 PYTHON = python3
 
-# call with either WITH_SYSTEMD=true or WITH_INIT=true
-# otherwise we try to guess some reasonable default
-ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
-ifeq "$(wildcard $systemddir/*)" ""
-WITH_INIT=true
-else
-WITH_SYSTEMD=true
-endif
-endif
 ####################
 all: forward_api_calls
 	$(PYTHON) setup.py build
@@ -35,8 +25,8 @@ forward_api_calls: forward_api_calls.c
 install: install-miscell install-startup
 	$(PYTHON) setup.py install \
 		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-scripts=$(DESTDIR)/$(bindir)
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager
+
 
 # might be better in setup.py ?
 # NOTE: the sliver-initscripts/ and sliver-systemd stuff, being, well, for slivers,
@@ -55,18 +45,7 @@ install-miscell:
 	rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
 	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
 
-# this now is for the startup of nodemanager itself
-ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
-endif
-ifneq "$(WITH_INIT)" ""
-install-startup: install-init
-endif
-
-install-init:
-	mkdir -p $(DESTDIR)$(initdir)
-	chmod 755 initscripts/*
-	rsync -av initscripts/ $(DESTDIR)$(initdir)/
 
 install-systemd:
 	mkdir -p $(DESTDIR)/$(systemddir)
@@ -127,31 +106,10 @@ else
 	@echo WARNING : this target might not be very reliable - use with care
 	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 	+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
-#	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
 	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
 	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 endif
 
-# this is for vs only, we need to exclude the lxc stuff that otherwise messes up everything on node
-# xxx keep this in sync with setup.spec
-VS_EXCLUDES= --exclude sliver_libvirt.py --exclude sliver_lxc.py --exclude cgroups.py --exclude coresched_lxc.py --exclude privatebridge.py
-
-syncvs: $(NODE).key.rsa
-ifeq (,$(NODEURL))
-	@echo "syncvs: You must define NODE on the command line"
-	@echo "  e.g. make sync NODE=vnode01.inria.fr"
-	@exit 1
-else
-	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	@echo WARNING : this target might not be very reliable - use with care
-	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	+$(RSYNC) $(VS_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
-	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
-#	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
-	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
-endif
-
-
 ### fetching the key
 
 TESTMASTER ?= testmaster.onelab.eu
diff --git a/setup.py b/setup.py
index 79debc0..466c2b1 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ setup(
         'plugins.vsys',
         'plugins.vsys_privs',
         'plugins.ipv6',
-        'plugins.update_ipv6addr_slivertag', 
+        'plugins.update_ipv6addr_slivertag',
 # lxc
         'sliver_libvirt',
         'sliver_lxc',
@@ -55,6 +55,4 @@ setup(
         # this plugin uses vserver for now
         'plugins.drl',
         ],
-    packages =[
-        ],
     )
-- 
2.43.0