opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 08:47:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19351 from edsantiago/gomd2man-local

Browse Source 
[CI:DOCS] go-md2man: use vendored-in version, not system
This commit is contained in:
Daniel J Walsh
2023-07-26 17:07:44 -04:00
committed by GitHub
parent aa372ce22d dfec510b41
commit b2a857a023
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -145,7 +145,7 @@ override undefine GOBIN
# This must never include the 'hack' directory
export PATH := $(shell $(GO) env GOPATH)/bin:$(PATH)
GOMD2MAN ?= $(shell command -v go-md2man || echo './test/tools/build/go-md2man')
GOMD2MAN ?= ./test/tools/build/go-md2man
CROSS_BUILD_TARGETS := \
bin/podman.cross.linux.amd64 \
@ -954,7 +954,7 @@ install.tools: .install.golangci-lint ## Install needed tools
.PHONY: .install.md2man
.install.md2man:
if [ ! -x "$(GOMD2MAN)" ]; then \
$(MAKE) -C test/tools build/go-md2man ; \
$(MAKE) -C test/tools build/go-md2man GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH); \
fi
.PHONY: .install.pre-commit

1
rpm/podman.spec
View File

@ -74,7 +74,6 @@ Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugi
Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz
Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
BuildRequires: %{_bindir}/envsubst
BuildRequires: %{_bindir}/go-md2man
%if %{defined build_with_btrfs}
BuildRequires: btrfs-progs-devel
%endif