enable-fsck: Adjust to latest debianize changes

Message ID 1d95174e-838d-480d-ae4d-f59be2da2a7d@siemens.com
State Accepted, archived
Headers show
Series enable-fsck: Adjust to latest debianize changes | expand

Commit Message

Jan Kiszka May 2, 2024, 9:27 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

The debianize class installs systemd services automatically now. Doing
it manually as well breaks on sid at least.

Furthermore, mark this arch-agnostic package as such and give it a
version.

Fixes: 39adde9f456b ("debianize: handle .triggers and .service files")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../enable-fsck/{enable-fsck.bb => enable-fsck_0.2.bb}       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/enable-fsck/{enable-fsck.bb => enable-fsck_0.2.bb} (81%)

Comments

Uladzimir Bely May 10, 2024, 5:45 a.m. UTC | #1
On Thu, 2024-05-02 at 11:27 +0200, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> The debianize class installs systemd services automatically now.
> Doing
> it manually as well breaks on sid at least.
> 
> Furthermore, mark this arch-agnostic package as such and give it a
> version.
> 
> Fixes: 39adde9f456b ("debianize: handle .triggers and .service
> files")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .../enable-fsck/{enable-fsck.bb => enable-fsck_0.2.bb}       | 5 ++-
> --
>  1 file changed, 2 insertions(+), 3 deletions(-)
>  rename meta/recipes-support/enable-fsck/{enable-fsck.bb => enable-
> fsck_0.2.bb} (81%)
> 
> diff --git a/meta/recipes-support/enable-fsck/enable-fsck.bb
> b/meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
> similarity index 81%
> rename from meta/recipes-support/enable-fsck/enable-fsck.bb
> rename to meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
> index 0413f79d..2d0ec950 100644
> --- a/meta/recipes-support/enable-fsck/enable-fsck.bb
> +++ b/meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
> @@ -16,10 +16,9 @@ SRC_URI = " \
>      file://enable-fsck.sh \
>      file://postinst"
>  
> -do_install() {
> -    install -d -m 755 ${D}/lib/systemd/system
> -    install -m 644 ${WORKDIR}/enable-fsck.service
> ${D}/lib/systemd/system/
> +DPKG_ARCH = "all"
>  
> +do_install() {
>      install -d -m 755 ${D}/usr/share/enable-fsck
>      install -m 755 ${WORKDIR}/enable-fsck.sh ${D}/usr/share/enable-
> fsck/
>  }
> -- 
> 2.35.3
> 

Applied to next, thanks.

Patch

diff --git a/meta/recipes-support/enable-fsck/enable-fsck.bb b/meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
similarity index 81%
rename from meta/recipes-support/enable-fsck/enable-fsck.bb
rename to meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
index 0413f79d..2d0ec950 100644
--- a/meta/recipes-support/enable-fsck/enable-fsck.bb
+++ b/meta/recipes-support/enable-fsck/enable-fsck_0.2.bb
@@ -16,10 +16,9 @@  SRC_URI = " \
     file://enable-fsck.sh \
     file://postinst"
 
-do_install() {
-    install -d -m 755 ${D}/lib/systemd/system
-    install -m 644 ${WORKDIR}/enable-fsck.service ${D}/lib/systemd/system/
+DPKG_ARCH = "all"
 
+do_install() {
     install -d -m 755 ${D}/usr/share/enable-fsck
     install -m 755 ${WORKDIR}/enable-fsck.sh ${D}/usr/share/enable-fsck/
 }