Message ID | aa9baf96-98d8-41fb-9297-9d9b20d1520e@siemens.com |
---|---|
State | Accepted, archived |
Headers | show |
Series | sshd-regen-keys: Adjust to latest debianize changes | expand |
On 02.05.24 11:27, Jan Kiszka 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. > > Fixes: 39adde9f456b ("debianize: handle .triggers and .service files") BTW, this highlights that the original patch was changing the recipe API without documenting that. Will you send an update for RECIPES-API-CHANGELOG.md, Cedric? Jan > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > .../{sshd-regen-keys_0.4.bb => sshd-regen-keys_0.5.bb} | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > rename meta/recipes-support/sshd-regen-keys/{sshd-regen-keys_0.4.bb => sshd-regen-keys_0.5.bb} (61%) > > diff --git a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb > similarity index 61% > rename from meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > rename to meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb > index 9ce1d8d8..55d67f6e 100644 > --- a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > +++ b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb > @@ -5,10 +5,7 @@ DESCRIPTION = "Systemd service to regenerate sshd keys" > MAINTAINER = "isar-users <isar-users@googlegroups.com>" > DEBIAN_DEPENDS = "openssh-server, systemd" > > +DPKG_ARCH = "all" > + > SRC_URI = "file://postinst \ > file://sshd-regen-keys.service" > - > -do_install() { > - install -d -m 0755 "${D}/lib/systemd/system" > - install -m 0644 "${WORKDIR}/sshd-regen-keys.service" "${D}/lib/systemd/system/sshd-regen-keys.service" > -}
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. > > Fixes: 39adde9f456b ("debianize: handle .triggers and .service > files") > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > .../{sshd-regen-keys_0.4.bb => sshd-regen-keys_0.5.bb} | 7 ++--- > -- > 1 file changed, 2 insertions(+), 5 deletions(-) > rename meta/recipes-support/sshd-regen-keys/{sshd-regen-keys_0.4.bb > => sshd-regen-keys_0.5.bb} (61%) > > diff --git a/meta/recipes-support/sshd-regen-keys/sshd-regen- > keys_0.4.bb b/meta/recipes-support/sshd-regen-keys/sshd-regen- > keys_0.5.bb > similarity index 61% > rename from meta/recipes-support/sshd-regen-keys/sshd-regen- > keys_0.4.bb > rename to meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb > index 9ce1d8d8..55d67f6e 100644 > --- a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb > +++ b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb > @@ -5,10 +5,7 @@ DESCRIPTION = "Systemd service to regenerate sshd > keys" > MAINTAINER = "isar-users <isar-users@googlegroups.com>" > DEBIAN_DEPENDS = "openssh-server, systemd" > > +DPKG_ARCH = "all" > + > SRC_URI = "file://postinst \ > file://sshd-regen-keys.service" > - > -do_install() { > - install -d -m 0755 "${D}/lib/systemd/system" > - install -m 0644 "${WORKDIR}/sshd-regen-keys.service" > "${D}/lib/systemd/system/sshd-regen-keys.service" > -} > -- > 2.35.3 > Applied to next, thanks.
diff --git a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb similarity index 61% rename from meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb rename to meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb index 9ce1d8d8..55d67f6e 100644 --- a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb +++ b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.5.bb @@ -5,10 +5,7 @@ DESCRIPTION = "Systemd service to regenerate sshd keys" MAINTAINER = "isar-users <isar-users@googlegroups.com>" DEBIAN_DEPENDS = "openssh-server, systemd" +DPKG_ARCH = "all" + SRC_URI = "file://postinst \ file://sshd-regen-keys.service" - -do_install() { - install -d -m 0755 "${D}/lib/systemd/system" - install -m 0644 "${WORKDIR}/sshd-regen-keys.service" "${D}/lib/systemd/system/sshd-regen-keys.service" -}