From 19430817b39bd48d4e9e0fa80cb36ed421843879 Mon Sep 17 00:00:00 2001
From: mikeeq <miotk.mikolaj@gmail.com>
Date: Thu, 4 Jul 2024 01:12:07 +0200
Subject: [PATCH] Fedora 40

---
 Dockerfile         | 2 +-
 README.md          | 2 +-
 build.sh           | 8 ++++----
 build_in_docker.sh | 2 +-
 build_local.sh     | 4 ++--
 fedora-mbp.ks      | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 86c29e6..d8f9496 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:39
+FROM fedora:40
 
 RUN dnf upgrade -y \
   && dnf install -y \
diff --git a/README.md b/README.md
index adb561b..6a5000d 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ reboot
 
 # 2. Update mbp-fedora-kernel
 ## update_kernel_mbp has built-in selfupgrade function, so when it fails it's just due to script update - please rerun everything should be good on second run
-KERNEL_VERSION="6.4.16-f38" UPDATE_SCRIPT_BRANCH="v6.4-f38" update_kernel_mbp
+KERNEL_VERSION="6.9.7-f40" UPDATE_SCRIPT_BRANCH="v6.9-f40" update_kernel_mbp
 reboot
 
 # 3. Update your OS to include all changes made in mbp-fedora-t2-config RPM
diff --git a/build.sh b/build.sh
index 6b6aa00..bfcde7a 100755
--- a/build.sh
+++ b/build.sh
@@ -3,13 +3,13 @@
 set -eu -o pipefail
 
 CURRENT_PWD=$(pwd)
-FEDORA_VERSION=39
+FEDORA_VERSION=40
 FEDORA_KICKSTARTS_GIT_URL=https://pagure.io/fedora-kickstarts.git
-FEDORA_KICKSTARTS_BRANCH_NAME=f39
-FEDORA_KICKSTARTS_COMMIT_HASH=465debb7c90c8ab4c68e14ff48fe50f796b1c089        # https://pagure.io/fedora-kickstarts/commits/f39
+FEDORA_KICKSTARTS_BRANCH_NAME=f40
+FEDORA_KICKSTARTS_COMMIT_HASH=a2bb6793db05e9e3cefe0a10b514d62ed634059e        # https://pagure.io/fedora-kickstarts/commits/f40
 LIVECD_TOOLS_GIT_URL=https://github.com/livecd-tools/livecd-tools
 LIVECD_TOOLS_GIT_BRANCH_NAME=main
-LIVECD_TOOLS_GIT_COMMIT_HASH=064acef0b4ae97a40e76a745f7559ce9c4b983ac
+LIVECD_TOOLS_GIT_COMMIT_HASH=eeb0dd93ff51f4c662eeed9104427ebfe7fe94ac
 LIVECD_CACHE_PATH=/var/cache/live
 
 FEDORA_DESKTOP_ENV="${FEDORA_DESKTOP_ENV:-}"
diff --git a/build_in_docker.sh b/build_in_docker.sh
index a13bc93..37c026f 100755
--- a/build_in_docker.sh
+++ b/build_in_docker.sh
@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-DOCKER_IMAGE=fedora:39
+DOCKER_IMAGE=fedora:40
 
 docker pull ${DOCKER_IMAGE}
 docker run \
diff --git a/build_local.sh b/build_local.sh
index 2c81306..e21821d 100755
--- a/build_local.sh
+++ b/build_local.sh
@@ -2,9 +2,9 @@
 
 set -eu -o pipefail
 
-docker build -t fedora_iso:39 .
+docker build -t fedora_iso:40 .
 
-DOCKER_IMAGE=fedora_iso:39
+DOCKER_IMAGE=fedora_iso:40
 LIVECD_CACHE_PATH=/var/cache/live
 
 docker run \
diff --git a/fedora-mbp.ks b/fedora-mbp.ks
index 6b45f65..a030912 100644
--- a/fedora-mbp.ks
+++ b/fedora-mbp.ks
@@ -13,15 +13,15 @@ eula --agreed
 
 ## Install mbp-fedora-kernel, mbp-fedora-t2-config, mbp-fedora-t2-repo
 curl
--kernel-6.*.fc39.x86_64
-kernel-*.*[0-9].mbp.fc38.x86_64
+-kernel-6.*.fc40.x86_64
+kernel-*.*[0-9].mbp.fc40.x86_64
 mbp-fedora-t2-config
 mbp-fedora-t2-repo
 
 %end
 
 %post
-UPDATE_SCRIPT_BRANCH=v6.4-f38
+UPDATE_SCRIPT_BRANCH=v6.9-f40
 
 ### Add dns server configuration
 echo "===]> Info: Printing PWD"