mirror/kde-linux
1
0
Fork 0
mirror of https://github.com/KDE/kde-linux.git synced 2025-12-24 00:18:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

move sha256sums to sysupdate dir

Browse Source 
systemd doesn't like subdir references in the sha256sums so we can't
have a single sums file in the root but rather need to have multiple
This commit is contained in:
Harald Sitter
2025-08-21 01:15:10 +02:00
parent d7e6dd7b26
commit 2d8dca8329
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mkosi.extra/usr/lib/sysupdate.d/50-root-x86-64-erofs.conf
View File

@@ -7,8 +7,8 @@ AppStream=https://invent.kde.org/kde-linux/kde-linux/-/raw/master/org.kde.linux.
[Source]
Type=url-file
Path=https://files.kde.org/kde-linux
MatchPattern=sysupdate/v2/kde-linux_@v_root-x86-64.erofs
Path=https://files.kde.org/kde-linux/sysupdate/v2/
MatchPattern=kde-linux_@v_root-x86-64.erofs
[Target]
Type=regular-file

4
mkosi.extra/usr/lib/sysupdate.d/60-esp.conf
View File

@@ -7,8 +7,8 @@ AppStream=https://invent.kde.org/kde-linux/kde-linux/-/raw/master/org.kde.linux.
[Source]
Type=url-file
Path=https://files.kde.org/kde-linux
MatchPattern=sysupdate/v2/kde-linux_@v.efi
Path=https://files.kde.org/kde-linux/sysupdate/v2/
MatchPattern=kde-linux_@v.efi
[Target]
Type=regular-file

24
upload.sh
View File

@@ -8,7 +8,8 @@ set -eux
export SSH_IDENTITY="$PWD/.secure_files/ssh.key"
export SSH_USER=kdeos
export SSH_HOST=origin.files.kde.org
export SSH_PATH=/home/kdeos/kde-linux
export SSH_ROOT_PATH=/home/kdeos/kde-linux/
export SSH_PATH=$SSH_ROOT_PATH/sysupdate/v2/
export SSH_REALLY_DELETE=1
chmod 600 "$SSH_IDENTITY"
@@ -20,28 +21,23 @@ go -C ./upload-vacuum/ build -o upload-vacuum .
sudo chown -Rvf "$(id -u):$(id -g)" "$PWD/.secure_files" # Make sure we have access
export GNUPGHOME="$PWD/.secure_files/gpg"
gpg --verbose --no-options --homedir="$GNUPGHOME" --import "$PWD/.secure_files/gpg.private.key"
REMOTE=$SSH_USER@$SSH_HOST:$SSH_PATH
REMOTE_ROOT=$SSH_USER@$SSH_HOST:$SSH_ROOT_PATH
REMOTE_PATH=$SSH_USER@$SSH_HOST:$SSH_PATH
# You can use `ssh-keyscan origin.files.kde.org` to get the host key
echo "origin.files.kde.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUjdH4S7otYIdLUkOZK+owIiByjNQPzGi7GQ5HOWjO6" >> ~/.ssh/known_hosts
# The initial SHA256SUMS file is created by the vacuum script based on what is left on the server. We append to it.
sysupdate_dir=sysupdate/v2
mkdir -p "$sysupdate_dir"
mv ./*.efi ./*.tar.zst ./*.erofs ./*.caibx "$sysupdate_dir"
# We need shell globs here! More readable this way. Ignore shellcheck.
# shellcheck disable=SC2129
sha256sum -- *.raw >> SHA256SUMS
sha256sum -- *.torrent >> SHA256SUMS
sha256sum -- ${sysupdate_dir}/*.efi >> SHA256SUMS
sha256sum -- ${sysupdate_dir}/*.tar.zst >> SHA256SUMS
sha256sum -- ${sysupdate_dir}/*.erofs >> SHA256SUMS
sha256sum -- *.efi >> SHA256SUMS
sha256sum -- *.tar.zst >> SHA256SUMS
sha256sum -- *.erofs >> SHA256SUMS
# Don't put caibx into the SHA256SUMS, it will break file matching.
# https://github.com/systemd/systemd/issues/38605
gpg --homedir="$GNUPGHOME" --output SHA256SUMS.gpg --detach-sign SHA256SUMS
scp -i "$SSH_IDENTITY" ./*.raw ./*.torrent "$REMOTE"
scp -r -i "$SSH_IDENTITY" "sysupdate/" "$REMOTE"
scp -i "$SSH_IDENTITY" SHA256SUMS SHA256SUMS.gpg "$REMOTE" # upload as last artifact to finalize the upload
scp -i "$SSH_IDENTITY" ./*.raw ./*.torrent "$REMOTE_ROOT"
scp -i "$SSH_IDENTITY" ./*.efi ./*.tar.zst ./*.erofs ./*.caibx "$REMOTE_PATH"
scp -i "$SSH_IDENTITY" SHA256SUMS SHA256SUMS.gpg "$REMOTE_PATH" # upload as last artifact to finalize the upload