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.sch...@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
