* [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
@ 2018-08-27 12:31 Gavin Schenk
2018-09-10 11:32 ` Schenk, Gavin
0 siblings, 1 reply; 6+ messages in thread
From: Gavin Schenk @ 2018-08-27 12:31 UTC (permalink / raw)
To: ptxdist; +Cc: Gavin Schenk
In my usecase I need PTXCONF_PROJECT_VERSION in the rauc bundle instead
of PTXDIST_BSP_AUTOVERSION that is hard coded in rules/image-rauc.make.
Introduce a new switch RAUC_BUNDLE_VERSION to menuconfig that defaults
to "${PTXDIST_BSP_AUTOVERSION}".
Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
Hi,
Some time ago we discussed to hardcode PTXCONF_PROJECT_VERSION instead of
PTXDIST_BSP_AUTOVERSION in the makefile. There was a reason not to change
this, but I do not remember exactly ( Something with a "-" that is mandatory ).
Now this patch is my new approach. It is full compatible and solves my usecase.
Would you agree to put it into rules/rauc.in, or is
platforms/image-rauc.in the better place?
Please suggest!
Regards
Gavin
rules/image-rauc.make | 2 +-
rules/rauc.in | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index bf7408db8..0ee31b0ab 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -31,7 +31,7 @@ IMAGE_RAUC_CERT = $(PTXDIST_PLATFORMCONFIGDIR)/config/rauc/rauc.cert.pem
IMAGE_RAUC_ENV := \
RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
- RAUC_BUNDLE_VERSION=$(PTXDIST_BSP_AUTOVERSION) \
+ RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \
RAUC_BUNDLE_BUILD=$(shell date +%FT%T%z) \
RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \
RAUC_KEY=$(IMAGE_RAUC_KEY) \
diff --git a/rules/rauc.in b/rules/rauc.in
index ec8e76f00..b2fea4bf6 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -33,4 +33,11 @@ config RAUC_COMPATIBLE
Only if the compatible in the targets RAUC system.conf file and those
in the Bundle's manifest match exactly, an update will be performed
+config RAUC_BUNDLE_VERSION
+ prompt "RAUC Bundle Version"
+ string
+ default "${PTXDIST_BSP_AUTOVERSION}"
+ help
+ Overwrite the bundle version if needed.
+
endif
--
2.18.0
--
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
2018-08-27 12:31 [ptxdist] [PATCH] rauc: Make rauc bundle version configurable Gavin Schenk
@ 2018-09-10 11:32 ` Schenk, Gavin
2018-09-10 11:45 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Schenk, Gavin @ 2018-09-10 11:32 UTC (permalink / raw)
To: ptxdist
Hi,
> In my usecase I need PTXCONF_PROJECT_VERSION in the rauc bundle instead
> of PTXDIST_BSP_AUTOVERSION that is hard coded in rules/image-rauc.make.
>
> Introduce a new switch RAUC_BUNDLE_VERSION to menuconfig that defaults
> to "${PTXDIST_BSP_AUTOVERSION}".
>
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> ---
> Hi,
>
> Some time ago we discussed to hardcode PTXCONF_PROJECT_VERSION instead of
> PTXDIST_BSP_AUTOVERSION in the makefile. There was a reason not to change
> this, but I do not remember exactly ( Something with a "-" that is mandatory ).
> Now this patch is my new approach. It is full compatible and solves my usecase.
>
> Would you agree to put it into rules/rauc.in, or is
> platforms/image-rauc.in the better place?
>
> Please suggest!
>
Ping
Regards
Gavin Schenk
--
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
2018-09-10 11:32 ` Schenk, Gavin
@ 2018-09-10 11:45 ` Michael Olbrich
2018-09-13 5:43 ` Schenk, Gavin
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2018-09-10 11:45 UTC (permalink / raw)
To: ptxdist
On Mon, Sep 10, 2018 at 11:32:04AM +0000, Schenk, Gavin wrote:
> Hi,
>
> > In my usecase I need PTXCONF_PROJECT_VERSION in the rauc bundle instead
> > of PTXDIST_BSP_AUTOVERSION that is hard coded in rules/image-rauc.make.
> >
> > Introduce a new switch RAUC_BUNDLE_VERSION to menuconfig that defaults
> > to "${PTXDIST_BSP_AUTOVERSION}".
> >
> > Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> > ---
> > Hi,
> >
> > Some time ago we discussed to hardcode PTXCONF_PROJECT_VERSION instead of
> > PTXDIST_BSP_AUTOVERSION in the makefile. There was a reason not to change
> > this, but I do not remember exactly ( Something with a "-" that is mandatory ).
> > Now this patch is my new approach. It is full compatible and solves my usecase.
> >
> > Would you agree to put it into rules/rauc.in, or is
> > platforms/image-rauc.in the better place?
> >
> > Please suggest!
> >
> Ping
Sorry, this got lost here.
The option should be in platforms/image-rauc.in. Can you send a new version?
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
2018-09-10 11:45 ` Michael Olbrich
@ 2018-09-13 5:43 ` Schenk, Gavin
2018-09-17 7:40 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Schenk, Gavin @ 2018-09-13 5:43 UTC (permalink / raw)
To: ptxdist
Hi Michael,
> The option should be in platforms/image-rauc.in. Can you send a new version?
>
sorry I started a new thread instead using Message-ID.
Is the v2 patch ok?
Regards
Gavin
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
2018-09-13 5:43 ` Schenk, Gavin
@ 2018-09-17 7:40 ` Michael Olbrich
2018-09-17 10:35 ` <Gavin Schenk>
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2018-09-17 7:40 UTC (permalink / raw)
To: ptxdist
Hi,
On Thu, Sep 13, 2018 at 05:43:20AM +0000, Schenk, Gavin wrote:
> > The option should be in platforms/image-rauc.in. Can you send a new version?
> >
>
> sorry I started a new thread instead using Message-ID.
> Is the v2 patch ok?
So, I accidentally pushed the v1 version of this patch. When I started to
fix that I noticed, that the rauc compatible is also defined in rauc.in.
Imho the it makes sense to keep the two together. I need to think about
this. I'll keep it as is for now.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: Make rauc bundle version configurable
2018-09-17 7:40 ` Michael Olbrich
@ 2018-09-17 10:35 ` <Gavin Schenk>
0 siblings, 0 replies; 6+ messages in thread
From: <Gavin Schenk> @ 2018-09-17 10:35 UTC (permalink / raw)
To: ptxdist
Hi Michael,
> On Thu, Sep 13, 2018 at 05:43:20AM +0000, Schenk, Gavin wrote:
> > > The option should be in platforms/image-rauc.in. Can you send a new version?
> > >
> >
> > sorry I started a new thread instead using Message-ID.
> > Is the v2 patch ok?
>
> So, I accidentally pushed the v1 version of this patch. When I started to
> fix that I noticed, that the rauc compatible is also defined in rauc.in.
> Imho the it makes sense to keep the two together. I need to think about
> this. I'll keep it as is for now.
>
thank you!
This was the reason why I asked in my first mail to put it in
rules/rauc.in or platforms/image-rauc.in. In my optinion the better
place is platforms/image-rauc.in, but I totally agree to keep
PTXCONF_RAUC_BUNDLE_VERSION and PTXCONF_RAUC_COMPATIBLE together.
I should have mentioned PTXCONF_RAUC_COMPATIBLE in my first mail, sorry.
Regards
Gavin
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-17 10:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-27 12:31 [ptxdist] [PATCH] rauc: Make rauc bundle version configurable Gavin Schenk
2018-09-10 11:32 ` Schenk, Gavin
2018-09-10 11:45 ` Michael Olbrich
2018-09-13 5:43 ` Schenk, Gavin
2018-09-17 7:40 ` Michael Olbrich
2018-09-17 10:35 ` <Gavin Schenk>
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox