Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit 1638106

Browse files
dvzrvsvntogit
dvzrv
authored and
svntogit
committed
upgpkg: cri-tools 1.27.0-1: Upgrade to 1.27.0.
Switch to using source tarball by patching Makefile: kubernetes-sigs/cri-tools#1140 Attempt to get debug package to work. git-svn-id: file:///srv/repos/svn-community/svn@1447263 9fca08f4-af9d-4005-b8df-a31f2cc04f65
1 parent bcd1c4d commit 1638106

File tree

3 files changed

+78
-66
lines changed

3 files changed

+78
-66
lines changed

Diff for: ‎trunk/PKGBUILD

+37-35
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,74 @@
11
# Maintainer: David Runge <[email protected]>
22

33
pkgbase=cri-tools
4-
pkgname=(crictl critest)
5-
pkgver=1.26.1
6-
_commit=300f0781645f12437b43fba5dd232733e0f2f82f # v1.26.1
4+
pkgname=(
5+
crictl
6+
critest
7+
)
8+
pkgver=1.27.0
79
pkgrel=1
810
pkgdesc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"
911
arch=(x86_64)
1012
url="https://github.com/kubernetes-sigs/cri-tools"
1113
license=(Apache)
1214
groups=(kubernetes-tools)
1315
depends=(glibc)
14-
makedepends=(git go)
15-
# can only build from git: https://github.com/kubernetes-sigs/cri-tools/issues/676
16+
makedepends=(go)
1617
source=(
17-
git+$url#commit=$_commit
18-
$pkgbase-1.24.1-makefile.patch
18+
https://github.com/kubernetes-sigs/cri-tools/archive/v$pkgver/$pkgbase-v$pkgver.tar.gz
19+
$pkgbase-1.27.0-makefile.patch
1920
)
20-
sha512sums=('SKIP'
21-
'b3c47dfd7a624faecc94627dbcb6279af6927a5c4bd470b244619b2dc24b1afc2a3378491583686e0c763c98191d1f2122afa75cdf9c4f4a7a70e344f5c7e5a4')
22-
b2sums=('SKIP'
23-
'51e53be22879437df77507c1157a80081cfd5db12ecd3f24e3ed7d4f421e79ad8c48347ba3e2888e896b2cbb658a13f61bbbe123e4ed34ef315864e5eef9ca85')
21+
sha512sums=('b94122e6401eb0c33b9c3d112274b7ab20cbbad05e76a54933e79d2e42ded2d684771cb9ed703a6c1afa381844142b6f1b4dc77d17e915f9a42c236fd8426b9b'
22+
'd243325031c5abccfec7035575abeb4af87724a28f90e75b575dec01435deaf6ea157f75725b7bfe1f982b8353ebefb07e22103c9b2027b19d8c233651363f11')
23+
b2sums=('d6c0429271ebc4085e75b54d7f3b9f75ab796e63bc9ae7562105296b13bbad8b512293a7d25abf1ab946f4bf54e672016fdb72696c12c730d21ac74724da465c'
24+
'428c8f35b61ecf9e7c261903fd5dc8b15b26a6b326a510f7b888f3d6989695e6345c98832886da5dfdc15b9087302a866c272a33cdb6f45d7698c70bcfdff1ca')
2425

2526
prepare() {
26-
# set CGO_ENABLED, honor GOFLAGS and allow adding to GO_LDFLAGS
27-
patch -Np1 -d $pkgbase -i ../$pkgbase-1.24.1-makefile.patch
27+
# fix various issues with Makefile: https://github.com/kubernetes-sigs/cri-tools/pull/1140
28+
patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.27.0-makefile.patch
2829
}
2930

3031
build() {
31-
export CGO_CPPFLAGS="${CPPFLAGS}"
32-
export CGO_CFLAGS="${CFLAGS}"
33-
export CGO_CXXFLAGS="${CXXFLAGS}"
34-
export CGO_LDFLAGS="${LDFLAGS}"
35-
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
36-
# NOTE: this ensures the binaries have full RELRO
37-
export GO_LDFLAGS="-linkmode=external"
32+
local common_ldflags=(
33+
-compressdwarf=false
34+
-linkmode external
35+
)
36+
37+
export CGO_CPPFLAGS="$CPPFLAGS"
38+
export CGO_CFLAGS="$CFLAGS"
39+
export CGO_CXXFLAGS="$CXXFLAGS"
40+
export CGO_LDFLAGS="$LDFLAGS"
41+
export CGO_ENABLED=1
42+
export GOPATH="${srcdir}"
43+
export GOFLAGS="-buildmode=pie -mod=readonly -modcacherw"
3844

39-
make -C $pkgbase
45+
make VERSION=$pkgver GO_LDFLAGS="${common_ldflags[*]}" -C $pkgbase-$pkgver
4046

41-
# crictl shell completion
4247
mkdir -vp completions
43-
local _binary
44-
for _binary in crictl; do
45-
$pkgbase/build/bin/linux/amd64/$_binary completion bash > completions/$_binary
46-
$pkgbase/build/bin/linux/amd64/$_binary completion zsh > completions/_$_binary
47-
$pkgbase/build/bin/linux/amd64/$_binary completion fish > completions/$_binary.fish
48-
done
48+
$pkgbase-$pkgver/build/bin/linux/amd64/crictl completion bash > completions/crictl
49+
$pkgbase-$pkgver/build/bin/linux/amd64/crictl completion zsh > completions/_crictl
50+
$pkgbase-$pkgver/build/bin/linux/amd64/crictl completion fish > completions/crictl.fish
4951
}
5052

5153
package_crictl() {
5254
pkgdesc="A CLI for CRI-compatible container runtimes"
5355

54-
install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
56+
install -vDm 755 $pkgbase-$pkgver/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
5557
# shell completion
5658
install -vDm 644 completions/$pkgname -t "$pkgdir/usr/share/bash-completion/completions/"
5759
install -vDm 644 completions/_$pkgname -t "$pkgdir/usr/share/zsh/site-functions/"
5860
install -vDm 644 completions/$pkgname.fish -t "$pkgdir/usr/share/fish/completions/"
5961
# docs
60-
install -vDm 644 $pkgbase/docs/$pkgname.md -t "$pkgdir/usr/share/doc/$pkgname/"
61-
install -vDm 644 $pkgbase/docs/examples/*.{json,yaml} -t "$pkgdir/usr/share/doc/$pkgname/examples/"
62-
install -vDm 644 $pkgbase/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname"
62+
install -vDm 644 $pkgbase-$pkgver/docs/$pkgname.md -t "$pkgdir/usr/share/doc/$pkgname/"
63+
install -vDm 644 $pkgbase-$pkgver/docs/examples/*.{json,yaml} -t "$pkgdir/usr/share/doc/$pkgname/examples/"
64+
install -vDm 644 $pkgbase-$pkgver/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname"
6365
}
6466

6567
package_critest() {
6668
pkgdesc="A benchmarking CLI for CRI-compatible container runtimes"
6769

68-
install -vDm 755 $pkgbase/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
70+
install -vDm 755 $pkgbase-$pkgver/build/bin/linux/amd64/$pkgname -t "$pkgdir/usr/bin/"
6971
# docs
70-
install -vDm 644 $pkgbase/docs/{benchmark,validation}.md -t "$pkgdir/usr/share/doc/$pkgname/"
71-
install -vDm 644 $pkgbase/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname/"
72+
install -vDm 644 $pkgbase-$pkgver/docs/{benchmark,validation}.md -t "$pkgdir/usr/share/doc/$pkgname/"
73+
install -vDm 644 $pkgbase-$pkgver/{{CHANGELOG,CONTRIBUTING,README,code-of-conduct}.md,SECURITY_CONTACTS} -t "$pkgdir/usr/share/doc/$pkgname/"
7274
}

Diff for: ‎trunk/cri-tools-1.24.1-makefile.patch

-31
This file was deleted.

Diff for: ‎trunk/cri-tools-1.27.0-makefile.patch

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
diff --git c/Makefile w/Makefile
2+
index 1b4bed6e..1210d1f1 100644
3+
--- c/Makefile
4+
+++ w/Makefile
5+
@@ -33,9 +33,10 @@ endif
6+
PROJECT := github.com/kubernetes-sigs/cri-tools
7+
BINDIR ?= /usr/local/bin
8+
9+
-VERSION := $(shell git describe --tags --dirty --always)
10+
-VERSION := $(VERSION:v%=%)
11+
-GO_LDFLAGS := -X $(PROJECT)/pkg/version.Version=$(VERSION)
12+
+VERSION ?= $(shell git describe --tags --dirty --always | sed 's/^v//')
13+
+CGO_ENABLED ?= 0
14+
+GOFLAGS ?= -trimpath
15+
+GO_LDFLAGS := $(GO_LDFLAGS) -X $(PROJECT)/pkg/version.Version=$(VERSION)
16+
17+
BUILD_PATH := $(shell pwd)/build
18+
BUILD_BIN_PATH := $(BUILD_PATH)/bin/$(GOOS)/$(GOARCH)
19+
@@ -64,18 +65,18 @@ critest:
20+
@$(MAKE) -B $(CRITEST)
21+
22+
$(CRITEST):
23+
- CGO_ENABLED=0 $(GO_TEST) -c -o $@ \
24+
+ CGO_ENABLED=$(CGO_ENABLED) $(GO_TEST) -c -o $@ \
25+
-ldflags '$(GO_LDFLAGS)' \
26+
- -trimpath \
27+
+ $(GOFLAGS) \
28+
$(PROJECT)/cmd/critest
29+
30+
crictl:
31+
@$(MAKE) -B $(CRICTL)
32+
33+
$(CRICTL):
34+
- CGO_ENABLED=0 $(GO_BUILD) -o $@ \
35+
+ CGO_ENABLED=$(CGO_ENABLED) $(GO_BUILD) -o $@ \
36+
-ldflags '$(GO_LDFLAGS)' \
37+
- -trimpath \
38+
+ $(GOFLAGS) \
39+
$(PROJECT)/cmd/crictl
40+
41+
clean:

0 commit comments

Comments
 (0)