afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated configuration to define the core bin dir within constants, updated code to use the core bin dir for vnoded and vcmd, based on using the fpm build system

Browse source
This commit is contained in:
Blake J. Harnden 2018-01-04 10:09:35 -08:00
parent 42bcb1c79d
commit e4a0069bc3
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -97,8 +97,7 @@ fpm -s dir -t $1 -n core-gui \
endef endef
.PHONY: fpm .PHONY: fpm
fpm: fpm: clean-local-fpm
rm -f *.deb && rm -f *.rpm
$(call fpm-gui,rpm,-d "tkimg") $(call fpm-gui,rpm,-d "tkimg")
$(call fpm-gui,deb,-d "libtk-img") $(call fpm-gui,deb,-d "libtk-img")
$(call fpm-python,rpm,daemon/ns3/setup.py) $(call fpm-python,rpm,daemon/ns3/setup.py)
@ -129,6 +128,11 @@ fpm:
--deb-recommends quagga \ --deb-recommends quagga \
daemon/src/setup.py daemon/setup.py daemon/src/setup.py daemon/setup.py
.PHONY: clean-local-fpm
clean-local-fpm:
-rm -rf *.deb
-rm -rf *.rpm
.PHONY: core-restart .PHONY: core-restart
core-restart: core-restart:
/etc/init.d/core-daemon stop /etc/init.d/core-daemon stop
@ -136,6 +140,8 @@ core-restart:
rm -f /var/log/core-daemon.log rm -f /var/log/core-daemon.log
/etc/init.d/core-daemon start /etc/init.d/core-daemon start
clean-local: clean-local-fpm
.version: Makefile .version: Makefile
echo $(CORE_VERSION) > $@ echo $(CORE_VERSION) > $@

3
daemon/core/constants.py.in
View file

@ -4,7 +4,8 @@ CORE_STATE_DIR = "@CORE_STATE_DIR@"
CORE_CONF_DIR = "@CORE_CONF_DIR@" CORE_CONF_DIR = "@CORE_CONF_DIR@"
CORE_DATA_DIR = "@CORE_DATA_DIR@" CORE_DATA_DIR = "@CORE_DATA_DIR@"
CORE_LIB_DIR = "@CORE_LIB_DIR@" CORE_LIB_DIR = "@CORE_LIB_DIR@"
CORE_SBIN_DIR = "@BINDIR@" CORE_SBIN_DIR = "@SBINDIR@"
CORE_BIN_DIR = "@BINDIR@"
BRCTL_BIN = "@brctl_path@/brctl" BRCTL_BIN = "@brctl_path@/brctl"
SYSCTL_BIN = "@sysctl_path@/sysctl" SYSCTL_BIN = "@sysctl_path@/sysctl"

2
daemon/core/netns/vnode.py
View file

@ -73,7 +73,7 @@ class SimpleLxcNode(PyCoreNode):
""" """
if self.up: if self.up:
raise Exception("already up") raise Exception("already up")
vnoded = ["%s/vnoded" % constants.CORE_SBIN_DIR, "-v", "-c", self.ctrlchnlname, vnoded = ["%s/vnoded" % constants.CORE_BIN_DIR, "-v", "-c", self.ctrlchnlname,
"-l", self.ctrlchnlname + ".log", "-l", self.ctrlchnlname + ".log",
"-p", self.ctrlchnlname + ".pid"] "-p", self.ctrlchnlname + ".pid"]
if self.nodedir: if self.nodedir:

2
daemon/core/netns/vnodeclient.py
View file

@ -17,7 +17,7 @@ USE_VCMD_MODULE = True
if USE_VCMD_MODULE: if USE_VCMD_MODULE:
import vcmd import vcmd
VCMD = os.path.join(constants.CORE_SBIN_DIR, "vcmd") VCMD = os.path.join(constants.CORE_BIN_DIR, "vcmd")
class VnodeClient(object): class VnodeClient(object):