[Buildroot] [PATCH 0/2] misc package/mender updates

[Buildroot] [PATCH 0/2] misc package/mender updates

[Mirza Krak]

Small series:

- fixing a configuration error in the default mender.conf
- installing additional available inventory scripts

Note that there is a patch pending to bump this package to 2.0.0 [1],
which might require a rebase of either this one or the bump to 2.0.0.

[1]. http://lists.busybox.net/pipermail/buildroot/2019-May/249797.html

Mirza Krak (2):
  package/mender: update rootfs parts in mender.conf
  package/mender: install additional inventory scripts

 package/mender/mender.conf | 4 ++--
 package/mender/mender.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.11.0

[Buildroot] [PATCH 1/2] package/mender: update rootfs parts in mender.conf

[Mirza Krak]

The configuration options (RootfsPartA/RootfsPartB) must
provide a valid path to a block devices.

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>
---
 package/mender/mender.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mender/mender.conf b/package/mender/mender.conf
index 979f16aaf6..f89118ac1b 100644
--- a/package/mender/mender.conf
+++ b/package/mender/mender.conf
@@ -2,8 +2,8 @@
   "InventoryPollIntervalSeconds": 1800,
   "UpdatePollIntervalSeconds": 1800,
   "RetryPollIntervalSeconds": 300,
-  "RootfsPartA": "mmcblk0p2",
-  "RootfsPartB": "mmcblk0p3",
+  "RootfsPartA": "/dev/mmcblk0p2",
+  "RootfsPartB": "/dev/mmcblk0p3",
   "ServerCertificate": "/etc/mender/server.crt",
   "ServerURL": "https://docker.mender.io",
   "TenantToken": "dummy"
-- 
2.11.0

[Buildroot] [PATCH 2/2] package/mender: install additional inventory scripts

[Mirza Krak]

There are two additional inventory scripts provided in
the Mender client repository, lets install them.

- mender-inventory-os
    - will push content of /etc/os-release
- mender-inventory-rootfs-type
    - will push filesystem type of rootfs

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>
---
 package/mender/mender.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 07f6e5e5f9..d56b634713 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -46,7 +46,7 @@ define MENDER_INSTALL_CONFIG_FILES
 
 	$(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \
 		$(TARGET_DIR)/usr/share/mender/identity/mender-device-identity
-	$(foreach f,hostinfo network, \
+	$(foreach f,hostinfo network os rootfs-type, \
 		$(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \
 			$(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
 	)
-- 
2.11.0

[Buildroot] [PATCH 1/2] package/mender: update rootfs parts in mender.conf

[Arnout Vandecappelle]

On 14/05/2019 11:04, Mirza Krak wrote:
> The configuration options (RootfsPartA/RootfsPartB) must
> provide a valid path to a block devices.
> 
> Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

 Applied to master, thanks. This is clearly a bugfix, so master, not next.

 Regards,
 Arnout

> ---
>  package/mender/mender.conf | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/mender/mender.conf b/package/mender/mender.conf
> index 979f16aaf6..f89118ac1b 100644
> --- a/package/mender/mender.conf
> +++ b/package/mender/mender.conf
> @@ -2,8 +2,8 @@
>    "InventoryPollIntervalSeconds": 1800,
>    "UpdatePollIntervalSeconds": 1800,
>    "RetryPollIntervalSeconds": 300,
> -  "RootfsPartA": "mmcblk0p2",
> -  "RootfsPartB": "mmcblk0p3",
> +  "RootfsPartA": "/dev/mmcblk0p2",
> +  "RootfsPartB": "/dev/mmcblk0p3",
>    "ServerCertificate": "/etc/mender/server.crt",
>    "ServerURL": "https://docker.mender.io",
>    "TenantToken": "dummy"
> 

[Buildroot] [PATCH 2/2] package/mender: install additional inventory scripts

[Arnout Vandecappelle]

On 14/05/2019 11:04, Mirza Krak wrote:
> There are two additional inventory scripts provided in
> the Mender client repository, lets install them.
> 
> - mender-inventory-os
>     - will push content of /etc/os-release
> - mender-inventory-rootfs-type
>     - will push filesystem type of rootfs
> 
> Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

 Looks like a fix, is definitely not going to break the build, so applied to
master, thanks.

 Regards,
 Arnout

> ---
>  package/mender/mender.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/mender/mender.mk b/package/mender/mender.mk
> index 07f6e5e5f9..d56b634713 100644
> --- a/package/mender/mender.mk
> +++ b/package/mender/mender.mk
> @@ -46,7 +46,7 @@ define MENDER_INSTALL_CONFIG_FILES
>  
>  	$(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \
>  		$(TARGET_DIR)/usr/share/mender/identity/mender-device-identity
> -	$(foreach f,hostinfo network, \
> +	$(foreach f,hostinfo network os rootfs-type, \
>  		$(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \
>  			$(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
>  	)
> 

[Buildroot] [PATCH 1/2] package/mender: update rootfs parts in mender.conf

[Peter Korsgaard]

>>>>> "Mirza" == Mirza Krak <mirza.krak@northern.tech> writes:

 > The configuration options (RootfsPartA/RootfsPartB) must
 > provide a valid path to a block devices.

 > Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] package/mender: install additional inventory scripts

[Peter Korsgaard]

>>>>> "Mirza" == Mirza Krak <mirza.krak@northern.tech> writes:

 > There are two additional inventory scripts provided in
 > the Mender client repository, lets install them.

 > - mender-inventory-os
 >     - will push content of /etc/os-release
 > - mender-inventory-rootfs-type
 >     - will push filesystem type of rootfs

 > Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard