Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v8.25 #6808

Merged
merged 62 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3c02008
Init v8.25
MichaIng Nov 20, 2023
935b6d0
v8.25
MichaIng Nov 20, 2023
b87b3e2
v8.25
MichaIng Nov 20, 2023
44bd6fa
v8.25
MichaIng Nov 23, 2023
1081eca
v8.25
MichaIng Nov 26, 2023
2ccb07b
v8.25
MichaIng Nov 26, 2023
c865ee6
v8.25 (#6782)
MichaIng Nov 27, 2023
78be2cc
v8.25
MichaIng Nov 27, 2023
f039bb7
v8.25
MichaIng Nov 27, 2023
042c8db
v8.25
MichaIng Nov 27, 2023
affb594
v8.25
MichaIng Nov 27, 2023
d665bfb
v8.25
MichaIng Nov 29, 2023
70adebf
v8.25
MichaIng Nov 29, 2023
084cca6
v8.25
MichaIng Nov 29, 2023
70dc552
v8.25 (#6789)
Joulinar Nov 30, 2023
d0801dc
v8.25
MichaIng Nov 30, 2023
8b7d571
v8.25
MichaIng Nov 30, 2023
e0f34bc
v8.25
MichaIng Nov 30, 2023
9c6f10b
v8.25
MichaIng Nov 30, 2023
9ea976a
v8.25
MichaIng Nov 30, 2023
9c82130
v8.25
MichaIng Nov 30, 2023
771a336
v8.25
MichaIng Nov 30, 2023
cb2fc60
v8.25
MichaIng Dec 2, 2023
dae3a82
v8.25
MichaIng Dec 2, 2023
a037970
v8.25 (#6792)
MichaIng Dec 4, 2023
93fdb55
Bump actions/setup-python from 4 to 5 (#6794)
dependabot[bot] Dec 7, 2023
d41e825
v8.25 (#6752)
Joulinar Dec 7, 2023
322543a
v8.25 (#6795)
MichaIng Dec 7, 2023
ac7e7ec
v8.25
MichaIng Dec 7, 2023
b98c7bd
v8.25
MichaIng Dec 7, 2023
838a75c
v8.25
MichaIng Dec 9, 2023
62f887c
v8.25
MichaIng Dec 10, 2023
923bd46
v8.25
MichaIng Dec 10, 2023
452002b
v8.25
MichaIng Dec 14, 2023
5169082
v8.25
MichaIng Dec 14, 2023
d91d2dd
v8.25
MichaIng Dec 14, 2023
1ecc752
v8.25
MichaIng Dec 14, 2023
d4e6315
v8.25
MichaIng Dec 14, 2023
90f8ea7
v8.25
MichaIng Dec 14, 2023
5d22751
Beta v8.25.0 (#6800)
MichaIng Dec 14, 2023
fa34b85
v8.25
MichaIng Dec 14, 2023
89ec402
v8.25 (#6802)
MichaIng Dec 14, 2023
67d4997
v8.25
MichaIng Dec 14, 2023
16345eb
v8.25 (#6803)
MichaIng Dec 14, 2023
0b7dc0b
v8.25
MichaIng Dec 15, 2023
0148418
v8.25
MichaIng Dec 15, 2023
83b0323
v8.25
MichaIng Dec 15, 2023
608847e
v8.25
MichaIng Dec 15, 2023
fe4311e
v8.25
MichaIng Dec 16, 2023
02d349b
v8.25
MichaIng Dec 16, 2023
b345081
v8.25
MichaIng Dec 16, 2023
df263b4
v8.25
MichaIng Dec 16, 2023
4537ccb
v8.25
MichaIng Dec 17, 2023
6336fc6
v8.25
MichaIng Dec 17, 2023
32174a5
v8.25
MichaIng Dec 17, 2023
d6031ae
v8.25
MichaIng Dec 17, 2023
4014a7e
v8.25
MichaIng Dec 17, 2023
f75edf5
v8.25
MichaIng Dec 17, 2023
0c39e44
v8.25
MichaIng Dec 17, 2023
c4b1fd6
v8.25
MichaIng Dec 17, 2023
b5eec75
v8.25
MichaIng Dec 17, 2023
86312ba
Beta v8.25.1 (#6807)
MichaIng Dec 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v8.25
- DietPi-Software | Navidrome: Update fallback URL
- DietPI-Patches | Bump vaultwarden and Amiberry upgrade
- DietPi-Pre-patchres | Revert rpi-eeprom workaround on RPi 4 Bookworm systems
  • Loading branch information
MichaIng committed Nov 23, 2023
commit 44bd6fac5220aa03487b14723549093f70e3da90
18 changes: 10 additions & 8 deletions .update/patches
Original file line number Diff line number Diff line change
Expand Up @@ -1527,9 +1527,16 @@ Patch_8_24()
G_AGI ./package.deb
G_EXEC rm package.deb
fi
fi
}

Patch_8_25()
{
# Software updates and migrations
if [[ -f '/boot/dietpi/.installed' ]]
then
# vaultwarden
if grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[183\]=2' /boot/dietpi/.installed && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' vaultwarden 2> /dev/null)" lt 1.30.0-dietpi1
if grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[183\]=2' /boot/dietpi/.installed && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' vaultwarden 2> /dev/null)" lt 1.30.1-dietpi1
then
# Pre-v8.7 cleanup
if [[ -f '/opt/vaultwarden/target/release/vaultwarden' ]]
Expand All @@ -1544,20 +1551,15 @@ Patch_8_24()
fi

# Amiberry
grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[108\]=2' /boot/dietpi/.installed && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' amiberry 2> /dev/null)" lt 5.6.3-dietpi1 && G_WHIP_YESNO '[ INFO ] Amiberry update available
\nAn update to Amiberry v5.6.3 is available, including LibSDL2 v2.28.5.
grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[108\]=2' /boot/dietpi/.installed && dpkg --compare-versions "$(dpkg-query -Wf '${Version}' amiberry 2> /dev/null)" lt 5.6.4-dietpi1 && G_WHIP_YESNO '[ INFO ] Amiberry update available
\nAn update to Amiberry v5.6.4 is available, including LibSDL2 v2.28.5.
Release notes: https://github.com/BlitterStudio/amiberry/releases
\nDo you want to apply the update now?
\nYou can manually apply it any time via:
# dietpi-software reinstall 108' && echo 108 >> /var/tmp/dietpi/dietpi-update_reinstalls
fi
}

Patch_8_25()
{
:
}

# v6.35 => v7 migration
if (( $G_DIETPI_VERSION_CORE == 6 && $G_DIETPI_VERSION_SUB > 34 ))
then
Expand Down
11 changes: 8 additions & 3 deletions .update/pre-patches
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,15 @@ then
G_DIETPI-NOTIFY 2 'Purging conflicting kodi-repository-kodi package'
G_AGP kodi-repository-kodi
fi
if (( $G_HW_MODEL == 4 && $G_DISTRO > 6 )) && dpkg-query -s rpi-eeprom &> /dev/null
fi

# v8.25
if (( $G_DIETPI_VERSION_CORE < 8 || ( $G_DIETPI_VERSION_CORE == 8 && $G_DIETPI_VERSION_SUB < 25 ) ))
then
if dpkg-query -s rpi-eeprom &> /dev/null
then
G_DIETPI-NOTIFY 2 'Setting rpi-eeprom package on hold to prevent conflicting upgrade attempt'
G_EXEC apt-mark hold rpi-eeprom
G_DIETPI-NOTIFY 2 'Reverting now obsolete rpi-eeprom hold'
G_EXEC apt-mark unhold rpi-eeprom
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -6348,7 +6348,7 @@ _EOF_
*) local arch='amd64';;
esac

local fallback_url="https://github.com/navidrome/navidrome/releases/download/v0.50.0/navidrome_0.50.0_linux_$arch.tar.gz"
local fallback_url="https://github.com/navidrome/navidrome/releases/download/v0.50.1/navidrome_0.50.1_linux_$arch.tar.gz"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/navidrome/navidrome/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/navidrome_[0-9.]*_linux_$arch\.tar\.gz\"$/{print \$4}")" /opt/navidrome

# Data dir
Expand Down