| Message ID | 1F1C12BB7E7BAA40ACCAD76309F0BEC3018513AB@dor-sms-xch01.digi.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [meta-swupdate,morty] swupdate: fix build for non-git versions | expand |
Hi Arturo, On 16/04/2018 11:50, Buzarra, Arturo wrote: > Hi, > > After the lasts patch in the morty branch the build for non-git versions is broken. > Attached you can find a patch to install the new files only for the git version and fix the build for the rest. > ------------------------------------------------------------------------------------------------------------------------------------------- > Please use "git send-email" to send your patch to the ML. > From: Arturo Buzarra <arturo.buzarra@digi.com> > Date: Mon, 16 Apr 2018 11:38:52 +0200 > Subject: [PATCH] swupdate: fix build for non-git versions > > After the commit 9cc528711ad38ba2fee06746b7dd80260d9767ce the > build is broken for non-git versions. > > Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> > --- > recipes-support/swupdate/swupdate.inc | 3 --- > recipes-support/swupdate/swupdate_git.bb | 8 ++++++++ > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc > index 031e433..a6b151e 100644 > --- a/recipes-support/swupdate/swupdate.inc > +++ b/recipes-support/swupdate/swupdate.inc > @@ -123,11 +123,8 @@ do_install () { > > install -d ${D}${systemd_unitdir}/system > install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_unitdir}/system > - install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system > - install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system > if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then > install -d ${D}${sysconfdir}/udev/rules.d If you drop the files from the main install, while udev/rules.d is still installed ? IMHO the check on DISTRO_FEATURES should be moved entirely to swupdate_git in the do_install_append() > - install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ > fi > } > > diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb > index 4a9131f..964b1e3 100644 > --- a/recipes-support/swupdate/swupdate_git.bb > +++ b/recipes-support/swupdate/swupdate_git.bb > @@ -15,3 +15,11 @@ do_compile_append() { > oe_runmake > unset LDFLAGS > } > + > +do_install_append () { > + install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system > + install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system > + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then > + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ > + fi > +} > Best regards, Stefano Babic
diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 031e433..a6b151e 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -123,11 +123,8 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ fi } diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 4a9131f..964b1e3 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -15,3 +15,11 @@ do_compile_append() { oe_runmake unset LDFLAGS } + +do_install_append () { + install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + fi +}