| Message ID | 20180416101529.6957-1-arturo.buzarra@digi.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | swupdate: fix build for non-git versions | expand |
Hi Arturo, On 16/04/2018 12:15, Arturo Buzarra wrote: > 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 | 6 ------ > recipes-support/swupdate/swupdate_git.bb | 9 +++++++++ > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc > index 031e433..27dcf86 100644 > --- a/recipes-support/swupdate/swupdate.inc > +++ b/recipes-support/swupdate/swupdate.inc > @@ -123,12 +123,6 @@ 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 > } > > INITSCRIPT_NAME = "swupdate" > diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb > index 4a9131f..0ddd418 100644 > --- a/recipes-support/swupdate/swupdate_git.bb > +++ b/recipes-support/swupdate/swupdate_git.bb > @@ -15,3 +15,12 @@ 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 -d ${D}${sysconfdir}/udev/rules.d > + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ > + fi > +} > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 16/04/2018 12:15, Arturo Buzarra wrote: > 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 | 6 ------ > recipes-support/swupdate/swupdate_git.bb | 9 +++++++++ > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc > index 031e433..27dcf86 100644 > --- a/recipes-support/swupdate/swupdate.inc > +++ b/recipes-support/swupdate/swupdate.inc > @@ -123,12 +123,6 @@ 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 > } > > INITSCRIPT_NAME = "swupdate" > diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb > index 4a9131f..0ddd418 100644 > --- a/recipes-support/swupdate/swupdate_git.bb > +++ b/recipes-support/swupdate/swupdate_git.bb > @@ -15,3 +15,12 @@ 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 -d ${D}${sysconfdir}/udev/rules.d > + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ > + fi > +} > Applied to meta-swupdate, -morty, thanks ! Best regards, Stefano Babic
Thanks for your quick response. Arturo. -----Original Message----- From: Stefano Babic [mailto:sbabic@denx.de] Sent: Wednesday, April 18, 2018 14:29 To: Buzarra, Arturo <Arturo.Buzarra@digi.com>; swupdate@googlegroups.com Subject: Re: [swupdate] [PATCH] swupdate: fix build for non-git versions On 16/04/2018 12:15, Arturo Buzarra wrote: > 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 | 6 ------ > recipes-support/swupdate/swupdate_git.bb | 9 +++++++++ > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/recipes-support/swupdate/swupdate.inc > b/recipes-support/swupdate/swupdate.inc > index 031e433..27dcf86 100644 > --- a/recipes-support/swupdate/swupdate.inc > +++ b/recipes-support/swupdate/swupdate.inc > @@ -123,12 +123,6 @@ 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 > } > > INITSCRIPT_NAME = "swupdate" > diff --git a/recipes-support/swupdate/swupdate_git.bb > b/recipes-support/swupdate/swupdate_git.bb > index 4a9131f..0ddd418 100644 > --- a/recipes-support/swupdate/swupdate_git.bb > +++ b/recipes-support/swupdate/swupdate_git.bb > @@ -15,3 +15,12 @@ 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 -d ${D}${sysconfdir}/udev/rules.d > + install -m 0644 ${WORKDIR}/swupdate-usb.rules > +${D}${sysconfdir}/udev/rules.d/ > + fi > +} > Applied to meta-swupdate, -morty, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de =====================================================================
diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 031e433..27dcf86 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -123,12 +123,6 @@ 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 } INITSCRIPT_NAME = "swupdate" diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 4a9131f..0ddd418 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -15,3 +15,12 @@ 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 -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + fi +}
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 | 6 ------ recipes-support/swupdate/swupdate_git.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-)