From 23622868bc40e0916ea8875fd72862da1d1e6268 Mon Sep 17 00:00:00 2001 From: "Daniel (Fourdee)" Date: Fri, 26 Jan 2018 15:16:52 +0000 Subject: [PATCH] v6.0 + Allo GUI v5: https://github.com/Fourdee/DietPi/issues/1385 + G_RPI_UPDATE --- CHANGELOG.txt | 6 +++--- dietpi/dietpi-software | 2 +- dietpi/func/dietpi-globals | 26 ++++++++++++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6cc426d3fa..cf9c9829aa 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,11 +1,11 @@ v6.0 (previously v160) -(xx/01/18) +(28/01/18) Important Information: All DietPi images have been re-created. Existing installations (v159 or lower), can no longer be updated, or supported. To continue support, users must install the latest v6.0 image. - https://github.com/Fourdee/DietPi/issues/1385 - All images are now Debian Stretch (excluding Odroid's) - - ARMbian based images are now mainline kernel 4.13. + - ARMbian based images are now mainline kernel 4.13+. - Native PC (EFI): is now an ISO, with clonezilla bundled. Simplifies installation via Rufus write: https://github.com/Fourdee/DietPi/issues/1171#issuecomment-336522021 - If you are happy with your existing installation of v159 (or lower), you are not required to install the v6.0 image, however, we cannot continue to provide support for v159 (or lower) installations. @@ -70,7 +70,7 @@ DietPi-Software | OpenJDK: Replaces OracleJDK: https://github.com/Fourdee/DietPi DietPi-Update | dietpi.txt is now checked for missing entries, and, will now be patched during the update: https://github.com/Fourdee/DietPi/issues/1292#issuecomment-350818969 Sparky SBC | Kernel updated, which resolves issues with HQPlayer playback: https://www.computeraudiophile.com/forums/topic/32132-allo-sparky-usbridge/?do=findComment&comment=753100 -Allo Web Interface v4: +Allo Web Interface v5: Sparky SBC: Matrix Audio X-SPDIF 2, native DSD is now added to kernel, many thanks @sudeep: https://github.com/sparkysbc/Linux/pull/3 ----------------------------------------------------------------------------------------------------------- diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index 69d5ef6070..b304cafa6e 100644 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -6713,7 +6713,7 @@ _EOF_ Banner_Installing - INSTALL_URL_ADDRESS='http://dietpi.com/downloads/binaries/all/allo_web_interface_v4.7z' + INSTALL_URL_ADDRESS='http://dietpi.com/downloads/binaries/all/allo_web_interface_v5.7z' G_CHECK_URL "$INSTALL_URL_ADDRESS" wget "$INSTALL_URL_ADDRESS" -O package.7z diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals index 4f2ed700e5..59e978da19 100644 --- a/dietpi/func/dietpi-globals +++ b/dietpi/func/dietpi-globals @@ -1030,11 +1030,7 @@ $print_logfile_info for i in "${string[@]}" do - if (( $(grep -ci -m1 "^$i[[:space:]]" "$fp_temp") )); then - - G_DIETPI-NOTIFY 2 "($i) | Currently installed" - - else + if (( ! $(grep -ci -m1 "^$i[[:space:]]" "$fp_temp") )); then G_DIETPI-NOTIFY 2 "($i) | Not found, flagged for installation" packages_to_install+=" $i" @@ -1051,7 +1047,7 @@ $print_logfile_info else - G_DIETPI-NOTIFY 2 "Pre-req APT packages are currently already installed" + G_DIETPI-NOTIFY 2 "Pre-req APT packages are installed" fi @@ -1063,6 +1059,24 @@ $print_logfile_info } + #----------------------------------------------------------------------------------- + # HW specific + #----------------------------------------------------------------------------------- + #rpi-update + # - Holds APT packages + # - Skips backup + G_RPI_UPDATE(){ + + if (( $G_HW_MODEL < 10 )); then + + G_AG_CHECK_INSTALL_PREREQ rpi-update + G_RUN_CMD SKIP_BACKUP=1 rpi-update + apt-mark hold raspberrypi-bootloader raspberrypi-kernel libraspberrypi-bin + + fi + + } + #----------------------------------------------------------------------------------- #G_DIETPI-NOTIFY 2 'DietPi-Globals loaded\n' #-----------------------------------------------------------------------------------