diff options
Diffstat (limited to 'recipes-containers/k3s/k3s_git.bb')
-rw-r--r-- | recipes-containers/k3s/k3s_git.bb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index b88b8349..59333b98 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://k3s.io/" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" | 5 | LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.28;name=k3s;protocol=https \ | 7 | SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.32;name=k3s;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
8 | file://k3s.service \ | 8 | file://k3s.service \ |
9 | file://k3s-agent.service \ | 9 | file://k3s-agent.service \ |
10 | file://k3s-agent \ | 10 | file://k3s-agent \ |
@@ -16,14 +16,14 @@ SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.28;name=k3s;protoco | |||
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5" | 18 | SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5" |
19 | SRCREV_k3s = "051b14b248655896fdfd7ba6c93db6182cde7431" | 19 | SRCREV_k3s = "39f4cbb3367544477e9e678626c0add76e731624" |
20 | 20 | ||
21 | SRCREV_FORMAT = "k3s_fuse" | 21 | SRCREV_FORMAT = "k3s_fuse" |
22 | PV = "v1.28.7+k3s1+git${SRCREV_k3s}" | 22 | PV = "v1.32.0-rc2+k3s1+git${SRCREV_k3s}" |
23 | 23 | ||
24 | include src_uri.inc | 24 | include src_uri.inc |
25 | 25 | ||
26 | CNI_NETWORKING_FILES ?= "${WORKDIR}/cni-containerd-net.conf" | 26 | CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conf" |
27 | 27 | ||
28 | inherit go | 28 | inherit go |
29 | inherit goarch | 29 | inherit goarch |
@@ -74,7 +74,7 @@ do_compile() { | |||
74 | # | 74 | # |
75 | # vendor/github.com/containerd/containerd/snapshots/btrfs/plugin/*.go | 75 | # vendor/github.com/containerd/containerd/snapshots/btrfs/plugin/*.go |
76 | 76 | ||
77 | cp ${WORKDIR}/modules.txt vendor/ | 77 | cp ${UNPACKDIR}/modules.txt vendor/ |
78 | 78 | ||
79 | VERSION_GOLANG="$(go version | cut -d" " -f3)" | 79 | VERSION_GOLANG="$(go version | cut -d" " -f3)" |
80 | ${GO} build -trimpath -tags "$TAGS" -ldflags "-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=$VERSION_GOLANG ${GO_BUILD_LDFLAGS} -w -s" -o ./dist/artifacts/k3s ./cmd/server/main.go | 80 | ${GO} build -trimpath -tags "$TAGS" -ldflags "-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=$VERSION_GOLANG ${GO_BUILD_LDFLAGS} -w -s" -o ./dist/artifacts/k3s ./cmd/server/main.go |
@@ -92,14 +92,14 @@ do_install() { | |||
92 | # We want to use the containerd provided ctr | 92 | # We want to use the containerd provided ctr |
93 | # ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr" | 93 | # ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr" |
94 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" | 94 | ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl" |
95 | install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" | 95 | install -m 755 "${UNPACKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" |
96 | install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" | 96 | install -m 755 "${UNPACKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" |
97 | 97 | ||
98 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 98 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
99 | install -D -m 0644 "${WORKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" | 99 | install -D -m 0644 "${UNPACKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" |
100 | install -D -m 0644 "${WORKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" | 100 | install -D -m 0644 "${UNPACKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" |
101 | sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${BIN_PREFIX}/bin/\4#g" "${D}${systemd_system_unitdir}/k3s.service" "${D}${systemd_system_unitdir}/k3s-agent.service" | 101 | sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${BIN_PREFIX}/bin/\4#g" "${D}${systemd_system_unitdir}/k3s.service" "${D}${systemd_system_unitdir}/k3s-agent.service" |
102 | install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" | 102 | install -m 755 "${UNPACKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" |
103 | fi | 103 | fi |
104 | 104 | ||
105 | mkdir -p ${D}${datadir}/k3s/ | 105 | mkdir -p ${D}${datadir}/k3s/ |