Signed-off-by: Jose Quaresma <[email protected]>
---
recipes-containers/k3s/k3s/k3s-agent.service | 4 ++--
recipes-containers/k3s/k3s/k3s.service | 4 ++--
recipes-containers/k3s/k3s_git.bb | 22 +++++++++-----------
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/recipes-containers/k3s/k3s/k3s-agent.service
b/recipes-containers/k3s/k3s/k3s-agent.service
index 9f9016d..0792970 100644
--- a/recipes-containers/k3s/k3s/k3s-agent.service
+++ b/recipes-containers/k3s/k3s/k3s-agent.service
@@ -21,6 +21,6 @@ Restart=always
RestartSec=5s
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s agent
-ExecStopPost=/usr/local/bin/k3s-clean
+ExecStart=/usr/bin/k3s agent
+ExecStopPost=/usr/bin/k3s-clean
diff --git a/recipes-containers/k3s/k3s/k3s.service
b/recipes-containers/k3s/k3s/k3s.service
index 33d3ee7..647fc66 100644
--- a/recipes-containers/k3s/k3s/k3s.service
+++ b/recipes-containers/k3s/k3s/k3s.service
@@ -29,9 +29,9 @@ RestartSec=5s
ExecStartPre=/bin/sh -xc '! systemctl is-enabled --quiet
nm-cloud-setup.service'
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s server
+ExecStart=/usr/bin/k3s server
# Avoid any delay due to this service when the system is rebooting or shutting
# down by using the k3s-killall.sh script to kill all of the running k3s
# services and containers
ExecStopPost=/bin/sh -c "if systemctl is-system-running | grep -i \
- 'stopping'; then /usr/local/bin/k3s-killall.sh; fi"
+ 'stopping'; then /usr/bin/k3s-killall.sh; fi"
diff --git a/recipes-containers/k3s/k3s_git.bb
b/recipes-containers/k3s/k3s_git.bb
index 7f9f549..f8595df 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -37,7 +37,6 @@ GO_BUILD_LDFLAGS = "-X
github.com/rancher/k3s/pkg/version.Version=${PV} \
-X
github.com/rancher/k3s/pkg/version.GitCommit=${@d.getVar('SRCREV_k3s', d,
1)[:8]} \
-w -s \
"
-BIN_PREFIX ?= "${exec_prefix}/local"
inherit features_check
REQUIRED_DISTRO_FEATURES ?= "seccomp"
@@ -634,20 +633,20 @@ do_compile() {
}
do_install() {
- install -d "${D}${BIN_PREFIX}/bin"
- install -m 755 "${S}/src/import/dist/artifacts/k3s"
"${D}${BIN_PREFIX}/bin"
- ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/crictl"
+ install -d "${D}${bindir}"
+ install -m 755 "${S}/src/import/dist/artifacts/k3s" "${D}${bindir}"
+ ln -sr "${D}${bindir}/k3s" "${D}${bindir}/crictl"
# We want to use the containerd provided ctr
- # ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/ctr"
- ln -sr "${D}/${BIN_PREFIX}/bin/k3s" "${D}${BIN_PREFIX}/bin/kubectl"
- install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin"
- install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin"
+ # ln -sr "${D}${bindir}/k3s" "${D}${bindir}/ctr"
+ ln -sr "${D}${bindir}/k3s" "${D}${bindir}/kubectl"
+ install -m 755 "${WORKDIR}/k3s-clean" "${D}${bindir}"
+ install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${bindir}"
if
${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -D -m 0644 "${WORKDIR}/k3s.service"
"${D}${systemd_system_unitdir}/k3s.service"
install -D -m 0644 "${WORKDIR}/k3s-agent.service"
"${D}${systemd_system_unitdir}/k3s-agent.service"
- 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"
- install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin"
+ sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${bindir}/\4#g"
"${D}${systemd_system_unitdir}/k3s.service"
"${D}${systemd_system_unitdir}/k3s-agent.service"
+ install -m 755 "${WORKDIR}/k3s-agent" "${D}${bindir}"
fi
}
@@ -658,8 +657,7 @@ SYSTEMD_SERVICE:${PN}-server =
"${@bb.utils.contains('DISTRO_FEATURES','systemd'
SYSTEMD_SERVICE:${PN}-agent =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','k3s-agent.service','',d)}"
SYSTEMD_AUTO_ENABLE:${PN}-agent = "disable"
-FILES:${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent"
-FILES:${PN} += "${BIN_PREFIX}/bin/*"
+FILES:${PN}-agent = "${bindir}/k3s-agent"
RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables
iproute2 ipset virtual-containerd"
RDEPENDS:${PN}-server = "${PN}"
--
2.37.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7498):
https://lists.yoctoproject.org/g/meta-virtualization/message/7498
Mute This Topic: https://lists.yoctoproject.org/mt/92913428/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
