[2/2] package/mender: install additionalinventory scripts
diff mbox series

Message ID 20190514090450.20142-3-mirza.krak@northern.tech
State Accepted
Headers show
Series
  • misc package/mender updates
Related show

Commit Message

Mirza Krak May 14, 2019, 9:04 a.m. UTC
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(-)

Comments

Arnout Vandecappelle May 28, 2019, 9:09 p.m. UTC | #1
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)
>  	)
>
Peter Korsgaard June 6, 2019, 3:27 p.m. UTC | #2
>>>>> "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.

Patch
diff mbox series

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)
 	)