From 7004f219f5d0fe99de0dadf319381d224866eb7c Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 22 Jul 2016 16:32:51 -0400 Subject: [PATCH 1/2] Make manpages in a conatiner. Signed-off-by: Daniel Nephin --- hack/make/build-deb | 2 +- hack/make/build-rpm | 2 +- hack/make/ubuntu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/make/build-deb b/hack/make/build-deb index 41b2eda94c..98fc00782a 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -35,7 +35,7 @@ set -e debDate="$(date --rfc-2822)" # if go-md2man is available, pre-generate the man pages - ./man/generate.sh || true + make manpages || true # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this builderDir="contrib/builder/deb/${PACKAGE_ARCH}" diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 995dcd8bba..5d61dc98cc 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -51,7 +51,7 @@ set -e rpmDate="$(date +'%a %b %d %Y')" # if go-md2man is available, pre-generate the man pages - ./man/generate.sh || true + make manpages || true # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this # Convert the CHANGELOG.md file into RPM changelog format diff --git a/hack/make/ubuntu b/hack/make/ubuntu index 7033dd5484..8de5d9ceac 100644 --- a/hack/make/ubuntu +++ b/hack/make/ubuntu @@ -60,7 +60,7 @@ bundle_ubuntu() { cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/" # Include man pages - man/generate.sh + make manpages manRoot="$DIR/usr/share/man" mkdir -p "$manRoot" for manDir in man/man?; do From 1ea9c19ffe53811931ecd3102703c3eacb22d14c Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 22 Jul 2016 16:34:46 -0400 Subject: [PATCH 2/2] Require manpages for packages. Signed-off-by: Daniel Nephin --- hack/make/build-deb | 3 +-- hack/make/build-rpm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/make/build-deb b/hack/make/build-deb index 98fc00782a..e2a4e921b6 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -35,8 +35,7 @@ set -e debDate="$(date --rfc-2822)" # if go-md2man is available, pre-generate the man pages - make manpages || true - # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this + make manpages builderDir="contrib/builder/deb/${PACKAGE_ARCH}" pkgs=( $(find "${builderDir}/"*/ -type d) ) diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 5d61dc98cc..b03572815f 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -51,8 +51,7 @@ set -e rpmDate="$(date +'%a %b %d %Y')" # if go-md2man is available, pre-generate the man pages - make manpages || true - # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this + make manpages # Convert the CHANGELOG.md file into RPM changelog format VERSION_REGEX="^\W\W (.*) \((.*)\)$"