added initial fpm commands for building packages and minor updates to support

This commit is contained in:
Blake J. Harnden 2017-12-21 16:19:12 -08:00
parent 58c6d03bc4
commit 59e6b6630a
8 changed files with 87 additions and 55 deletions

View file

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

View file

@ -22,13 +22,29 @@ setup(
],
install_requires=[
"enum34",
"logzero"
#"logzero",
],
tests_require=[
"pytest",
"pytest-runner"
"pytest-runner",
"pytest-cov",
"mock"
"mock",
],
data_files=[
("/etc/core", [
"data/core.conf",
"data/xen.conf",
]),
("/etc/init.d", [
"../scripts/core-daemon",
]),
],
scripts=[
"sbin/core-cleanup",
"sbin/core-daemon",
"sbin/core-manage",
"sbin/coresendmsg",
"sbin/core-xen-cleanup",
],
description="Python components of CORE",
url="http://www.nrl.navy.mil/itd/ncs/products/core",

View file

@ -34,7 +34,7 @@ netns_SOURCES = ${SRC_NETNS}
noinst_LIBRARIES = libnetns.a
libnetns_a_SOURCES = netnsmodule.c vcmdmodule.c
libnetns.a:
SBINDIR=@SBINDIR@ LDFLAGS="$(LDFLAGS) @libev_LIBS@" CFLAGS="$(CFLAGS) @libev_CFLAGS@" $(PYTHON) setup.py build
SBINDIR=@SBINDIR@ LDFLAGS="$(LDFLAGS) @libev_LIBS@" CFLAGS="$(CFLAGS) @libev_CFLAGS@" $(PYTHON) setup.py build_ext
# Python libraries install
install-exec-local:

View file

@ -29,6 +29,7 @@ setup(
name="core-netns",
version="1.0",
description="Extension modules to support virtual nodes using Linux network namespaces",
scripts=["vcmd", "vnoded", "netns"],
ext_modules=[
netns,
vcmd