Skip to content

Commit

Permalink
updates to building fpm packages and slight adjustments to install doc
Browse files Browse the repository at this point in the history
  • Loading branch information
bharnden committed Dec 30, 2019
1 parent 2be0713 commit f2d65ef
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fpm -s dir -t rpm -n core \
--description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \
-p core_$(PYTHON)_VERSION_ARCH.rpm \
-p core_VERSION_ARCH.rpm \
-v $(PACKAGE_VERSION) \
--rpm-init scripts/core-daemon \
--config-files "/etc/core" \
Expand All @@ -75,7 +75,7 @@ fpm -s dir -t deb -n core \
--description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \
-p core_$(PYTHON)_VERSION_ARCH.deb \
-p core_VERSION_ARCH.deb \
-v $(PACKAGE_VERSION) \
--deb-systemd scripts/core-daemon.service \
--deb-no-default-config-files \
Expand Down
17 changes: 8 additions & 9 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CORE files are installed to the following directories, when the installation pre
Install Path | Description
-------------|------------
/usr/bin/core-gui|GUI startup command
/usr/bin/coretk-gui|BETA Python GUI
/usr/bin/core-daemon|Daemon startup command
/usr/bin/{core-cleanup, coresendmsg, core-manage}|Misc. helper commands/scripts
/usr/lib/core|GUI files
Expand All @@ -48,7 +49,7 @@ You may already have these installed, and can ignore this step if so, but if
needed you can run the following to install python and pip.

```shell
sudo apt install python3
sudo apt install python3.6
sudo apt install python3-pip
```

Expand All @@ -59,7 +60,7 @@ To account for this it would be recommended to install the python dependencies u
the latest [CORE Release](https://github.com/coreemu/core/releases).

```shell
sudo python3 -m pip install -r requirements.txt
sudo pip3 install -r requirements.txt
```

# Pre-Req Installing OSPF MDR
Expand Down Expand Up @@ -123,9 +124,7 @@ You can obtain the CORE packages from [CORE Releases](https://github.com/coreemu
Ubuntu package defaults to using systemd for running as a service.

```shell
# $PYTHON and $VERSION represent the python and CORE
# versions the package was built for
sudo apt install ./core_$PYTHON_$VERSION_amd64.deb
sudo apt install ./core_$VERSION_amd64.deb
```

Run the CORE GUI as a normal user:
Expand All @@ -143,7 +142,7 @@ Messages will print out on the console about connecting to the CORE daemon.
on CentOS <= 6, or build from source otherwise**

```shell
yum install ./core_python3_$VERSION_x86_64.rpm
yum install ./core_$VERSION_x86_64.rpm
```

Disabling SELINUX:
Expand Down Expand Up @@ -210,15 +209,15 @@ You can obtain the CORE source from the [CORE GitHub](https://github.com/coreemu
Python module grpcio-tools is currently needed to generate code from the CORE protobuf file during the build.

```shell
python3 -m pip install grpcio-tools
sudo pip3 install grpcio-tools
```

## Distro Requirements

### Ubuntu 18.04 Requirements

```shell
sudo apt install automake pkg-config gcc libev-dev ebtables python3-dev python3-setuptools tk libtk-img ethtool
sudo apt install automake pkg-config gcc iproute2 libev-dev ebtables python3.6 python3.6-dev python3-pip tk libtk-img ethtool
```

### Ubuntu 16.04 Requirements
Expand All @@ -230,7 +229,7 @@ sudo apt-get install automake ebtables python3-dev libev-dev python3-setuptools
### CentOS 7 with Gnome Desktop Requirements

```shell
sudo yum -y install automake gcc python36 python36-devel libev-devel tk ethtool
sudo yum -y install automake gcc python36 python36-devel libev-devel tk ethtool iptables-ebtables iproute python3-pip python3-tkinter
```

## Build and Install
Expand Down

0 comments on commit f2d65ef

Please sign in to comment.