Skip to content

Commit

Permalink
v8.19 (#6450)
Browse files Browse the repository at this point in the history
- DietPi-Software | ympd: We migrated to own DEB packages based on @SuperBFG7's ympd fork and enabled the installation option on Debian Bookworm and RISC-V systems. The update will be automatically applied for existing ympd installs as part of the DietPi update.
- CI | Disable RISC-V builds for Bookworm, since Sid is now Trixie
  • Loading branch information
MichaIng authored Jun 29, 2023
1 parent 43185c5 commit 32ce32c
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 51 deletions.
10 changes: 5 additions & 5 deletions .build/software/ympd/build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Build deps
G_AGUP
G_AGDUG cmake make gcc libc6-dev pkg-config libmpdclient-dev
G_AGDUG cmake make gcc libc6-dev pkg-config libmpdclient-dev libssl-dev

# Runtime deps
adeps=('libc6' 'libmpdclient2')
Expand Down Expand Up @@ -77,7 +77,7 @@ then
usermod -g dietpi -d /nonexistent -s /usr/sbin/nologin ympd
else
echo 'Creating ympd service user ...'
useradd -rMU -g dietpi -d /nonexistent -s /usr/sbin/nologin ympd
useradd -rMN -g dietpi -d /nonexistent -s /usr/sbin/nologin ympd
fi
echo 'Configuring ympd systemd service ...'
Expand Down Expand Up @@ -138,9 +138,9 @@ grep -q 'raspbian' /etc/os-release && DEPS_APT_VERSIONED=$(sed 's/+rp[it][0-9]\+

# - Obtain version
version="$(mawk -F\" '/CPACK_PACKAGE_VERSION_MAJOR/{print $2;exit}' ympd-master/CMakeLists.txt).$(mawk -F\" '/CPACK_PACKAGE_VERSION_MINOR/{print $2;exit}' ympd-master/CMakeLists.txt).$(mawk -F\" '/CPACK_PACKAGE_VERSION_PATCH/{print $2;exit}' ympd-master/CMakeLists.txt)"
#G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/ympd_$G_HW_ARCH_NAME.deb"
#old_version=$(dpkg-deb -f package.deb Version)
#G_EXEC rm package.deb
G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/ympd_$G_HW_ARCH_NAME.deb"
old_version=$(dpkg-deb -f package.deb Version)
G_EXEC rm package.deb
suffix=${old_version#*-dietpi}
[[ $old_version == "$version-"* ]] && suffix="dietpi$((suffix+1))" || suffix="dietpi1"

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gmediarender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
exclude:
- { arch: riscv64, dist: buster }
- { arch: riscv64, dist: bullseye }
- { arch: riscv64, dist: bookworm }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
runs-on: ubuntu-22.04
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
exclude:
- { arch: 11, dist: 5 }
- { arch: 11, dist: 6 }
- { arch: 11, dist: 7 }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
# https://github.com/actions/virtual-environments
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/shairport-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
exclude:
- { arch: riscv64, dist: buster }
- { arch: riscv64, dist: bullseye }
- { arch: riscv64, dist: bookworm }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
# https://github.com/actions/virtual-environments
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/squeezelite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
exclude:
- { arch: riscv64, dist: buster }
- { arch: riscv64, dist: bullseye }
- { arch: riscv64, dist: bookworm }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
runs-on: ubuntu-22.04
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/vaultwarden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
exclude:
- { arch: 11, dist: 5 }
- { arch: 11, dist: 6 }
- { arch: 11, dist: 7 }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
# https://github.com/actions/virtual-environments
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ympd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
exclude:
- { arch: riscv64, dist: buster }
- { arch: riscv64, dist: bullseye }
- { arch: riscv64, dist: bookworm }
fail-fast: false
name: "Build: ${{ matrix.arch }} - ${{ matrix.dist }}"
runs-on: ubuntu-22.04
Expand Down
7 changes: 7 additions & 0 deletions .update/patches
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,13 @@ Release notes:
\nDo you want to apply the update now?
\nYou can manually apply it any time via:
# dietpi-software reinstall 163' && echo 163 >> /var/tmp/dietpi/dietpi-update_reinstalls

# ympd
if grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[32\]=2' /boot/dietpi/.installed
then
G_DIETPI-NOTIFY 2 'Preparing ympd update ...'
echo 32 >> /var/tmp/dietpi/dietpi-update_reinstalls
fi
fi
}

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Enhancements:
- General | Initial detection and support for Debian 13 Trixie (the new "testing" version) has been added to DietPi. Everyone is invited to upgrade to Trixie to stay on bleeding edge. Just note that due to continued breaking changes coming with package upgrades, some features and software installs may break at any time. We are happy to receive your bug report then, to have necessary changes implemented in DietPi as fast as breaking changes in Trixie happen, until it becomes the new stable Debian release, expected in summer 2025.
- DietPi-Software | microblog.pub: On fresh installs and reinstalls, the pyenv Python version will be raised to 3.11.4, matching the version of the official Docker container.
- DietPi-Software | Home Assistant: The pyenv Python version has been updated to 3.11.4 to maintain compatibility with Home Assistant and align with Home Assistant OS and containers. Many thanks to @whyisthisbroken and others for informing us about this: https://dietpi.com/forum/t/home-assistant-finally-integrates-python-3-11/17033
- DietPi-Software | ympd: We migrated to own DEB packages based on SuperBFG7's ympd fork and enabled the installation option on Debian Bookworm and RISC-V systems. The update will be automatically applied for existing ympd installs as part of the DietPi update.

Bug fixes:
- Quartz64 | Resolved an issue where some iptables/nftables features did not work as of missing kernel features. Many thanks to @acelinkit for reporting the issue and pointing us at the solution: https://github.com/MichaIng/DietPi/issues/6389
Expand Down
48 changes: 2 additions & 46 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,6 @@ Available commands:
aSOFTWARE_CATX[$software_id]=2
aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/media/#ympd'
aSOFTWARE_DEPS[$software_id]='128'
# - Bookworm: No libssl3 support
aSOFTWARE_AVAIL_G_DISTRO[$software_id,7]=0
# - RISC-V: No binary: https://dietpi.com/downloads/binaries/all/ympd_1.2.3.7z
aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
#------------------
software_id=148
aSOFTWARE_NAME[$software_id]='myMPD'
Expand Down Expand Up @@ -5000,46 +4996,7 @@ The install script will now exit. After applying one of the the above, rerun die

if To_Install 32 ympd # ympd
then
Download_Install 'https://dietpi.com/downloads/binaries/all/ympd_1.2.3.7z'

case $G_HW_ARCH in
1) local arch='armv6';;
2) local arch='armv7';;
3) local arch='armv8';;
*) local arch='amd64';;
esac

# We have no Buster binaries yet, so always use Stretch binaries
G_EXEC mv "ympd_${arch}_stretch" /usr/bin/ympd
G_EXEC chmod +x /usr/bin/ympd
G_EXEC rm ympd_*

# User
Create_User -g dietpi ympd

# Service
cat << '_EOF_' > /etc/systemd/system/ympd.service
[Unit]
Description=ympd (DietPi)
After=mpd.service

[Service]
User=ympd
ExecStart=/usr/bin/ympd -h /run/mpd/socket -w 1337

# Hardenings
ProtectSystem=strict
PrivateTmp=true
ProtectHome=true
PrivateDevices=true
ProtectKernelTunables=true
ProtectKernelModules=true
ProtectControlGroups=true
NoNewPrivileges=true

[Install]
WantedBy=multi-user.target
_EOF_
Download_Install "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/ympd_$G_HW_ARCH_NAME.deb"
fi

if To_Install 148 mympd # myMPD
Expand Down Expand Up @@ -12529,8 +12486,7 @@ If no WireGuard (auto)start is included, but you require it, please do the follo

if To_Uninstall 32 # ympd
then
Remove_Service ympd 1 1 # group for pre-v6.33
[[ -f '/usr/bin/ympd' ]] && G_EXEC rm /usr/bin/ympd
G_AGP ympd
fi

if To_Uninstall 148 # myMPD
Expand Down

0 comments on commit 32ce32c

Please sign in to comment.