[ptxdist] [PATCH] rauc: version bump 1.1 -> 1.2

[ptxdist] [PATCH] rauc: version bump 1.1 -> 1.2

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 This patch also changes logic from 'RAUC_SERVICE depends on DBUS'
 to 'select DBUS if RAUC_SERVICE'. Unfortunately depencies are not
 generated from 'depends on'. I'm assuming this is a feature.

 rules/rauc.in   | 20 ++++++++++++--------
 rules/rauc.make |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/rules/rauc.in b/rules/rauc.in
index 078c75bff..e7cf2cefa 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -10,6 +10,7 @@ menuconfig RAUC
 	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
 	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
 	select BUSYBOX_FEATURE_SEAMLESS_XZ	if BUSYBOX_TAR
+	select DBUS				if RAUC_SERVICE
 	select LIBCURL				if RAUC_NETWORK
 	select JSON_GLIB			if RAUC_JSON
 	select SQUASHFS_TOOLS			if RUNTIME
@@ -26,7 +27,6 @@ if RAUC
 config RAUC_SERVICE
 	bool
 	prompt "Enable service (D-Bus) support"
-	depends on DBUS
 	default y
 	help
 	  Compiles RAUC to act as a separate daemon and comand line interface
@@ -50,8 +50,8 @@ config RAUC_JSON
 	  Output format can be selected via '--output-format=<json/json-pretty>'
 
 config RAUC_CONFIGURATION
-	prompt "Install RAUC configuration in /etc/rauc"
 	bool
+	prompt "Install RAUC configuration in /etc/rauc"
 	default y
 	help
 	  Installs a RAUC system configuration file and a keyring into /etc/rauc.
@@ -63,8 +63,8 @@ config RAUC_CONFIGURATION
 if RAUC_CONFIGURATION
 
 config RAUC_COMPATIBLE
-	prompt "RAUC Compatible"
 	string
+	prompt "RAUC Compatible"
 	default "${PTXCONF_PROJECT_VENDOR}\ ${PTXCONF_PROJECT}"
 	help
 	  An explicit identification string that RAUC uses to assure an update
@@ -74,8 +74,8 @@ config RAUC_COMPATIBLE
 	  in the Bundle's manifest match exactly, an update will be performed
 
 config RAUC_BUNDLE_VERSION
-	prompt "RAUC Bundle Version"
 	string
+	prompt "RAUC Bundle Version"
 	default "${PTXDIST_BSP_AUTOVERSION}"
 	help
 	  Overwrite the bundle version if needed.
@@ -83,20 +83,23 @@ config RAUC_BUNDLE_VERSION
 endif
 
 config RAUC_BAREBOX
-	bool "barebox support"
+	bool
+	prompt "barebox support"
 	help
 	  To interact with barebox, barebox-state from dt-utils is used.
 	  Auto-select this package for installation on the target.
 
 config RAUC_U_BOOT
-	bool "U-Boot support"
+	bool
+	prompt "U-Boot support"
 	help
 	  To interact with U-Boot, fw_printenv and fw_setenv from
 	  u-boot-tools are used.
 	  Auto-select this package for installation on the target.
 
 config RAUC_GRUB
-	bool "GRUB support"
+	bool
+	prompt "GRUB support"
 	# needs grub2
 	depends on BROKEN
 	help
@@ -104,7 +107,8 @@ config RAUC_GRUB
 	  Auto-select this package for installation on the target.
 
 config RAUC_EFI
-	bool "EFI support"
+	bool
+	prompt "EFI support"
 	help
 	  To interact with EFI, efibootmgr from efibootmgr is used.
 	  Auto-select this package for installation on the target.
diff --git a/rules/rauc.make b/rules/rauc.make
index 27d2f1b40..ade9bd5dd 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION	:= 1.1
-RAUC_MD5	:= c81644f96b14304b6bb9f2ac2de9d4fd
+RAUC_VERSION	:= 1.2
+RAUC_MD5	:= e2a1772825c6ea900e4824b670846a00
 RAUC		:= rauc-$(RAUC_VERSION)
 RAUC_SUFFIX	:= tar.xz
 RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] rauc: version bump 1.1 -> 1.2

[Michael Olbrich]

On Wed, Nov 06, 2019 at 02:46:07PM +0100, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  This patch also changes logic from 'RAUC_SERVICE depends on DBUS'
>  to 'select DBUS if RAUC_SERVICE'. Unfortunately depencies are not
>  generated from 'depends on'. I'm assuming this is a feature.

That's correct. Only 'select' for the toplevel option creates a dependency.
And hopefully this specific depentency won't stay for long, because it is
not really needed[1].

Michael

[1] https://github.com/rauc/rauc/issues/506

>  rules/rauc.in   | 20 ++++++++++++--------
>  rules/rauc.make |  4 ++--
>  2 files changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/rules/rauc.in b/rules/rauc.in
> index 078c75bff..e7cf2cefa 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -10,6 +10,7 @@ menuconfig RAUC
>  	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS	if BUSYBOX_TAR
>  	select BUSYBOX_FEATURE_TAR_AUTODETECT	if BUSYBOX_TAR
>  	select BUSYBOX_FEATURE_SEAMLESS_XZ	if BUSYBOX_TAR
> +	select DBUS				if RAUC_SERVICE
>  	select LIBCURL				if RAUC_NETWORK
>  	select JSON_GLIB			if RAUC_JSON
>  	select SQUASHFS_TOOLS			if RUNTIME
> @@ -26,7 +27,6 @@ if RAUC
>  config RAUC_SERVICE
>  	bool
>  	prompt "Enable service (D-Bus) support"
> -	depends on DBUS
>  	default y
>  	help
>  	  Compiles RAUC to act as a separate daemon and comand line interface
> @@ -50,8 +50,8 @@ config RAUC_JSON
>  	  Output format can be selected via '--output-format=<json/json-pretty>'
>  
>  config RAUC_CONFIGURATION
> -	prompt "Install RAUC configuration in /etc/rauc"
>  	bool
> +	prompt "Install RAUC configuration in /etc/rauc"
>  	default y
>  	help
>  	  Installs a RAUC system configuration file and a keyring into /etc/rauc.
> @@ -63,8 +63,8 @@ config RAUC_CONFIGURATION
>  if RAUC_CONFIGURATION
>  
>  config RAUC_COMPATIBLE
> -	prompt "RAUC Compatible"
>  	string
> +	prompt "RAUC Compatible"
>  	default "${PTXCONF_PROJECT_VENDOR}\ ${PTXCONF_PROJECT}"
>  	help
>  	  An explicit identification string that RAUC uses to assure an update
> @@ -74,8 +74,8 @@ config RAUC_COMPATIBLE
>  	  in the Bundle's manifest match exactly, an update will be performed
>  
>  config RAUC_BUNDLE_VERSION
> -	prompt "RAUC Bundle Version"
>  	string
> +	prompt "RAUC Bundle Version"
>  	default "${PTXDIST_BSP_AUTOVERSION}"
>  	help
>  	  Overwrite the bundle version if needed.
> @@ -83,20 +83,23 @@ config RAUC_BUNDLE_VERSION
>  endif
>  
>  config RAUC_BAREBOX
> -	bool "barebox support"
> +	bool
> +	prompt "barebox support"
>  	help
>  	  To interact with barebox, barebox-state from dt-utils is used.
>  	  Auto-select this package for installation on the target.
>  
>  config RAUC_U_BOOT
> -	bool "U-Boot support"
> +	bool
> +	prompt "U-Boot support"
>  	help
>  	  To interact with U-Boot, fw_printenv and fw_setenv from
>  	  u-boot-tools are used.
>  	  Auto-select this package for installation on the target.
>  
>  config RAUC_GRUB
> -	bool "GRUB support"
> +	bool
> +	prompt "GRUB support"
>  	# needs grub2
>  	depends on BROKEN
>  	help
> @@ -104,7 +107,8 @@ config RAUC_GRUB
>  	  Auto-select this package for installation on the target.
>  
>  config RAUC_EFI
> -	bool "EFI support"
> +	bool
> +	prompt "EFI support"
>  	help
>  	  To interact with EFI, efibootmgr from efibootmgr is used.
>  	  Auto-select this package for installation on the target.
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 27d2f1b40..ade9bd5dd 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
>  #
>  # Paths and names
>  #
> -RAUC_VERSION	:= 1.1
> -RAUC_MD5	:= c81644f96b14304b6bb9f2ac2de9d4fd
> +RAUC_VERSION	:= 1.2
> +RAUC_MD5	:= e2a1772825c6ea900e4824b670846a00
>  RAUC		:= rauc-$(RAUC_VERSION)
>  RAUC_SUFFIX	:= tar.xz
>  RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> -- 
> 2.24.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de