* [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files
@ 2020-02-21 14:40 Francois Gervais
2020-02-21 16:33 ` Gervais, Francois
2020-02-23 21:18 ` Yann E. MORIN
0 siblings, 2 replies; 4+ messages in thread
From: Francois Gervais @ 2020-02-21 14:40 UTC (permalink / raw)
To: buildroot
A project could quite possibly have a custom rcw file
that does not rely on any custom rcw include files (rcwi).
Allow the build to succeed if this is the case.
Signed-off-by: Francois Gervais <fgervais@distech-controls.com>
---
package/rcw/rcw.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk
index 36d2da61b5..c1fb63b91b 100644
--- a/package/rcw/rcw.mk
+++ b/package/rcw/rcw.mk
@@ -25,7 +25,9 @@ endif
define HOST_RCW_ADD_CUSTOM_RCW_FILES
mkdir -p $(@D)/custom_board/rcw
- cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
+ if [ -n "$(filter-out %.rcw,$(RCW_FILES))" ]; then \
+ cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board; \
+ fi
cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
endef
HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files
2020-02-21 14:40 [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files Francois Gervais
@ 2020-02-21 16:33 ` Gervais, Francois
2020-02-23 21:18 ` Yann E. MORIN
1 sibling, 0 replies; 4+ messages in thread
From: Gervais, Francois @ 2020-02-21 16:33 UTC (permalink / raw)
To: buildroot
I must say, this patch will conflict with this pending one:
[v5,2/9] package/qoriq-rcw: move rcw into nxp and rename it
https://patchwork.ozlabs.org/patch/1234790/
If the patch from Changming Huang is close to being pulled-in, we might want to
delay the inclusion of mine and I'll update it based on Changming's work.
One way or the other is fine with me.
> -----Original Message-----
> From: Francois Gervais <fgervais@distech-controls.com>
> Sent: February 21, 2020 9:40 AM
> To: buildroot at buildroot.org
> Cc: Matt Weber <matthew.weber@rockwellcollins.com>; Gervais, Francois <FGervais@distech-controls.com>
> Subject: [PATCH 1/1] package/rcw: allow not having custom rcwi files
>
> A project could quite possibly have a custom rcw file that does not rely on any custom rcw include files (rcwi).
>
> Allow the build to succeed if this is the case.
>
> Signed-off-by: Francois Gervais <fgervais@distech-controls.com>
> ---
> package/rcw/rcw.mk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk index 36d2da61b5..c1fb63b91b 100644
> --- a/package/rcw/rcw.mk
> +++ b/package/rcw/rcw.mk
> @@ -25,7 +25,9 @@ endif
>
> define HOST_RCW_ADD_CUSTOM_RCW_FILES
> mkdir -p $(@D)/custom_board/rcw
> - cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
> + if [ -n "$(filter-out %.rcw,$(RCW_FILES))" ]; then \
> + cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board; \
> + fi
> cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw endef HOST_RCW_POST_PATCH_HOOKS +=
> HOST_RCW_ADD_CUSTOM_RCW_FILES
> --
> 2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files
2020-02-21 14:40 [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files Francois Gervais
2020-02-21 16:33 ` Gervais, Francois
@ 2020-02-23 21:18 ` Yann E. MORIN
2020-02-24 15:22 ` Gervais, Francois
1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2020-02-23 21:18 UTC (permalink / raw)
To: buildroot
Fran?ois, All,
On 2020-02-21 09:40 -0500, Francois Gervais spake thusly:
> A project could quite possibly have a custom rcw file
> that does not rely on any custom rcw include files (rcwi).
>
> Allow the build to succeed if this is the case.
>
> Signed-off-by: Francois Gervais <fgervais@distech-controls.com>
> ---
> package/rcw/rcw.mk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk
> index 36d2da61b5..c1fb63b91b 100644
> --- a/package/rcw/rcw.mk
> +++ b/package/rcw/rcw.mk
> @@ -25,7 +25,9 @@ endif
>
> define HOST_RCW_ADD_CUSTOM_RCW_FILES
> mkdir -p $(@D)/custom_board/rcw
> - cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
> + if [ -n "$(filter-out %.rcw,$(RCW_FILES))" ]; then \
> + cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board; \
> + fi
I've changed that to use a separate hook for the includes, and pushed
that to master.
Please review the commit in case I borked anything. Thanks! ;-)
Regards,
Yann E. MORIN.
> cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
> endef
> HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files
2020-02-23 21:18 ` Yann E. MORIN
@ 2020-02-24 15:22 ` Gervais, Francois
0 siblings, 0 replies; 4+ messages in thread
From: Gervais, Francois @ 2020-02-24 15:22 UTC (permalink / raw)
To: buildroot
> -----Original Message-----
> From: Yann E. MORIN <yann.morin.1998@free.fr>
> Sent: February 23, 2020 4:18 PM
> To: Gervais, Francois <FGervais@distech-controls.com>
> Cc: buildroot at buildroot.org; Matt Weber <matthew.weber@rockwellcollins.com>
> Subject: Re: [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files
>
> Fran?ois, All,
>
> On 2020-02-21 09:40 -0500, Francois Gervais spake thusly:
> > A project could quite possibly have a custom rcw file that does not
> > rely on any custom rcw include files (rcwi).
> >
> > Allow the build to succeed if this is the case.
> >
> > Signed-off-by: Francois Gervais <fgervais@distech-controls.com>
> > ---
> > package/rcw/rcw.mk | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk index
> > 36d2da61b5..c1fb63b91b 100644
> > --- a/package/rcw/rcw.mk
> > +++ b/package/rcw/rcw.mk
> > @@ -25,7 +25,9 @@ endif
> >
> > define HOST_RCW_ADD_CUSTOM_RCW_FILES
> > mkdir -p $(@D)/custom_board/rcw
> > - cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
> > + if [ -n "$(filter-out %.rcw,$(RCW_FILES))" ]; then \
> > + cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board; \
> > + fi
>
> I've changed that to use a separate hook for the includes, and pushed that to master.
>
> Please review the commit in case I borked anything. Thanks! ;-)
I confirm, the version in master works fine. Thank you for showing me a better version of my patch.
>
> Regards,
> Yann E. MORIN.
>
> > cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw endef
> > HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
> > --
> > 2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-24 15:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-21 14:40 [Buildroot] [PATCH 1/1] package/rcw: allow not having custom rcwi files Francois Gervais
2020-02-21 16:33 ` Gervais, Francois
2020-02-23 21:18 ` Yann E. MORIN
2020-02-24 15:22 ` Gervais, Francois
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox