Fedora 40

.github/workflows/build-iso.yml

@@ -5,10 +5,11 @@ name: Build Fedora ISO
 on: [push]
 
 jobs:
-  tests:
-    runs-on: ubuntu-22.04
+  test:
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: "AgentInfo"
         run: ./.github/agent-info.sh
       - name: "YamlLint"
@@ -18,9 +19,9 @@ jobs:
             -w /repo \
             -v $(pwd):/repo \
             -t \
-            alpine:3.16 /bin/sh -c " \
+            alpine:3.20 /bin/sh -c " \
               apk add --no-cache py-pip python3 bash \
-              && pip3 install yamllint \
+              && pip3 install --break-system-packages yamllint \
               && yamllint -s . \
             "
       - name: "ShellCheck"
@@ -30,14 +31,16 @@ jobs:
             -w /repo \
             -v $(pwd):/repo \
             -t \
-            alpine:3.16 /bin/sh -c " \
+            alpine:3.20 /bin/sh -c " \
               apk add --no-cache shellcheck bash \
               && shellcheck $(find . -type f -name "*.sh" |  tr '\n' ' ')
             "
   build-gnome:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    needs: test
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: "Build Fedora Gnome ISO"
         run: ./build_in_docker.sh
         env:
@@ -56,9 +59,11 @@ jobs:
       - name: "AgentInfo"
         run: ./.github/agent-info.sh
   build-kde:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    needs: test
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: "Build Fedora KDE ISO"
         run: ./build_in_docker.sh
         env:

Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:40
 
 RUN dnf upgrade -y \
   && dnf install -y \

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.4-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
@@ -120,9 +120,9 @@ reboot
 dnf install -y dnf-plugin-system-upgrade
 
 # 5. Upgrade to new OS version
-## If you're trying to upgrade older version of mbp-fedora to latest version, please repeat a process by upgrading only to one major release of Fedora, i.e.: Fedora 33 -> 34, 34 -> 35, 35 -> 36, 36 -> 37 -> 38, by changing the number in `--releasever` argument
+## If you're trying to upgrade older version of mbp-fedora to latest version, please repeat a process by upgrading only to one major release of Fedora, i.e.: Fedora 33 -> 34, 34 -> 35, 35 -> 36, 36 -> 37, 37 -> 38, 38 -> 39, by changing the number in `--releasever` argument
 
-dnf system-upgrade download -y --releasever=38
+dnf system-upgrade download -y --releasever=39
 
 # 6. Reboot your Mac
 dnf system-upgrade reboot

build.sh

@@ -3,13 +3,13 @@
 set -eu -o pipefail
 
 CURRENT_PWD=$(pwd)
-FEDORA_VERSION=38
+FEDORA_VERSION=40
 FEDORA_KICKSTARTS_GIT_URL=https://pagure.io/fedora-kickstarts.git
-FEDORA_KICKSTARTS_BRANCH_NAME=f38
-FEDORA_KICKSTARTS_COMMIT_HASH=69c726f7536cde6acf36697f7ba112ad3107e7ac        # https://pagure.io/fedora-kickstarts/commits/f38
+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=4acb0c9515783446c3ad87bf29ec049ed835f788
+LIVECD_TOOLS_GIT_COMMIT_HASH=eeb0dd93ff51f4c662eeed9104427ebfe7fe94ac
 LIVECD_CACHE_PATH=/var/cache/live
 
 FEDORA_DESKTOP_ENV="${FEDORA_DESKTOP_ENV:-}"

build_in_docker.sh

@@ -2,7 +2,7 @@
 
 set -eu -o pipefail
 
-DOCKER_IMAGE=fedora:38
+DOCKER_IMAGE=fedora:40
 
 docker pull ${DOCKER_IMAGE}
 docker run \

build_local.sh

@@ -2,9 +2,9 @@
 
 set -eu -o pipefail
 
-docker build -t fedora_iso:38 .
+docker build -t fedora_iso:40 .
 
-DOCKER_IMAGE=fedora_iso:38
+DOCKER_IMAGE=fedora_iso:40
 LIVECD_CACHE_PATH=/var/cache/live
 
 docker run \

fedora-mbp.ks

@@ -13,15 +13,15 @@ eula --agreed
 
 ## Install mbp-fedora-kernel, mbp-fedora-t2-config, mbp-fedora-t2-repo
 curl
--kernel-6.*.fc38.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"
@@ -48,7 +48,7 @@ mv /etc/resolv.conf_backup /etc/resolv.conf
 rpm -e $(rpm -qa | grep kernel | grep -v headers | grep -v oops | grep -v wifi | grep -v mbp)
 
 ### Add kernel RPM packages to YUM/DNF exclusions
-sed -i '/^type=rpm.*/a exclude=kernel,kernel-core,kernel-devel,kernel-devel-matched,kernel-modules,kernel-modules-extra,kernel-modules-internal' /etc/yum.repos.d/fedora*.repo
+sed -i '/^type=rpm.*/a exclude=kernel,kernel-core,kernel-devel,kernel-devel-matched,kernel-modules,kernel-modules-core,kernel-modules-extra,kernel-modules-internal,kernel-uki-virt' /etc/yum.repos.d/fedora*.repo
 
 %end