[meta-virtualization][kirkstone][PATCH] irqbalance: Use built-in irqbalance.service instead of local one

[meta-virtualization][kirkstone][PATCH] irqbalance: Use built-in irqbalance.service instead of local one

[He Zhe]

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>
---
 recipes-extended/irqbalance/irqbalance.inc               | 3 +--
 .../irqbalance/irqbalance/irqbalanced.service            | 9 ---------
 recipes-extended/irqbalance/irqbalance_git.bb            | 1 -
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 recipes-extended/irqbalance/irqbalance/irqbalanced.service

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 () {
         chmod 755 ${D}${sysconfdir}/init.d/irqbalanced
 
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/irqbalanced.service ${D}${systemd_unitdir}/system
-        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/irqbalanced.service
+        install -m 0644 ${S}/misc/irqbalance.service ${D}${systemd_unitdir}/system/irqbalanced.service
 }
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 @@
-[Unit]
-Description=irqbalance daemon
-After=syslog.target
-
-[Service]
-ExecStart=@SBINDIR@/irqbalance --foreground
-
-[Install]
-WantedBy=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}"
 SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
            file://add-initscript.patch \
            file://irqbalance-Add-status-and-reload-commands.patch \
-           file://irqbalanced.service \
           "
 
 S = "${WORKDIR}/git"
-- 
2.25.1

Re: [meta-virtualization][kirkstone][PATCH] irqbalance: Use built-in irqbalance.service instead of local one

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization][kirkstone][PATCH] irqbalance: Use built-in irqbalance.service instead of local one
on 15/02/2023 He Zhe wrote:

> 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>
> ---
>  recipes-extended/irqbalance/irqbalance.inc               | 3 +--
>  .../irqbalance/irqbalance/irqbalanced.service            | 9 ---------
>  recipes-extended/irqbalance/irqbalance_git.bb            | 1 -
>  3 files changed, 1 insertion(+), 12 deletions(-)
>  delete mode 100644 recipes-extended/irqbalance/irqbalance/irqbalanced.service
> 
> 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 () {
>          chmod 755 ${D}${sysconfdir}/init.d/irqbalanced
>  
>          install -d ${D}${systemd_unitdir}/system
> -        install -m 0644 ${WORKDIR}/irqbalanced.service ${D}${systemd_unitdir}/system
> -        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/irqbalanced.service
> +        install -m 0644 ${S}/misc/irqbalance.service ${D}${systemd_unitdir}/system/irqbalanced.service
>  }
> 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 @@
> -[Unit]
> -Description=irqbalance daemon
> -After=syslog.target
> -
> -[Service]
> -ExecStart=@SBINDIR@/irqbalance --foreground
> -
> -[Install]
> -WantedBy=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}"
>  SRC_URI = "git://github.com/Irqbalance/irqbalance;branch=master;protocol=https \
>             file://add-initscript.patch \
>             file://irqbalance-Add-status-and-reload-commands.patch \
> -           file://irqbalanced.service \
>            "
>  
>  S = "${WORKDIR}/git"
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7854): https://lists.yoctoproject.org/g/meta-virtualization/message/7854
> Mute This Topic: https://lists.yoctoproject.org/mt/96981111/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>