From 62c21e59864c1c25e52be2c28e7531f12f6645cc Mon Sep 17 00:00:00 2001
From: Wesley van Tilburg <justwesley@protonmail.com>
Date: Sun, 1 Mar 2026 19:23:31 +0100
Subject: [PATCH] asahi-cosmic: add gvfs-mtp package

---
 .gitea/workflows/build.yaml       |  8 ++++----
 changelog.sh                      | 14 +++++++++-----
 images/asahi-cosmic/packages.yaml |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 0a2db5b..7c59cb1 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -49,6 +49,10 @@ jobs:
         run: |
           sudo -E ./builder.sh "${IMAGE}" "${VERSION}"
 
+      - name: Generate changelog
+        run: |
+          ./changelog.sh "${IMAGE}" "${VERSION}"
+
       - name: Build and push OCI image from rootfs
         run: |
           set -xeuo pipefail
@@ -95,10 +99,6 @@ jobs:
             containers-storage:localhost/${IMAGE}:${full_tag} \
             docker://${REGISTRY}/${IMAGE}:${VERSION}
 
-      - name: Generate changelog
-        run: |
-          ./changelog.sh "${IMAGE}" "${VERSION}"
-
       - name: Commit and push changelog
         if: github.ref == 'refs/heads/main'
         run: |
diff --git a/changelog.sh b/changelog.sh
index 6fd8366..705d23a 100755
--- a/changelog.sh
+++ b/changelog.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 IMAGE="$1"
 VERSION="$2"
 
-# Convert to absolute path
-ROOTFS="$(realpath "images/${IMAGE}/rootfs")"
+# Always absolute path
+ROOTFS="${GITHUB_WORKSPACE}/images/${IMAGE}/rootfs"
 CHANGELOG_DIR="changelogs/${IMAGE}"
 
 mkdir -p "${CHANGELOG_DIR}"
@@ -19,12 +19,14 @@ CHANGELOG_FILE="${CHANGELOG_DIR}/${VERSION}.${BUILD_ID}.json"
 rpm -qa --root "${ROOTFS}" --qf '%{NAME} %{EVR}\n' | sort > "${PKG_CUR}"
 
 if [[ -f "${PKG_PREV}" ]]; then
+    # Extract names only
     CUR_NAMES="$(cut -d' ' -f1 "${PKG_CUR}" | sort)"
     PREV_NAMES="$(cut -d' ' -f1 "${PKG_PREV}" | sort)"
 
-    ADDED_NAMES="$(comm -13 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))"
-    REMOVED_NAMES="$(comm -23 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))"
-    COMMON_NAMES="$(comm -12 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}"))"
+    # Safe comm calls (|| true prevents exit 1)
+    ADDED_NAMES="$(comm -13 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}") || true)"
+    REMOVED_NAMES="$(comm -23 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}") || true)"
+    COMMON_NAMES="$(comm -12 <(echo "${PREV_NAMES}") <(echo "${CUR_NAMES}") || true)"
 
     ADDED_LIST=()
     while read -r name; do
@@ -84,6 +86,7 @@ if [[ -f "${PKG_PREV}" ]]; then
     } > "${CHANGELOG_FILE}"
 
 else
+    # First build: everything is added
     ADDED_LIST=()
     while read -r name ver; do
         ADDED_LIST+=("${name} ${ver}")
@@ -111,6 +114,7 @@ else
     } > "${CHANGELOG_FILE}"
 fi
 
+# Update latest snapshot
 mv "${PKG_CUR}" "${PKG_PREV}"
 
 echo "Changelog written to ${CHANGELOG_FILE}"
diff --git a/images/asahi-cosmic/packages.yaml b/images/asahi-cosmic/packages.yaml
index a930b3f..3fba14d 100644
--- a/images/asahi-cosmic/packages.yaml
+++ b/images/asahi-cosmic/packages.yaml
@@ -25,6 +25,7 @@ packages:
   - plymouth-system-theme
   - system-config-printer
   - xdg-desktop-portal-gtk
+  - gvfs-mtp
  # Ensure that we have a kernel. Kernel packages are not in any comps group
   # - kernel
   # - kernel-modules