diff --git a/Makefile b/Makefile index f565d65c..c197e9e6 100644 --- a/Makefile +++ b/Makefile @@ -101,13 +101,13 @@ MANPAGES_MD := $(wildcard docs/*.md) MANPAGES := $(MANPAGES_MD:%.md=%) docs/%.1: docs/%.1.md check-gopath - go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ + $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ docs/%.5: docs/%.5.md check-gopath - go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ + $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ docs/%.8: docs/%.8.md check-gopath - go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ + $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ docs: $(MANPAGES) @@ -163,14 +163,14 @@ endif install.tools: .install.gitvalidation .install.gometalinter .install.md2man -.install.gitvalidation: +.install.gitvalidation: check-gopath go get -u github.com/vbatts/git-validation -.install.gometalinter: +.install.gometalinter: check-gopath go get -u github.com/alecthomas/gometalinter - gometalinter --install + $(GOPATH)/bin/gometalinter --install -.install.md2man: +.install.md2man: check-gopath go get -u github.com/cpuguy83/go-md2man .PHONY: \ diff --git a/README.md b/README.md index 0ced5820..4cdb8d73 100644 --- a/README.md +++ b/README.md @@ -43,14 +43,18 @@ It is currently in active development in the Kubernetes community through the [d ### Build -`btrfs-progs-devel`, `device-mapper-devel`, `glib2-devel`, `glibc-devel`, `glibc-static`, `gpgme-devel`, `libassuan-devel`, `libgpg-error-devel`, and `pkgconfig` packages on CentOS/Fedora or `btrfs-tools`, `libassuan-dev`, `libc6-dev`, `libdevmapper-dev`, `libglib2.0-dev`, `libgpg-error-dev`, `libgpgme11-dev`, and `pkg-config` on Ubuntu or equivalent is required. -In order to enable seccomp support you will need to install development files for `libseccomp` on your platform. -> e.g. `libseccomp-devel` for CentOS/Fedora, or `libseccomp-dev` for Ubuntu -In order to enable apparmor support you will need to install development files for `libapparmor` on your platform. -> e.g. `libapparmor-dev` for Ubuntu +On Fedora/Centos/RHEL: +```bash +dnf install -y btrfs-progs-devel device-mapper-devel libseccomp-devel glib2-devel glibc-devel glibc-static gpgme-devel libassuan-devel libgpg-error-devel pkgconfig libselinux-devel +``` + +On Ubuntu/Debian: +```bash +apt install btrfs-tools libassuan-dev libc6-dev libdevmapper-dev libglib2.0-dev libgpg-error-dev libgpgme11-dev pkg-config libseccomp-dev libapparmor-dev +``` ```bash -$ GOPATH=/path/to/gopath +$ export GOPATH=~/go $ mkdir $GOPATH $ go get -d github.com/kubernetes-incubator/cri-o $ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o