project-lakitu: don't build man pages for containerd and docker-cli
Corss-compiling man pages doesn't work on ARM and causes build failures.
The fix requires a upgrade to golang toolchain.
Considering we mask man pages out when finalizing images anyway, let's
just stop building man pages for containerd and docker-cli packages
to unblock ARM project.
BUG=b/176996239
TEST=emerge-lakitu-arm64 containerd; emerge-lakitu-arm64 docker-cli
RELEASE_NOTE=none
Change-Id: Ia30701a59dc6a3fa0a67d61ef16d72c03929d571
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/11150
Reviewed-by: Ke Wu <mikewu@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-emulation/containerd/containerd-1.4.3-r2.ebuild b/project-lakitu/app-emulation/containerd/containerd-1.4.3-r3.ebuild
similarity index 100%
rename from project-lakitu/app-emulation/containerd/containerd-1.4.3-r2.ebuild
rename to project-lakitu/app-emulation/containerd/containerd-1.4.3-r3.ebuild
diff --git a/project-lakitu/app-emulation/containerd/containerd-1.4.3.ebuild b/project-lakitu/app-emulation/containerd/containerd-1.4.3.ebuild
index eab1554..cd2e836 100644
--- a/project-lakitu/app-emulation/containerd/containerd-1.4.3.ebuild
+++ b/project-lakitu/app-emulation/containerd/containerd-1.4.3.ebuild
@@ -87,13 +87,20 @@
"${GO}" "$@"
}
export -f go
- emake "${myemakeargs[@]}" all man
+ # lakitu: don't build man pages as cross-compiling man pages doesn't
+ # work on ARM.
+ # TODO(mikewu@): renable man pages building once b/178526852 is fixed.
+ #emake "${myemakeargs[@]}" all man
+ emake "${myemakeargs[@]}" all
unset -f go
}
src_install() {
dobin bin/*
- doman man/*
+ # lakitu: don't install man pages as cross-compiling man pages doesn't
+ # work on ARM.
+ # TODO(mikewu@): uncomment the following line once b/178526852 is fixed.
+ #doman man/*
# lakitu: we use systemd service to start containerd.
# newinitd "${FILESDIR}"/${PN}.initd "${PN}"
keepdir /var/lib/containerd
diff --git a/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2-r2.ebuild b/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2-r3.ebuild
similarity index 100%
rename from project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2-r2.ebuild
rename to project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2-r3.ebuild
diff --git a/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2.ebuild b/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
index 808688c..85a4ebd 100644
--- a/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
+++ b/project-lakitu/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
@@ -55,19 +55,25 @@
dynbinary
unset -f go
+ # lakitu: don't build man pages as cross-compiling man pages doesn't
+ # work on ARM.
+ # TODO(mikewu@): uncommment the following lines once b/178526852 is fixed.
# build man pages
# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
- go build -o "${T}"/gen-manpages ./man ||
- die 'build gen-manpages failed'
- "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
- die 'gen-manpages failed'
- ./man/md2man-all.sh -q ||
- die 'md2man-all.sh failed'
+ #go build -o "${T}"/gen-manpages ./man ||
+ #die 'build gen-manpages failed'
+ #"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+ #die 'gen-manpages failed'
+ #./man/md2man-all.sh -q ||
+ #die 'md2man-all.sh failed'
}
src_install() {
dobin build/docker
- doman man/man*/*
+ # lakitu: don't install man pages as cross-compiling man pages doesn't
+ # work on ARM.
+ # TODO(mikewu@): uncomment the following line once b/178526852 is fixed.
+ #doman man/man*/*
dobashcomp contrib/completion/bash/*
bashcomp_alias docker dockerd
insinto /usr/share/fish/vendor_completions.d/
