From: Flole Date: Mon, 14 Jul 2025 17:30:49 +0000 (+0200) Subject: Fix builds on debian buster X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf31d96422bad6474744e2bddc65451b2c6b96a;p=thirdparty%2Ftvheadend.git Fix builds on debian buster --- diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 677dd897c..346b8a0b7 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -112,14 +112,18 @@ jobs: # publicly in your project's package repository, so it is vital that # no secrets are present in the container state or logs. install: | - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i '/jessie-updates/d' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i '/stretch-updates/d' /etc/apt/sources.list; fi + if [ "${{ matrix.distro }}" = "buster" ] && [ "${{ matrix.arch }}" = "armv6" ]; then + echo "Skipping source list modification for buster on armv6" + else + case "${{ matrix.distro }}" in + jessie|stretch|buster) + sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list + sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list + sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list + sed -i '/${{ matrix.distro }}-updates/d' /etc/apt/sources.list + ;; + esac + fi case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye|bookworm|trixie) apt-get update -y @@ -162,7 +166,7 @@ jobs: docker pull ${{ matrix.container[0] }} docker run --name build-container -d -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null - name: Fix old debian apt - if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' + if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' || matrix.container[0] == 'debian:buster' || matrix.container[0] == 'i386/debian:buster' env: SCRIPT: | sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml index 41de8733d..d64d0339c 100644 --- a/.github/workflows/build-cloudsmith.yml +++ b/.github/workflows/build-cloudsmith.yml @@ -119,14 +119,18 @@ jobs: # publicly in your project's package repository, so it is vital that # no secrets are present in the container state or logs. install: | - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'jessie' ]; then sed -i '/jessie-updates/d' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list; fi - if [ '${{ matrix.distro }}' = 'stretch' ]; then sed -i '/stretch-updates/d' /etc/apt/sources.list; fi + if [ "${{ matrix.distro }}" = "buster" ] && [ "${{ matrix.arch }}" = "armv6" ]; then + echo "Skipping source list modification for buster on armv6" + else + case "${{ matrix.distro }}" in + jessie|stretch|buster) + sed -i 's/archive.raspbian.org/legacy.raspbian.org/g' /etc/apt/sources.list + sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list + sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list + sed -i '/${{ matrix.distro }}-updates/d' /etc/apt/sources.list + ;; + esac + fi case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye|bookworm|trixie) apt-get update -y @@ -169,7 +173,7 @@ jobs: docker pull ${{ matrix.container[0] }} docker run --name build-container -d -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null - name: Fix old debian apt - if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' + if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' || matrix.container[0] == 'debian:buster' || matrix.container[0] == 'i386/debian:buster' env: SCRIPT: | sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list