diff --git a/Makefile.am b/Makefile.am index 98a3b129..4919ac0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,58 @@ deb: @echo "First create source archive with: dpkg-source -b core-@CORE_VERSION@" @echo "Then build with: pbuilder-dist precise i386 build core*.dsc" +.PHONE: fpm +fpm: + fpm -s python -t rpm \ + -m "CORE Developers " \ + --vendor "CORE Developers" \ + daemon/setup.py + fpm -s python -t rpm \ + -m "CORE Developers " \ + --vendor "CORE Developers" \ + daemon/src/setup.py + fpm -s python -t rpm \ + -m "CORE Developers " \ + --vendor "CORE Developers" \ + daemon/ns3/setup.py + +.PHONY: fpm-deb +fpm-deb: + fpm -s dir -t deb -n core -v $(CORE_VERSION) -C "$DESTDIR" \ + -p core_VERSION_ARCH.deb \ + --license "BSD 2-clause" \ + --vendor "CORE Developers" \ + --description "Emulate virtual networks in a box." \ + --url http://www.nrl.navy.mil/itd/ncs/products/core \ + -m "CORE Developers " \ + -d "procps" \ + -d "libc6 >= 2.14" \ + -d "bash >= 3.0" \ + -d "bridge-utils" \ + -d "ebtables" \ + -d "iproute2" \ + -d "libev4" \ + -d "python >= 2.7" \ + --deb-recommends quagga + + +.PHONY: fpm-rpm +fpm-rpm: + fpm -s dir -t rpm -n core -v $(CORE_VERSION) -C "$DESTDIR" \ + -p core_VERSION_ARCH.rpm \ + --license "BSD 2-clause" \ + --vendor "CORE Developers" \ + --description "Emulate virtual networks in a box." \ + --url http://www.nrl.navy.mil/itd/ncs/products/core \ + -m "CORE Developers " \ + -d "procps" \ + -d "bash >= 3.0" \ + -d "bridge-utils" \ + -d "ebtables" \ + -d "iproute" \ + -d "libev" \ + -d "python >= 2.7" + .PHONY: core-restart core-restart: /etc/init.d/core-daemon stop diff --git a/daemon/ns3/setup.py b/daemon/ns3/setup.py index a1d824a8..e3f248ac 100644 --- a/daemon/ns3/setup.py +++ b/daemon/ns3/setup.py @@ -1,7 +1,7 @@ from setuptools import setup setup( - name="corens3-python", + name="core-ns3", version="5.0", packages=[ "corens3", diff --git a/daemon/setup.py b/daemon/setup.py index c2c4cd18..7aa128cf 100644 --- a/daemon/setup.py +++ b/daemon/setup.py @@ -4,34 +4,36 @@ Defines how CORE will be built for installation. from setuptools import setup -setup(name="core-python", - version="5.0", - packages=[ - "core", - "core.addons", - "core.api", - "core.bsd", - "core.emane", - "core.misc", - "core.netns", - "core.phys", - "core.services", - "core.xen", - "core.xml", - ], - install_requires=[ - "enum34", - "logzero" - ], - tests_require=[ - "pytest", - "pytest-runner" - "pytest-cov", - "mock" - ], - description="Python components of CORE", - url="http://www.nrl.navy.mil/itd/ncs/products/core", - author="Boeing Research & Technology", - author_email="core-dev@nrl.navy.mil", - license="BSD", - long_description="Python scripts and modules for building virtual emulated networks.") +setup( + name="core", + version="5.0", + packages=[ + "core", + "core.addons", + "core.api", + "core.bsd", + "core.emane", + "core.misc", + "core.netns", + "core.phys", + "core.services", + "core.xen", + "core.xml", + ], + install_requires=[ + "enum34", + "logzero" + ], + tests_require=[ + "pytest", + "pytest-runner" + "pytest-cov", + "mock" + ], + description="Python components of CORE", + url="http://www.nrl.navy.mil/itd/ncs/products/core", + author="Boeing Research & Technology", + author_email="core-dev@nrl.navy.mil", + license="BSD", + long_description="Python scripts and modules for building virtual emulated networks." +) diff --git a/daemon/src/setup.py b/daemon/src/setup.py index 79151cc2..60819916 100644 --- a/daemon/src/setup.py +++ b/daemon/src/setup.py @@ -26,10 +26,9 @@ vcmd = Extension( ) setup( - name="core-python-netns", + name="core-netns", version="1.0", - description="Extension modules to support virtual nodes using " - "Linux network namespaces", + description="Extension modules to support virtual nodes using Linux network namespaces", ext_modules=[ netns, vcmd @@ -38,6 +37,5 @@ setup( author="Boeing Research & Technology", author_email="core-dev@nrl.navy.mil", license="BSD", - long_description="Extension modules and utilities to support virtual " - "nodes using Linux network namespaces" + long_description="Extension modules and utilities to support virtual nodes using Linux network namespaces" )