Bump mender version to 4.0.4

Also:
  - Bump buildroot master to latest commit.

  - mender-update-modules:
    - swupdate module now selects swupdate package.
    - swupdate module now selects jq package.
    - Fix mender-update-modules.hash

  - mender-flash:
    - Bump version to 0ccfb0d0319fb884170925fd13ae01082843840b
    - Remove 0001-chore-Remove-google-test-as-a-mandatory-dependency.patch

  - mender-snapshot:
    - Fix mender-snapshot.hash

buildroot-external-mender/package/mender-flash/mender-flash.hash

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  9e97bfc1b0b10b11a8551b4fe2da526b898100a59b66bb70874be58993f41532  mender-flash-842e984d5ef19e7a539957a6fc31f9a177a7bacd-br1.tar.gz
+sha256  24e10950084340421e81f4cf8c460b4d86ffda04d92dba68d55d760f081edd06  mender-flash-0ccfb0d0319fb884170925fd13ae01082843840b-git4.tar.gz
 sha256  d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688  LICENSE

buildroot-external-mender/package/mender-flash/mender-flash.mk

@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# 1.0.0: The tag does provide the submodules
-MENDER_FLASH_VERSION = 842e984d5ef19e7a539957a6fc31f9a177a7bacd
+MENDER_FLASH_VERSION = 0ccfb0d0319fb884170925fd13ae01082843840b
 MENDER_FLASH_SITE = https://github.com/mendersoftware/mender-flash.git
 MENDER_FLASH_SITE_METHOD = git
 MENDER_FLASH_GIT_SUBMODULES = YES

buildroot-external-mender/package/mender-snapshot/mender-snapshot.hash

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  c713b50aa7dc66ba5d0c790d661132c7d52350774a3fb844299f8f00334b9132  mender-snapshot-1.0.0.tar.gz
+sha256  c713b50aa7dc66ba5d0c790d661132c7d52350774a3fb844299f8f00334b9132  mender-snapshot-1.0.0-go2.tar.gz
 sha256  d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688  LICENSE

buildroot-external-mender/package/mender-update-modules/Config.in

@@ -130,6 +130,11 @@ comment "rootfs version check needs a toolchain w/ wchar, threads, dynamic libra
 
 config BR2_PACKAGE_MENDER_UPDATE_MODULES_SWU
 	bool "swupdate"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU # swupdate
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # swupdate
+	select BR2_PACKAGE_JQ
+	select BR2_PACKAGE_SWUPDATE
 	help
 	  The SWU Update Module allows deploying an SWUpdate-based
 	  artifact to the device.
@@ -139,6 +144,11 @@ config BR2_PACKAGE_MENDER_UPDATE_MODULES_SWU
 
 	  https://github.com/mendersoftware/mender-update-modules/tree/master/swu
 
+comment "swupdate support needs a toolchain w/ dynamic library"
+        depends on BR2_USE_MMU
+        depends on BR2_TOOLCHAIN_HAS_SYNC_4
+        depends on BR2_STATIC_LIBS
+
 endif
 
 comment "mender-update-modules needs a toolchain w/ threads"

buildroot-external-mender/package/mender-update-modules/mender-update-modules.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  3d1b3cbb0eadf87707e00fca5d4401fe7634d0fd2d00e7b912a5a34722f1fd22  mender-update-modules-699391004c7a7ffa1cb71fb36f44175a6a7f4c0f-git4.tar.gz
+sha256  039b473e2391f62fe55ff3c0e79d6df8df041a80bc9205a815a0524d0558e478  mender-update-modules-699391004c7a7ffa1cb71fb36f44175a6a7f4c0f.tar.gz
 sha256  d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688  LICENSE

buildroot-external-mender/package/mender-update-modules/mender-update-modules.mk

@@ -51,7 +51,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_MENDER_UPDATE_MODULES_SWU),y)
 MENDER_UPDATE_MODULES_DEPENDENCIES += swupdate
-MENDER_UPDATE_MODULES_MODULES += swu
+MENDER_UPDATE_MODULES_MODULES += jq swu
 endif
 
 define MENDER_UPDATE_MODULES_INSTALL_TARGET_CMDS

buildroot-external-mender/patches/buildroot/0006-package-mender-bump-version-to-4.0.3.patch → buildroot-external-mender/patches/buildroot/0006-package-mender-bump-version-to-4.0.4.patch

@@ -1,7 +1,7 @@
 From db854056ee09df874a1c327ab82773129648a0f5 Mon Sep 17 00:00:00 2001
 From: Adam Duskett <[email protected]>
-Date: Wed, 10 Jul 2024 13:09:46 -0600
-Subject: [PATCH] package/mender: bump version to 4.0.3
+Date: Tue, 6 Aug 2024 11:18:32 +0200
+Subject: [PATCH] package/mender: bump version to 4.0.4
 
 A complete rewrite of the package, as it is now a cmake package.
 
@@ -572,7 +572,7 @@ index 118cce9d02..c46fa9ef11 100644
 @@ -1,45 +1,23 @@
  # Locally computed:
 -sha256  8a149b11b990beb7620b372023eec28df63cee6a1aa4132e88ecef554f080f72  mender-3.4.0-go2.tar.gz
-+sha256  6697d47299bd369ae452f39d6b01d3f223377bfc3cdce3772c71af10c8f2e4de  mender-ad46186ef3064957f67d1202f575e9cd6df83888-git4.tar.gz
++sha256  ba8d754d7f3248fe513a18a6575f8c32fd86eed1f2bdbd11e46426a695f0d743  mender-80f37fe47f9eac22d78a8a848b77072d45976c3e-git4.tar.gz
 +sha256  418bdfce185824f861177ce6a0fdeb381bd1d9e0521038c9a636de0b60742fbb  LIC_FILES_CHKSUM.sha256
 
  # Vendor licenses
@@ -639,8 +639,8 @@ index ee1398244b..920b32f44b 100644
 -MENDER_VERSION = 3.4.0
 -MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION))
 -MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
-+# 4.0.3
-+MENDER_VERSION = ad46186ef3064957f67d1202f575e9cd6df83888
++# 4.0.4
++MENDER_VERSION = 80f37fe47f9eac22d78a8a848b77072d45976c3e
 +MENDER_SITE = https://github.com/mendersoftware/mender.git
 +MENDER_SITE_METHOD = git
 +MENDER_GIT_SUBMODULES = YES

docker-compose.yml

@@ -7,7 +7,7 @@ services:
          BUILDROOT_DIR: buildroot
          BUILDROOT_VERSION: git
          BUILDROOT_BRANCH: master
-         BUILDROOT_COMMIT: c99082a4b6d153f01decb06650c78e6ec808fee2
+         BUILDROOT_COMMIT: beb54d8126e7b0fd2e1090061aa96e6487c4b697
          # Space deliminated list of external trees of which to use.
          EXTERNAL_TREES: buildroot-external-mender
          BUILDROOT_PATCH_DIR: "buildroot-external-mender/patches/buildroot/"