asahi-cosmic: add gvfs-mtp package
Some checks failed
Build containers / Build and push image (push) Failing after 3m36s

This commit is contained in:
2026-03-01 19:23:31 +01:00
parent 6980d9d209
commit fb497ecd0c
3 changed files with 15 additions and 10 deletions

View File

@@ -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: |

View File

@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -euo pipefail
set -euox 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}"

View File

@@ -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