Merge branch 'rel/5.1'

This commit is contained in:
bharnden 2018-05-22 20:44:26 -07:00
commit c3d0b01b7f
293 changed files with 6907 additions and 34130 deletions

View file

@ -1,7 +0,0 @@
#!/bin/sh
echo Restoring /kernel.old ...
install -m 555 -o root -g wheel -fschg /kernel.old /kernel
rm -rf /modules
mv /modules.old /modules

View file

@ -1,21 +0,0 @@
#!/bin/sh
PREV=""
if [ ! -e "/boot/kernel.old" ] ; then
if [ ! -e "/boot/GENERIC" ] ; then
echo Previous kernel does not exist in /boot/kernel.old or /boot/GENERIC !
exit 1;
else
PREV="/boot/GENERIC"
fi;
else
PREV="/boot/kernel.old"
fi;
echo Removing current kernel...
chflags -R noschg /boot/kernel
rm -rf /boot/kernel
echo Restoring previous kernel from $PREV...
mv $PREV /boot/kernel
exit 0;

View file

@ -1,96 +0,0 @@
#!/bin/sh
VER=0.0
# determine FreeBSD 4.11 or 8.x
REL=`uname -r`
case "$REL" in
9.*)
echo "Using FreeBSD 9.x..."
KERN=9.x
SCRIPTVER=8.x
;;
8.*)
echo "Using FreeBSD 8.x..."
KERN=8.x
SCRIPTVER=8.x
;;
4.11-RELEASE)
echo "Using FreeBSD 4.11..."
KERN=4.11
SCRIPTVER=4.11
;;
*)
echo "What version of FreeBSD are you running (4.11/8.x) ?"
exit 1
esac
if [ "a$1" = "a" ]
then
echo "usage: ./core-kernel-release.sh 20080228 [clean]"
echo a version number is required
exit 1;
else
VER=$1
fi;
if [ "a$2" = "aclean" ]
then
echo Cleaning up...
rm -f core-kernel.pkglist.tmp
rm -f core-kernel.pkglist
rm -f core-kernel-${KERN}-${VER}.tbz
exit
fi;
# check for /kernel.new on 4.11
if [ ${KERN} = "4.11" ]
then
if [ -e "/kernel.new" ]
then
echo Note: proceeding using this kernel...
ls -al /kernel.new
else
echo "error: first copy the desired kernel to /kernel.new"
exit
fi;
fi;
#
# build the packing list
#
echo @comment ORIGIN:net/core-kernel > core-kernel.pkglist
if [ ${KERN} = "4.11" ]
# FreeBSD 4.11
then
echo @cwd / >> core-kernel.pkglist
echo kernel.new >> core-kernel.pkglist
find /modules \! -type d > core-kernel.pkglist.tmp
find /sbin/vimage >> core-kernel.pkglist.tmp
find /usr/share/man/man8/vimage.8.gz >> core-kernel.pkglist.tmp
find /sbin/ngctl >> core-kernel.pkglist.tmp
find /usr/share/man/man8/ngctl.8.gz >> core-kernel.pkglist.tmp
# FreeBSD 8.x
else
echo @cwd /boot >> core-kernel.pkglist
PWDOLD=${PWD}
cd /boot
find kernel \! -type d > ${PWDOLD}/core-kernel.pkglist.tmp
cd ${PWDOLD}
echo @cwd / >> core-kernel.pkglist.tmp
find /usr/sbin/vimage >> core-kernel.pkglist.tmp
find /usr/share/man/man8/vimage.8.gz >> core-kernel.pkglist.tmp
fi;
# remove leading '/' from lines
sed -e "s,^/,," core-kernel.pkglist.tmp >> core-kernel.pkglist
#
# build the package
#
pkg_create -c core-kernel.pkgdesc -d core-kernel.pkgdesclong -f core-kernel.pkglist -i core-kernel-preinstall-${SCRIPTVER}.sh -K core-kernel-deinstall-${SCRIPTVER}.sh -v core-kernel-${KERN}-${VER}.tbz

View file

@ -1,18 +0,0 @@
#!/bin/sh
if [ "x$2" = "xPOST-INSTALL" ]
then
install -m 555 -o root -g wheel -fschg /kernel.new /kernel
rm -f /kernel.new
echo Please reboot this machine to enable the new CORE kernel.
exit 0;
fi;
install -m 555 -o root -g wheel -fschg /kernel /kernel.old
if [ -e /modules.old ]
then
rm -rf /modules.old
fi;
mv /modules /modules.old
exit 0;

View file

@ -1,27 +0,0 @@
#!/bin/sh
if [ "x$2" = "xPOST-INSTALL" ]
then
echo Please reboot this machine to enable the new CORE kernel.
exit 0;
fi;
# PRE-INSTALL
# save the GENERIC kernel
OLDNAME=`strings /boot/kernel/kernel | tail -n 1`
if [ "x$OLDNAME" = "xGENERIC" ]
then
chflags -R noschg /boot/kernel
mv /boot/kernel /boot/GENERIC
exit 0;
fi;
# get rid of /boot/kernel.old if it is in the way
if [ -e "/boot/kernel.old" ] ; then
chflags -R noschg /boot/kernel.old
rm -rf /boot/kernel.old
fi;
chflags -R noschg /boot/kernel
mv /boot/kernel /boot/kernel.old
exit 0;

View file

@ -1 +0,0 @@
CORE FreeBSD kernel enables lightweight virtual machines

View file

@ -1 +0,0 @@
This package contains the CORE FreeBSD kernel with kernel modules. Custom modules include ng_pipe and ng_wlan. Also contains the userspace utility program vimage. This package can be used along with the CORE GUI to build emulated networks. This kernel is based on the GENERIC kernel with the VIMAGE option turned on (per-jail network stack virtualization), and with a small patch to allow per-node filesystem access.

View file

@ -1,68 +0,0 @@
#!/bin/sh
VER=`grep -m 1 "set CORE_VERSION" ../../gui/version.tcl | awk '{ print $3 }'`
ARCH=`uname -m`
# determine FreeBSD 4.11 or 7.x
REL=`uname -r`
case "$REL" in
9.*)
echo "Using FreeBSD 9.x..."
KERN=9.x
;;
8.*)
echo "Using FreeBSD 8.x..."
KERN=8.x
;;
4.11-RELEASE)
echo "Using FreeBSD 4.11..."
KERN=4.11
;;
*)
echo "What version of FreeBSD are you running (4.11/8.x) ?"
exit 1
esac
if [ "a$1" = "aclean" ]
then
echo Cleaning up...
rm -f core.pkglist.tmp
rm -f core.pkglist
rm -f core-${KERN}-${VER}.tbz
rm -rf /tmp/staging
exit
fi;
#
# build the packing list
#
echo @comment ORIGIN:net/core > core.pkglist
echo @cwd /usr/local >> core.pkglist
PKG_BASH=`pkg_info -E -x ^bash`
# for 4.11 change this back to 8.4
PKG_TCL=`pkg_info -E -x ^tcl-8.5`
PKG_TK=`pkg_info -E -x ^tk-8.5`
echo @pkgdep ${PKG_BASH} >> core.pkglist
echo @comment DEPORIGIN:shells/bash >> core.pkglist
echo @pkgdep ${PKG_TCL} >> core.pkglist
echo @comment DEPORIGIN:lang/tcl85 >> core.pkglist
echo @pkgdep ${PKG_TK} >> core.pkglist
echo @comment DEPORIGIN:x11-toolkits/tk85 >> core.pkglist
SAVEDIR=`pwd`
cd ../..
rm -rf /tmp/staging
gmake DESTDIR=/tmp/staging install
cd $SAVEDIR
find /tmp/staging/usr/local \! -type d >> core.pkglist
echo @cwd /etc >> core.pkglist
find /tmp/staging/etc \! -type d >> core.pkglist
sed -e "s,^/tmp/staging/usr/local/,," core.pkglist > core.pkglist.new1
sed -e "s,^/tmp/staging/etc/,," core.pkglist.new1 > core.pkglist
rm -f core.pkglist.new1
#
# build the package
#
pkg_create -c core.pkgdesc -d core.pkgdesclong -f core.pkglist -v core-${KERN}-${ARCH}-${VER}.tbz

View file

@ -1 +0,0 @@
Common Open Research Emulator userspace components

View file

@ -1,3 +0,0 @@
The Common Open Research Emulator (CORE) is a tool that allows you to emulate entire networks on a FreeBSD or Linux machine. You can connect these emulated networks to live networks (or to additional emulated networks) via the machine's physical interfaces. This package contains CORE userspace components for easily drawing topologies that drive lightweight virutalized network stacks.
WWW: http://www.nrl.navy.mil/itd/ncs/products/core

View file

@ -1,3 +0,0 @@
core-daemon.install
core-gui.install
core-daemon.prerm

View file

@ -1,65 +0,0 @@
core (5.0-0ubuntu1) precise; urgency=low
* Added Ryu SD and Open vSwitch services, code cleanup and refactoring
-- CORE Developers <core-dev@nrl.navy.mil> Fri, 01 Sep 2017 00:00:00 -0700
core (4.8-0ubuntu1) precise; urgency=low
* Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes
-- CORE Developers <core-dev@pf.itd.nrl.navy.mil> Fri, 05 Jun 2015 00:00:00 -0700
core (4.7-0ubuntu1) precise; urgency=low
* EMANE 0.9.1, asymmetric links, bugfixes
-- Jeff Ahrenholz <core-dev@pf.itd.nrl.navy.mil> Wed, 08 Aug 2014 08:27:18 -0700
core (4.6-0ubuntu1) precise; urgency=low
* Edit Copy and Paste, Edit Find, bugfixes, Debian compliance
-- Jeff Ahrenholz <core-dev@pf.itd.nrl.navy.mil> Wed, 25 Sep 2013 12:36:54 -0700
core (4.5-0ubuntu1) precise; urgency=low
* XML support, SDT3D support, EMANE 0.8.1, ns-3 locations, code cleanup,
bugfixes, and more.
-- Jeff Ahrenholz <core-dev@pf.itd.nrl.navy.mil> Thu, 11 Apr 2013 14:19:05 -0700
core (4.4-0ubuntu1) precise; urgency=low
* Bandwidth plots, event scheduling, EMANE 0.7.4, improved services support,
code cleanup, bugfixes, and more.
-- Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> Tue, 04 Sep 2012 11:53:23 -0700
core (4.3-0ubuntu1) oneiric; urgency=low
* Hook scripts, CEL, EMANE 0.7.3, physical nodes, improved WLAN and service
dialogs, code cleanup, bugfixes, and more.
-- Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> Thu, 09 Feb 2012 08:00:52 -0800
core (4.2-0ubuntu1) maverick; urgency=low
* bugfixes, EMANE 0.7.1 support.
-- Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> Mon, 15 Aug 2011 13:19:16 -0800
core (4.1-0ubuntu1) lucid; urgency=low
* Node services, customizable nodes, traffic flows, IP address allocator,
distributed emulation using GRE tunnels, EMANE 0.6.4 support, and more.
-- Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> Thu, 09 Dec 2010 07:02:16 -0800
core (4.0-0ubuntu1) lucid; urgency=low
* New CORE deb packaging. Extra magic added to omit the horrible
/usr/share/info/dir.gz file from being generated.
-- Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com> Wed, 29 Jul 2010 16:07:26 -0700

View file

@ -1 +0,0 @@
9

View file

@ -1,35 +0,0 @@
This package was debianized by Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com>
4/3/13
It was downloaded from: http://www.nrl.navy.mil/itd/ncs/products/core
Upstream Author(s): Jeff Ahrenholz <jeffrey.m.ahrenholz@boeing.com>
Copyright:
Copyright (C) 2010-2013, the Boeing Company.
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
Packaging:
Copyright (C) 2010-2013, the Boeing Company.

View file

@ -1,20 +0,0 @@
#! /usr/bin/dh-exec
@SBINDIR@
@CORE_CONF_DIR@
@CORE_DATA_DIR@/examples/corens3
@CORE_DATA_DIR@/examples/*.py
@CORE_DATA_DIR@/examples/hooks
@CORE_DATA_DIR@/examples/myservices
@CORE_DATA_DIR@/examples/netns
@CORE_DATA_DIR@/examples/services
# ATmandirAT is expanding to ${datarootdir}/man
@datarootdir@/man/man1/vnoded.1
@datarootdir@/man/man1/vcmd.1
@datarootdir@/man/man1/netns.1
@datarootdir@/man/man1/core-daemon.1
@datarootdir@/man/man1/coresendmsg.1
@datarootdir@/man/man1/core-cleanup.1
@datarootdir@/man/man1/core-xen-cleanup.1
@pyprefix@/lib/python2.7/dist-packages
/etc/init.d
/etc/logrotate.d

View file

@ -1,56 +0,0 @@
#!/bin/sh
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
SBINDIR=@SBINDIR@
pyprefix=@pyprefix@
pythondir=@pythondir@
core_daemon_stop()
{
if [ -x /etc/init.d/core-daemon ]; then
/etc/init.d/core-daemon stop
fi
if [ -x $SBINDIR/core-cleanup ]; then
$SBINDIR/core-cleanup
fi
if [ -d $pythondir/core ]; then
find $pythondir/core -name '*.pyc' -delete
fi
}
case "$1" in
remove|upgrade|deconfigure)
core_daemon_stop > /dev/null 2>&1
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

View file

@ -1,9 +0,0 @@
#! /usr/bin/dh-exec
@BINDIR@/core-gui
@CORE_LIB_DIR@
@CORE_DATA_DIR@/icons
@CORE_DATA_DIR@/examples/configs
@datarootdir@/pixmaps
@datarootdir@/applications
# ATmandirAT is expanding to ${datarootdir}/man
@datarootdir@/man/man1/core-gui.1

View file

@ -1,18 +0,0 @@
#!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
# DH_VERBOSE = 1
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_DH_AUTORECONF_ARGS += ./bootstrap.sh
# this prevents 'make install' from invoking install-info that generates a
# $(DEB_DESTDIR)usr/share/info/dir.gz file that causes a lintian error
# the following rule was not enough
# binary-post-install/core::
# rm -f $(DEB_DESTDIR)usr/share/info/dir.gz
#DEB_CONFIGURE_EXTRA_FLAGS := --disable-install-info

View file

@ -1,40 +0,0 @@
RPMBUILD = .rpmbuild
CORE_VERSION = $(shell cat .version 2> /dev/null)
.PHONY: all
all: clean .version build
.PHONY: clean
clean:
rm -rf $(RPMBUILD)
.PHONY: build
build: dist
for d in SOURCES SPECS; do mkdir -p $(RPMBUILD)/$$d; done
cp -afv core-$(CORE_VERSION).tar.gz $(RPMBUILD)/SOURCES
cp -afv packaging/rpm/core.spec $(RPMBUILD)/SPECS
rpmbuild -bb --clean $(RPMBUILD)/SPECS/core.spec \
--define "_topdir $$PWD/.rpmbuild"
@printf "\nRPM packages saved in $(RPMBUILD)/RPMS\n\n"
.PHONY: dist
dist: Makefile
$(MAKE) dist
Makefile: configure
./configure --prefix=/usr --exec-prefix=/usr
configure: bootstrap.sh
./bootstrap.sh
bootstrap.sh:
@printf "\nERROR: make must be called from the top-level directory:\n"
@printf " make -f packaging/$(lastword $(MAKEFILE_LIST))\n\n"
@false
.version: Makefile
$(MAKE) $@
$(RPMBUILD):
mkdir -p $@

View file

@ -1 +0,0 @@
core.spec

View file

@ -1,41 +0,0 @@
#!/bin/sh
OLDDIR=$PWD
cd ../../
if [ ! -e Makefile ]; then
echo "Missing file: Makefile"
fi
VER=`grep PACKAGE_VERSION Makefile | awk '{ print $3 }'`
echo "Detected CORE version $VER."
DESTDIR=/tmp/corerpmspec make install
if [ $? != 0 ]; then
exit 1
fi
cd /tmp/corerpmspec
find . -type f | sort > newspecfiles.log
# append all .py files with .py* so .pyc files are uninstalled
sed -i 's/\.py$/.py*/g' newspecfiles.log
# directory replacements
sed -i 's/^\.\//\//g' newspecfiles.log
sed -i 's/\/usr\/bin/%{_bindir}/g' newspecfiles.log
sed -i 's/\/usr\/sbin/%{_sbindir}/g' newspecfiles.log
sed -i 's/\/usr\/lib64\/python2.7\/site-packages/%{python_sitearch}/g' newspecfiles.log
sed -i 's/\/usr\/lib\/python2.7\/site-packages/%{python_sitelib}/g' newspecfiles.log
sed -i 's/\/usr\/lib\/python2.7\/dist-packages/%{python_sitelib}/g' newspecfiles.log
sed -i 's/\/usr\/lib\/core/@CORE_LIB_DIR@/g' newspecfiles.log
sed -i 's/\/usr\/share\/applications/%{_datadir}\/applications/g' newspecfiles.log
sed -i 's/\/usr\/share\/pixmaps/%{_datadir}\/pixmaps/g' newspecfiles.log
sed -i 's/\/usr\/share\/core/%{_datadir}\/%{name}/g' newspecfiles.log
sed -i 's/\/etc\/core/%config @CORE_CONF_DIR@/g' newspecfiles.log
sed -i 's/py2.7.egg/py@PYTHON_VERSION@.egg/g' newspecfiles.log
sed -i "s/$VER/@COREDPY_VERSION@/g" newspecfiles.log
sed -i 's/\/usr\/share\/man/%doc %{_mandir}/g' newspecfiles.log
sed -i 's/\.1$/.1.gz/g' newspecfiles.log
echo .
echo A new filelist is available here:
ls -al /tmp/corerpmspec/newspecfiles.log
echo .
cd $OLDDIR