From 767da5e6a765dc5bb922fc2ee6c3f338ca214628 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:39:45 +0000
Subject: [PATCH] v6.1.2

---
 .versionbot/CHANGELOG.yml                      | 18 ++++++++++++++++++
 CHANGELOG.md                                   |  5 +++++
 .../conf/distro/include/balena-os.inc          |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 526fb0d0cb..05c336571f 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,21 @@
+- commits:
+    - subject: "modemmanager: Update outdated context of patches"
+      hash: 9c86d383ae2038f81f8459768a5ad3732fd171d4
+      body: >
+        We do this in preparation for the Scarthgap update because with newer
+
+        Yocto versions the patches with outdated context will trigger fatal
+        build errors.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Florin Sarbu <florin@balena.io>
+        signed-off-by: Florin Sarbu <florin@balena.io>
+      author: Florin Sarbu
+      nested: []
+  version: 6.1.2
+  title: ""
+  date: 2024-11-11T13:39:41.407Z
 - commits:
     - subject: "README: format the supported Yocto versions for legibility"
       hash: 848985f1c041fa2e3c3b66baeaa5b97b5d7ed6c7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fea3e75275..2c518cc6a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v6.1.2
+## (2024-11-11)
+
+* modemmanager: Update outdated context of patches [Florin Sarbu]
+
 # v6.1.1
 ## (2024-11-07)
 
diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc
index c05dd2a345..8d168b2ac1 100644
--- a/meta-balena-common/conf/distro/include/balena-os.inc
+++ b/meta-balena-common/conf/distro/include/balena-os.inc
@@ -5,7 +5,7 @@ include conf/distro/include/balena-os-rust-version.inc
 
 DISTRO = "balena-os"
 DISTRO_NAME = "balenaOS"
-DISTRO_VERSION = "6.1.1"
+DISTRO_VERSION = "6.1.2"
 HOSTOS_VERSION = "${DISTRO_VERSION}"
 python () {
     ''' Set HOSTOS_VERSION from board VERSION if available '''