| Message ID | 20251126131832.179765-1-alexander.heinisch@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | debianize: add support for systemd unit files | expand |
Applied to next, thanks. Zhihang On 11/26/25 14:18, alexander.heinisch via isar-users wrote: > From: Alexander Heinisch <alexander.heinisch@siemens.com> > > Extended support for: > - dh_installsystemd > - dh_installsystemduser > - dh_installtmpfiles > > handled files. > > Signed-off-by: Alexander Heinisch <alexander.heinisch@siemens.com> > --- > meta/classes/debianize.bbclass | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass > index e29bfb1e..a629feba 100644 > --- a/meta/classes/debianize.bbclass > +++ b/meta/classes/debianize.bbclass > @@ -174,12 +174,32 @@ deb_debianize() { > done > done > > - # handle system unit files and triggers for use with debhelper > - for f in path service socket target timer triggers \ > - user.path user.service user.socket user.target user.timer > + # handle system unit files, tmpfiles and triggers for use with debhelper > + dh_installdeb_handled=" \ > + .triggers > + " > + > + dh_installsystemd_handled=" \ > + .mount .path .service .socket .target .timer \ > + @.path @.service @.socket @.target @.timer \ > + " > + > + dh_installsystemduser_handled=" \ > + .user.path .user.service .user.socket .user.target .user.timer \ > + @.user.path @.user.service @.user.socket @.user.target @.user.timer \ > + " > + > + dh_installtmpfiles_handled=" \ > + .tmpfiles > + " > + > + for f in ${dh_installdeb_handled} \ > + ${dh_installsystemd_handled} \ > + ${dh_installsystemduser_handled} \ > + ${dh_installtmpfiles_handled} > do > - if [ -f ${WORKDIR}/${PN}.${f} ]; then > - install -v -m 644 ${WORKDIR}/${PN}.${f} ${S}/debian/ > + if [ -f ${WORKDIR}/${PN}${f} ]; then > + install -v -m 644 ${WORKDIR}/${PN}${f} ${S}/debian/ > fi > done > }
diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index e29bfb1e..a629feba 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -174,12 +174,32 @@ deb_debianize() { done done - # handle system unit files and triggers for use with debhelper - for f in path service socket target timer triggers \ - user.path user.service user.socket user.target user.timer + # handle system unit files, tmpfiles and triggers for use with debhelper + dh_installdeb_handled=" \ + .triggers + " + + dh_installsystemd_handled=" \ + .mount .path .service .socket .target .timer \ + @.path @.service @.socket @.target @.timer \ + " + + dh_installsystemduser_handled=" \ + .user.path .user.service .user.socket .user.target .user.timer \ + @.user.path @.user.service @.user.socket @.user.target @.user.timer \ + " + + dh_installtmpfiles_handled=" \ + .tmpfiles + " + + for f in ${dh_installdeb_handled} \ + ${dh_installsystemd_handled} \ + ${dh_installsystemduser_handled} \ + ${dh_installtmpfiles_handled} do - if [ -f ${WORKDIR}/${PN}.${f} ]; then - install -v -m 644 ${WORKDIR}/${PN}.${f} ${S}/debian/ + if [ -f ${WORKDIR}/${PN}${f} ]; then + install -v -m 644 ${WORKDIR}/${PN}${f} ${S}/debian/ fi done }