summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2022-08-22 18:23:56 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-08-23 21:43:33 -0400
commit46f90043656ade78ea1b8a23506aaa27f9fa8b39 (patch)
tree600b21cd4bdc3d5a83e8954d5e65394858477f09
parentdccd964570f89f4a0cdf16eb54c4064823df372d (diff)
downloadmeta-virtualization-46f90043656ade78ea1b8a23506aaa27f9fa8b39.tar.gz
irqbalance: Use built-in irqbalance.service instead of local one
The local irqbalanced.service was written long before when there wasn't one in upstream. Then upstream created temporary runtime directory /run/irqbalance in its irqbalanced.service, but no one did this for this recipe. Which renders the following error. /usr/sbin/irqbalance[314]: Daemon couldn't be bound to the file-based socket. This patch starts to use upstream irqbalance.service instead and remove the local one. root@qemux86-64:~# systemctl status irqbalanced * irqbalanced.service - irqbalance daemon Loaded: loaded (/lib/systemd/system/irqbalanced.service; enabled; preset: enabled) Active: active (running) since Mon 2022-08-22 10:10:22 UTC; 3s ago Docs: man:irqbalance(1) https://github.com/Irqbalance/irqbalance Main PID: 208 (irqbalance) Tasks: 2 (limit: 263) Memory: 1.4M CGroup: /system.slice/irqbalanced.service `-208 /usr/sbin/irqbalance --foreground Aug 22 10:10:22 qemux86-64 systemd[1]: Started irqbalance daemon. root@qemux86-64:~# ls -l /run/irqbalance/irqbalance208.sock srwxr-xr-x 1 root root 0 Aug 22 10:10 /run/irqbalance/irqbalance208.sock Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/irqbalance/irqbalance.inc3
-rw-r--r--recipes-extended/irqbalance/irqbalance/irqbalanced.service9
-rw-r--r--recipes-extended/irqbalance/irqbalance_git.bb1
3 files changed, 1 insertions, 12 deletions
diff --git a/recipes-extended/irqbalance/irqbalance.inc b/recipes-extended/irqbalance/irqbalance.inc
index c69b74ec..038cbae3 100644
--- a/recipes-extended/irqbalance/irqbalance.inc
+++ b/recipes-extended/irqbalance/irqbalance.inc
@@ -42,6 +42,5 @@ do_install () {
42 chmod 755 ${D}${sysconfdir}/init.d/irqbalanced 42 chmod 755 ${D}${sysconfdir}/init.d/irqbalanced
43 43
44 install -d ${D}${systemd_unitdir}/system 44 install -d ${D}${systemd_unitdir}/system
45 install -m 0644 ${WORKDIR}/irqbalanced.service ${D}${systemd_unitdir}/system 45 install -m 0644 ${S}/misc/irqbalance.service ${D}${systemd_unitdir}/system/irqbalanced.service
46 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/irqbalanced.service
47} 46}
diff --git a/recipes-extended/irqbalance/irqbalance/irqbalanced.service b/recipes-extended/irqbalance/irqbalance/irqbalanced.service
deleted file mode 100644
index 5b284faa..00000000
--- a/recipes-extended/irqbalance/irqbalance/irqbalanced.service
+++ /dev/null
@@ -1,9 +0,0 @@
1[Unit]
2Description=irqbalance daemon
3After=syslog.target
4
5[Service]
6ExecStart=@SBINDIR@/irqbalance --foreground
7
8[Install]
9WantedBy=multi-user.target
diff --git a/recipes-extended/irqbalance/irqbalance_git.bb b/recipes-extended/irqbalance/irqbalance_git.bb
index 48774889..a944c2f1 100644
--- a/recipes-extended/irqbalance/irqbalance_git.bb
+++ b/recipes-extended/irqbalance/irqbalance_git.bb
@@ -10,7 +10,6 @@ PV = "1.8.0+git${SRCPV}"
10SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \ 10SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
11 file://add-initscript.patch \ 11 file://add-initscript.patch \
12 file://irqbalance-Add-status-and-reload-commands.patch \ 12 file://irqbalance-Add-status-and-reload-commands.patch \
13 file://irqbalanced.service \
14 " 13 "
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"