From a81ee2c2b1b01cb35588d2f857d4fd5a863d58d6 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Fri, 22 Oct 2021 17:40:17 +0200
Subject: [PATCH] Release 2.6

---
 CHANGELOG.md       | 17 +++++++++++++++++
 kas-container      |  2 +-
 kas/__version__.py |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637c2fb..38a9bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+2.6
+- kas: Add kconfiglib-based menu plugin
+- kas: Enable kas to checkout repositories using git credentials
+- kas: Enable gerrit/gitlab/github refspecs
+- kas: Write more bblayers.conf boilerplate settings
+- kas: Add environment variable SSH_PRIVATE_KEY_FILE
+- kas: Add support for relative KAS_WORK/BUILD/REPO_REF_DIR paths
+- kas: Move config json schema to standalone json file
+- kas: Avoid duplicate cloning of repos in command line includes
+- kas: for_all_repos: Exit on command failure
+- kas: for_all_repos: Fix KAS_REPO_URL or unversioned repos
+- kas: Declare proxy_config obsolete
+- kas-container: install lz4
+- kas-container: install g++-multilib
+- kas-container: install newer git-lfs
+- kas-container: Enter with /repo as current dir
+
 2.5
 - kas: Apply patches before doing an environment setup
 - kas: repos: strip dot from layer name
diff --git a/kas-container b/kas-container
index 11ee12a..bd3fe77 100755
--- a/kas-container
+++ b/kas-container
@@ -88,7 +88,7 @@ enable_isar_mode() {
 	fi
 }
 
-KAS_IMAGE_VERSION_DEFAULT="2.5"
+KAS_IMAGE_VERSION_DEFAULT="2.6"
 KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas"
 KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas"
 
diff --git a/kas/__version__.py b/kas/__version__.py
index b1dfb2f..8647699 100644
--- a/kas/__version__.py
+++ b/kas/__version__.py
@@ -25,7 +25,7 @@
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) Siemens AG, 2017-2020'
 
-__version__ = '2.5'
+__version__ = '2.6'
 
 # Please update docs/format-changelog.rst when changing the file version.
 __file_version__ = 11