Build various targets and prepare new repository (#1476)

Some builds still need a newer python version

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index abe2d7f6db2218a16e373b52d0c96f1a0d73a1d9..a7644f698bb419f7aab2b64f417f157353f3c384 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,24 +1,191 @@
-name: Build Tvheadend CI
+name: Build Tvheadend Repo
 
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
-  build:
+  build-raspberry:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    name: Build on Raspberry Pi ${{ matrix.arch }}
+    env:
+      GITHUB_ENV: CLOUDSMITH_API_KEY
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
+    strategy:
+      matrix:
+        arch: [armv6l, armv7l, aarch64]
+        include:
+        - arch: armv6l
+          cpu: arm1176
+          base_image: raspios_lite:latest
+          cpu_info: cpuinfo/raspberrypi_zero_w
+        - arch: armv7l
+          cpu: cortex-a7
+          base_image: raspios_lite:latest
+          cpu_info: cpuinfo/raspberrypi_3b
+        - arch: aarch64
+          cpu: cortex-a53
+          base_image: raspios_lite_arm64:latest
+          cpu_info: cpuinfo/raspberrypi_zero2_w_arm64
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: pguyot/arm-runner-action@v2
+      with:
+        base_image: ${{ matrix.base_image }}
+        cpu: ${{ matrix.cpu }}
+        cpu_info: ${{ matrix.cpu_info }}
+        image_additional_mb: 10000
+        copy_artifact_path: ../tvheadend*.deb
+        import_github_env: true
+        commands: |
+          sudo apt-get update -y
+          sudo apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libdvbcsa-dev python3 python3-requests debhelper ccache lsb-release
+          DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre3-dev || DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre2-dev
+          AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh -p raspios
+          support/cloudsmith.sh -p raspios -f '../tvheadend*.deb'
+    - uses: actions/upload-artifact@v3
+      with:
+        name: Tvheadend-deb
+        path: tvheadend*.deb
+        if-no-files-found: error
 
+  build-crosscompile:
+    # The host should always be linux
     runs-on: ubuntu-latest
+    continue-on-error: true
+    name: Build on ${{ matrix.distro }} ${{ matrix.arch }}
+    # Run steps on a matrix
+    strategy:
+      matrix:
+       arch: [ armv7, aarch64]
+       distro: [ stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04 ]
+       include:
+         - arch: armv6
+           distro: jessie
+         - arch: armv6
+           distro: stretch
+         - arch: armv6
+           distro: buster
+         - arch: armv6
+           distro: bullseye
+         - arch: armv7
+           distro: jessie
 
     steps:
-    - uses: actions/checkout@v3
-    - name: dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libpcre2-dev libdvbcsa-dev python3 python3-requests debhelper ccache
-    - name: build
-      run: AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: uraimo/run-on-arch-action@v2
+        name: Build artifact
+        id: build
+        with:
+          arch: ${{ matrix.arch }}
+          distro: ${{ matrix.distro }}
+
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+
+          # Create an artifacts directory
+          setup: |
+            mkdir -p "${PWD}/artifacts"
+
+          # Mount the artifacts directory as /artifacts in the container
+          dockerRunArgs: |
+            --volume "${PWD}/artifacts:/artifacts"
+
+          # Pass some environment variables to the container
+          env: | # YAML, but pipe character is necessary
+            artifact_name: git-${{ matrix.distro }}_${{ matrix.arch }}
+            CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
+
+
+          # The shell to run commands with in the container
+          shell: /bin/sh
+
+          # Install some dependencies in the container. This speeds up builds if
+          # you are also using githubToken. Any dependencies installed here will
+          # be part of the container image that gets cached, so subsequent
+          # builds don't have to re-install them. The image layer is cached
+          # 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
+            case "${{ matrix.distro }}" in
+              ubuntu*|jessie|stretch|buster|bullseye)
+                apt-get update -y
+                DEBIAN_FRONTEND=noninteractive apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libdvbcsa-dev python3 python3-requests debhelper ccache lsb-release
+                DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre3-dev || DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre2-dev
+                ;;
+              fedora*)
+                dnf -y update
+                dnf -y install git which
+                ;;
+              alpine*)
+                apk update
+                apk add git
+                ;;
+            esac
+
+          # Produce a binary artifact
+          run: |
+            git config --global --add safe.directory /home/runner/work/tvheadend/tvheadend || true
+            AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh
+            cp ../tvheadend*.deb /artifacts/
+            support/cloudsmith.sh -f '../tvheadend*.deb'
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Tvheadend-deb
+          path: artifacts/tvheadend*.deb
+          if-no-files-found: error
+
+  build-deb-native:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    name: Build on native ${{ matrix.container }}
+    strategy:
+      matrix:
+        container: ["ubuntu:bionic", "ubuntu:focal", "ubuntu:impish", "ubuntu:trusty", "ubuntu:xenial", "i386/ubuntu:trusty", "i386/ubuntu:xenial", "debian:bookworm", "debian:bullseye", "debian:buster", "debian:sid", "debian:stretch", "i386/debian:bookworm", "i386/debian:bullseye", "i386/debian:buster", "i386/debian:sid", "i386/debian:stretch"]
+    container:
+      image: ${{ matrix.container }}
+    steps:
+      - name: Add git ppa
+        if: startsWith(matrix.container, 'ubuntu') || startsWith(matrix.container, 'i386/ubuntu')
+        run: |
+          apt-get update -y
+          DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common
+          add-apt-repository ppa:git-core/ppa -y
+      - name: dependencies
+        run: |
+          apt-get update -y
+          DEBIAN_FRONTEND=noninteractive apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libdvbcsa-dev python3 python3-requests debhelper ccache lsb-release
+      - name: pcre-dependency
+        run: |
+          DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre3-dev || DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre2-dev
+      - uses: actions/checkout@v3
+        if: startsWith(matrix.container, 'i386') != true && matrix.container != 'debian:stretch'
+        with:
+          fetch-depth: 0
+      - uses: actions/checkout@v1
+        if: startsWith(matrix.container, 'i386') || matrix.container == 'debian:stretch'
+      - name: Workaround safe directory
+        run: git config --global --add safe.directory /__w/tvheadend/tvheadend
+      - name: build
+        run: AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh ${{ (startsWith(matrix.container, 'i386') && '-a i386') || '' }}
+      - name: copy-result
+        run: cp ../tvheadend*.deb .
+      - uses: actions/upload-artifact@v3
+        if: startsWith(matrix.container, 'i386') != true
+        with:
+          name: Tvheadend-deb
+          path: tvheadend*.deb
+          if-no-files-found: error
+      - name: upload-cloudsmith
+        run: support/cloudsmith.sh -f 'tvheadend*.deb'
+        env:
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
new file mode 100644 (file)
index 0000000..943c886
--- /dev/null
+++ b/.github/workflows/coverity.yml
@@ -0,0 +1,45 @@
+name: Coverity Scan
+
+# We only want to test official release code, not every pull request.
+on:
+# Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    environment: Coverity
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libpcre2-dev libdvbcsa-dev python3 python3-requests debhelper ccache
+    - name: Configure
+      run: ./configure --disable-dvbcscan --disable-tvhcsa --enable-libfdkaac --enable-nvenc --enable-vaapi --enable-mmal --enable-omx
+    - name: Download Coverity Build Tool
+      run: |
+        wget -q https://scan.coverity.com/download/linux64 --post-data "token=$TOKEN&project=tvheadend%2Ftvheadend" -O cov-analysis-linux64.tar.gz
+        mkdir cov-analysis-linux64
+        tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
+      env:
+        TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+    - name: Build with cov-build
+      run: |
+        export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
+        cov-build --dir cov-int make
+    - name: Submit the result to Coverity Scan
+      run: |
+        tar czvf tvheadend.tgz cov-int
+        curl \
+          --form token=$TOKEN \
+          --form email=$EMAIL \
+          --form file=@tvheadend.tgz \
+          --form version="`./build.linux/tvheadend -v | awk -F ' ' '{print $3}'`" \
+          --form description="`./build.linux/tvheadend -v | awk -F ' ' '{print $3}'`" \
+          https://scan.coverity.com/builds?project=tvheadend%2Ftvheadend
+      env:
+        TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
new file mode 100644 (file)
index 0000000..e210eef
--- /dev/null
+++ b/.github/workflows/test-compile.yml
@@ -0,0 +1,24 @@
+name: Build Tvheadend CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+ build-ubuntu-latest:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake git build-essential pkg-config gettext libavahi-client-dev libssl-dev zlib1g-dev wget bzip2 git-core liburiparser-dev libpcre2-dev libdvbcsa-dev python3 python3-requests debhelper ccache
+    - name: build
+      run: AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh

diff --git a/Autobuild.sh b/Autobuild.sh
index 2344ddb35f13709f84c1d072b510fe12e53e3f21..50e5504a6086f7def537c59cdb208bddfb01e302 100755 (executable)
--- a/Autobuild.sh
+++ b/Autobuild.sh
@@ -12,12 +12,15 @@ BUILD_API_VERSION=3
 EXTRA_BUILD_NAME=""
 JARGS=""
 JOBSARGS=""
-TARGET="debian"
+TARGET=""
+ARCHOVR=""
 RELEASE="--release"
 WORKINGDIR="/var/tmp/showtime-autobuild"
 FILELIST="$PWD/filelist.txt"
 OP="build"
-while getopts "vht:e:j:w:o:c:" OPTION
+OSPREFIX=""
+
+while getopts "vht:e:j:w:o:p:a:c:" OPTION
 do
   case $OPTION in
       v)
@@ -41,6 +44,12 @@ do
       w)
          WORKINGDIR="$OPTARG"
          ;;
+      a)
+         ARCHOVR="$OPTARG"
+         ;;
+      p)
+          OSPREFIX="$OPTARG"
+          ;;
       o)
          OP="$OPTARG"
          ;;
@@ -48,10 +57,15 @@ do
 done
 
 if [[ -z $TARGET ]]; then
-    echo "target (-t) not specified"
-    exit 1
+    source Autobuild/identify-os.sh
+    if ! [[ -z $ARCHOVR ]]; then
+        ARCH=$ARCHOVR
+    fi
+    TARGET="$DISTRO-$ARCH"
 fi
 
+TARGET=$OSPREFIX$TARGET
+
 #
 # $1 = local file path
 # $2 = type
@@ -71,6 +85,7 @@ versioned_artifact() {
 git status
 
 if [ -f Autobuild/${TARGET}.sh ]; then
+    echo "Building for $TARGET"
     source Autobuild/${TARGET}.sh
 else
     echo "target $TARGET not supported"

diff --git a/Autobuild/bionic-amd64.sh b/Autobuild/aarch64.sh
similarity index 53%
rename from Autobuild/bionic-amd64.sh
rename to Autobuild/aarch64.sh
index b7fc439c9dc0901ddafbbdb61835219e28f08d21..75e115928c66a6e0ec4a2db6936e73584d197e8f 100644 (file)
--- a/Autobuild/bionic-amd64.sh
+++ b/Autobuild/aarch64.sh
@@ -1,3 +1 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=bionic
-source Autobuild/debian.sh
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=arm64 --disable-libtheora_static --disable-libtheora"

diff --git a/Autobuild/buster-armel.sh b/Autobuild/armv6l.sh
similarity index 63%
rename from Autobuild/buster-armel.sh
rename to Autobuild/armv6l.sh
index c14fc2298807f2b94c6c6e548a78eda79d5fe0ee..d2bc85830b29654ff80086532bfb7e74366eeca5 100644 (file)
--- a/Autobuild/buster-armel.sh
+++ b/Autobuild/armv6l.sh
@@ -1,3 +1 @@
 AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armel"
-DEBDIST=buster
-source Autobuild/debian.sh

diff --git a/Autobuild/xenial-armhf.sh b/Autobuild/armv7l.sh
similarity index 63%
rename from Autobuild/xenial-armhf.sh
rename to Autobuild/armv7l.sh
index 8fe64a5a4d3db2f7c3a37c9b171b65867917386e..be9f4fb833782348157fccc2fac0489d4add6d09 100644 (file)
--- a/Autobuild/xenial-armhf.sh
+++ b/Autobuild/armv7l.sh
@@ -1,3 +1 @@
 AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=xenial
-source Autobuild/debian.sh

diff --git a/Autobuild/bionic-aarch64.sh b/Autobuild/bionic-aarch64.sh
new file mode 100644 (file)
index 0000000..e05e484
--- /dev/null
+++ b/Autobuild/bionic-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/bionic.sh

diff --git a/Autobuild/bionic-armv7l.sh b/Autobuild/bionic-armv7l.sh
new file mode 100644 (file)
index 0000000..c933304
--- /dev/null
+++ b/Autobuild/bionic-armv7l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv7l.sh
+source Autobuild/bionic.sh

diff --git a/Autobuild/bionic-i386.sh b/Autobuild/bionic-i386.sh
index 12df5691d6a1cf555d406518ff32e887faeac42f..d77774fd96becee9e7554df9e1028edd8abd8bbe 100644 (file)
--- a/Autobuild/bionic-i386.sh
+++ b/Autobuild/bionic-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=bionic
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/bionic.sh

diff --git a/Autobuild/bionic-i686.sh b/Autobuild/bionic-i686.sh
new file mode 100644 (file)
index 0000000..8320288
--- /dev/null
+++ b/Autobuild/bionic-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/bionic.sh

diff --git a/Autobuild/bionic-x86_64.sh b/Autobuild/bionic-x86_64.sh
new file mode 100644 (file)
index 0000000..258cc8a
--- /dev/null
+++ b/Autobuild/bionic-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/bionic.sh

diff --git a/Autobuild/bionic.sh b/Autobuild/bionic.sh
new file mode 100644 (file)
index 0000000..03396e5
--- /dev/null
+++ b/Autobuild/bionic.sh
@@ -0,0 +1,2 @@
+DEBDIST=bionic
+source Autobuild/debian.sh

diff --git a/Autobuild/bookworm-i386.sh b/Autobuild/bookworm-i386.sh
new file mode 100644 (file)
index 0000000..881aaed
--- /dev/null
+++ b/Autobuild/bookworm-i386.sh
@@ -0,0 +1,2 @@
+source Autobuild/i386.sh
+source Autobuild/bookworm.sh

diff --git a/Autobuild/bookworm-i686.sh b/Autobuild/bookworm-i686.sh
new file mode 100644 (file)
index 0000000..7167ae9
--- /dev/null
+++ b/Autobuild/bookworm-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/bookworm.sh

diff --git a/Autobuild/bookworm-x86_64.sh b/Autobuild/bookworm-x86_64.sh
new file mode 100644 (file)
index 0000000..d5b66ea
--- /dev/null
+++ b/Autobuild/bookworm-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/bookworm.sh

diff --git a/Autobuild/bookworm.sh b/Autobuild/bookworm.sh
new file mode 100644 (file)
index 0000000..4d4f6a7
--- /dev/null
+++ b/Autobuild/bookworm.sh
@@ -0,0 +1,2 @@
+DEBDIST=bookworm
+source Autobuild/debian.sh

diff --git a/Autobuild/bullseye-aarch64.sh b/Autobuild/bullseye-aarch64.sh
new file mode 100644 (file)
index 0000000..5fde2df
--- /dev/null
+++ b/Autobuild/bullseye-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye-amd64.sh b/Autobuild/bullseye-amd64.sh
deleted file mode 100644 (file)
index 1bcf309..0000000
--- a/Autobuild/bullseye-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=bullseye
-source Autobuild/debian.sh

diff --git a/Autobuild/bullseye-arm64.sh b/Autobuild/bullseye-arm64.sh
deleted file mode 100644 (file)
index 0f9da42..0000000
--- a/Autobuild/bullseye-arm64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=arm64"
-DEBDIST=bullseye
-source Autobuild/debian.sh

diff --git a/Autobuild/bullseye-armel.sh b/Autobuild/bullseye-armel.sh
deleted file mode 100644 (file)
index 5a2a5ec..0000000
--- a/Autobuild/bullseye-armel.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armel"
-DEBDIST=bullseye
-source Autobuild/debian.sh

diff --git a/Autobuild/bullseye-armhf.sh b/Autobuild/bullseye-armhf.sh
deleted file mode 100644 (file)
index 0649143..0000000
--- a/Autobuild/bullseye-armhf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=bullseye
-source Autobuild/debian.sh

diff --git a/Autobuild/bullseye-armv6l.sh b/Autobuild/bullseye-armv6l.sh
new file mode 100644 (file)
index 0000000..56198e1
--- /dev/null
+++ b/Autobuild/bullseye-armv6l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv6l.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye-armv7l.sh b/Autobuild/bullseye-armv7l.sh
new file mode 100644 (file)
index 0000000..91d24c1
--- /dev/null
+++ b/Autobuild/bullseye-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv7l.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye-i386.sh b/Autobuild/bullseye-i386.sh
index 236742dd8b8f6cdc8f65ade1d20a0d0c588efab7..2b46a0df3a6974a7dea8cf75e47a35f4bb095230 100644 (file)
--- a/Autobuild/bullseye-i386.sh
+++ b/Autobuild/bullseye-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=bullseye
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye-i686.sh b/Autobuild/bullseye-i686.sh
new file mode 100644 (file)
index 0000000..485a673
--- /dev/null
+++ b/Autobuild/bullseye-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/focal-amd64.sh b/Autobuild/bullseye-i686.sh.save
similarity index 56%
rename from Autobuild/focal-amd64.sh
rename to Autobuild/bullseye-i686.sh.save
index 81614033c604e08909439447e3d695e27eb1906e..5543405a66007e7fe7628668b461fea85e903ce9 100644 (file)
--- a/Autobuild/focal-amd64.sh
+++ b/Autobuild/bullseye-i686.sh.save
@@ -1,3 +1,3 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=focal
-source Autobuild/debian.sh
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
+
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye-x86_64.sh b/Autobuild/bullseye-x86_64.sh
new file mode 100644 (file)
index 0000000..7ff6c0c
--- /dev/null
+++ b/Autobuild/bullseye-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/bullseye.sh

diff --git a/Autobuild/bullseye.sh b/Autobuild/bullseye.sh
new file mode 100644 (file)
index 0000000..0cc64ac
--- /dev/null
+++ b/Autobuild/bullseye.sh
@@ -0,0 +1,2 @@
+DEBDIST=bullseye
+source Autobuild/debian.sh

diff --git a/Autobuild/buster-aarch64.sh b/Autobuild/buster-aarch64.sh
new file mode 100644 (file)
index 0000000..586c2b0
--- /dev/null
+++ b/Autobuild/buster-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster-amd64.sh b/Autobuild/buster-amd64.sh
deleted file mode 100644 (file)
index daa3a51..0000000
--- a/Autobuild/buster-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=buster
-source Autobuild/debian.sh

diff --git a/Autobuild/buster-armhf.sh b/Autobuild/buster-armhf.sh
deleted file mode 100644 (file)
index c73c208..0000000
--- a/Autobuild/buster-armhf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=buster
-source Autobuild/debian.sh

diff --git a/Autobuild/buster-armv6l.sh b/Autobuild/buster-armv6l.sh
new file mode 100644 (file)
index 0000000..2cdea10
--- /dev/null
+++ b/Autobuild/buster-armv6l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv6l.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster-armv7l.sh b/Autobuild/buster-armv7l.sh
new file mode 100644 (file)
index 0000000..13ddaee
--- /dev/null
+++ b/Autobuild/buster-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv7l.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster-i386.sh b/Autobuild/buster-i386.sh
index c22517066c8751d0c2f665acbfa0b536eb1be56e..e2e20a25cdc50056eda0e510dffac6f42790ae27 100644 (file)
--- a/Autobuild/buster-i386.sh
+++ b/Autobuild/buster-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=buster
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster-i686.sh b/Autobuild/buster-i686.sh
new file mode 100644 (file)
index 0000000..fd06b9d
--- /dev/null
+++ b/Autobuild/buster-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster-x86_64.sh b/Autobuild/buster-x86_64.sh
new file mode 100644 (file)
index 0000000..e37bdff
--- /dev/null
+++ b/Autobuild/buster-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/buster.sh

diff --git a/Autobuild/buster.sh b/Autobuild/buster.sh
new file mode 100644 (file)
index 0000000..712b475
--- /dev/null
+++ b/Autobuild/buster.sh
@@ -0,0 +1,2 @@
+DEBDIST=buster
+source Autobuild/debian.sh

diff --git a/Autobuild/focal-aarch64.sh b/Autobuild/focal-aarch64.sh
new file mode 100644 (file)
index 0000000..c26deb0
--- /dev/null
+++ b/Autobuild/focal-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/focal.sh

diff --git a/Autobuild/focal-armv7l.sh b/Autobuild/focal-armv7l.sh
new file mode 100644 (file)
index 0000000..b4021ba
--- /dev/null
+++ b/Autobuild/focal-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv7l.sh
+source Autobuild/focal.sh

diff --git a/Autobuild/focal-i386.sh b/Autobuild/focal-i386.sh
index 07946bd5a6240a1407b1e657de9420911411acb3..752c1429e78b2e9c422d9999aacec3521e32322d 100644 (file)
--- a/Autobuild/focal-i386.sh
+++ b/Autobuild/focal-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=focal
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/focal.sh

diff --git a/Autobuild/focal-i686.sh b/Autobuild/focal-i686.sh
new file mode 100644 (file)
index 0000000..2877874
--- /dev/null
+++ b/Autobuild/focal-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/focal.sh

diff --git a/Autobuild/focal-x86_64.sh b/Autobuild/focal-x86_64.sh
new file mode 100644 (file)
index 0000000..f86a2b5
--- /dev/null
+++ b/Autobuild/focal-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/focal.sh

diff --git a/Autobuild/focal.sh b/Autobuild/focal.sh
new file mode 100644 (file)
index 0000000..a876d35
--- /dev/null
+++ b/Autobuild/focal.sh
@@ -0,0 +1,2 @@
+DEBDIST=focal
+source Autobuild/debian.sh

diff --git a/Autobuild/buster-arm64.sh b/Autobuild/i386.sh
similarity index 56%
rename from Autobuild/buster-arm64.sh
rename to Autobuild/i386.sh
index bd16b7a6e7a2c4700c76e93bb1f93770a05afffb..ff76f57a8be3b364660ca0a74e3dee6b9381c076 100644 (file)
--- a/Autobuild/buster-arm64.sh
+++ b/Autobuild/i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=arm64"
-DEBDIST=buster
-source Autobuild/debian.sh
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i386"
+

diff --git a/Autobuild/i686.sh b/Autobuild/i686.sh
new file mode 100644 (file)
index 0000000..beddbb4
--- /dev/null
+++ b/Autobuild/i686.sh
@@ -0,0 +1,2 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
+

diff --git a/Autobuild/identify-os.sh b/Autobuild/identify-os.sh
new file mode 100644 (file)
index 0000000..df9a57b
--- /dev/null
+++ b/Autobuild/identify-os.sh
@@ -0,0 +1,24 @@
+# Determine OS platform
+UNAME=$(uname | tr "[:upper:]" "[:lower:]")
+# If Linux, try to determine specific distribution
+if [ "$UNAME" == "linux" ]; then
+    # If available, use LSB to identify distribution
+    if [ -x "$(command -v lsb_release)" ]; then
+        export DISTRO=$(lsb_release -c | cut -d: -f2 | sed s/'^\t'//)
+        echo "OS identified using lsb_release command"
+    elif [ -f /etc/lsb-release ]; then
+         export DISTRO=$(awk -F= '/^DISTRIB_CODENAME/{print $2}' /etc/lsb-release)
+        echo "OS identified using lsb_release file"
+    # Otherwise, use release info file
+    elif [ -f /etc/os-release ]; then
+        export DISTRO=$(awk -F= '/^VERSION_CODENAME/{print $2}' /etc/os-release)
+        echo "OS identified using os-release file"
+    else
+        export DISTRO=$(ls -d /etc/[A-Za-z]*[_-][rv]e[lr]* | grep -v "lsb" | cut -d'/' -f3 | cut -d'-' -f1 | cut -d'_' -f1)
+        echo "OS identified using fallback"
+    fi
+fi
+# For everything else (or if above failed), just use generic identifier
+[ "$DISTRO" == "" ] && export DISTRO=$UNAME
+unset UNAME
+export ARCH=$(uname -m)

diff --git a/Autobuild/impish-x86_64.sh b/Autobuild/impish-x86_64.sh
new file mode 100644 (file)
index 0000000..7572e8f
--- /dev/null
+++ b/Autobuild/impish-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/impish.sh

diff --git a/Autobuild/impish.sh b/Autobuild/impish.sh
new file mode 100644 (file)
index 0000000..20b2b51
--- /dev/null
+++ b/Autobuild/impish.sh
@@ -0,0 +1,2 @@
+DEBDIST=impish
+source Autobuild/debian.sh

diff --git a/Autobuild/jammy-aarch64.sh b/Autobuild/jammy-aarch64.sh
new file mode 100644 (file)
index 0000000..7fbf715
--- /dev/null
+++ b/Autobuild/jammy-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/jammy.sh

diff --git a/Autobuild/jammy-armv7l.sh b/Autobuild/jammy-armv7l.sh
new file mode 100644 (file)
index 0000000..53541d0
--- /dev/null
+++ b/Autobuild/jammy-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265 --disable-ffmpeg_static"
+source Autobuild/armv7l.sh
+source Autobuild/jammy.sh

diff --git a/Autobuild/jammy-armv7l.sh.save b/Autobuild/jammy-armv7l.sh.save
new file mode 100644 (file)
index 0000000..c0a7bb3
--- /dev/null
+++ b/Autobuild/jammy-armv7l.sh.save
@@ -0,0 +1,3 @@
+
+source Autobuild/armv7l.sh
+source Autobuild/jammy.sh

diff --git a/Autobuild/jammy-x86_64.sh b/Autobuild/jammy-x86_64.sh
new file mode 100644 (file)
index 0000000..6de1b7f
--- /dev/null
+++ b/Autobuild/jammy-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/jammy.sh

diff --git a/Autobuild/jammy.sh b/Autobuild/jammy.sh
new file mode 100644 (file)
index 0000000..59cda4a
--- /dev/null
+++ b/Autobuild/jammy.sh
@@ -0,0 +1,2 @@
+DEBDIST=jammy
+source Autobuild/debian.sh

diff --git a/Autobuild/jessie-aarch64.sh b/Autobuild/jessie-aarch64.sh
new file mode 100644 (file)
index 0000000..c3d4216
--- /dev/null
+++ b/Autobuild/jessie-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie-amd64.sh b/Autobuild/jessie-amd64.sh
deleted file mode 100644 (file)
index cb409ae..0000000
--- a/Autobuild/jessie-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=jessie
-source Autobuild/debian.sh

diff --git a/Autobuild/jessie-armv6l.sh b/Autobuild/jessie-armv6l.sh
new file mode 100644 (file)
index 0000000..c8ff5ad
--- /dev/null
+++ b/Autobuild/jessie-armv6l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265 --nowerror"
+source Autobuild/armv6l.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie-armv7l.sh b/Autobuild/jessie-armv7l.sh
new file mode 100644 (file)
index 0000000..9c45418
--- /dev/null
+++ b/Autobuild/jessie-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265 --nowerror"
+source Autobuild/armv7l.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie-i386.sh b/Autobuild/jessie-i386.sh
index 91fc1308e2a9b9726e632730a21ce1f084bef484..8884c8a1608f05efc51869fd549b0a71f0839ea5 100644 (file)
--- a/Autobuild/jessie-i386.sh
+++ b/Autobuild/jessie-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=jessie
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie-i686.sh b/Autobuild/jessie-i686.sh
new file mode 100644 (file)
index 0000000..7fbc060
--- /dev/null
+++ b/Autobuild/jessie-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie-x86_64.sh b/Autobuild/jessie-x86_64.sh
new file mode 100644 (file)
index 0000000..d29314e
--- /dev/null
+++ b/Autobuild/jessie-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/jessie.sh

diff --git a/Autobuild/jessie.sh b/Autobuild/jessie.sh
new file mode 100644 (file)
index 0000000..4b30ac3
--- /dev/null
+++ b/Autobuild/jessie.sh
@@ -0,0 +1,2 @@
+DEBDIST=jessie
+source Autobuild/debian.sh

diff --git a/Autobuild/raspbianbuster-armhf.sh b/Autobuild/raspbianbuster-armhf.sh
deleted file mode 100644 (file)
index ddfd4d8..0000000
--- a/Autobuild/raspbianbuster-armhf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=raspbianbuster
-source Autobuild/debian.sh

diff --git a/Autobuild/raspbianjessie-armhf.sh b/Autobuild/raspbianjessie-armhf.sh
deleted file mode 100644 (file)
index 375fee2..0000000
--- a/Autobuild/raspbianjessie-armhf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=raspbianjessie
-source Autobuild/debian.sh

diff --git a/Autobuild/raspbianstretch-armhf.sh b/Autobuild/raspbianstretch-armhf.sh
deleted file mode 100644 (file)
index ff5ee4e..0000000
--- a/Autobuild/raspbianstretch-armhf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armhf"
-DEBDIST=raspbianstretch
-source Autobuild/debian.sh

diff --git a/Autobuild/raspiosbullseye-aarch64.sh b/Autobuild/raspiosbullseye-aarch64.sh
new file mode 100644 (file)
index 0000000..9b23acc
--- /dev/null
+++ b/Autobuild/raspiosbullseye-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/raspiosbullseye.sh

diff --git a/Autobuild/raspiosbullseye-armv6l.sh b/Autobuild/raspiosbullseye-armv6l.sh
new file mode 100644 (file)
index 0000000..14634cc
--- /dev/null
+++ b/Autobuild/raspiosbullseye-armv6l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv6l.sh
+source Autobuild/raspiosbullseye.sh

diff --git a/Autobuild/raspiosbullseye-armv7l.sh b/Autobuild/raspiosbullseye-armv7l.sh
new file mode 100644 (file)
index 0000000..e38ad97
--- /dev/null
+++ b/Autobuild/raspiosbullseye-armv7l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv7l.sh
+source Autobuild/raspiosbullseye.sh

diff --git a/Autobuild/raspiosbullseye.sh b/Autobuild/raspiosbullseye.sh
new file mode 100644 (file)
index 0000000..d03af2e
--- /dev/null
+++ b/Autobuild/raspiosbullseye.sh
@@ -0,0 +1,2 @@
+DEBDIST=raspbianbullseye
+source Autobuild/debian.sh

diff --git a/Autobuild/raspiosbuster-armv7l.sh b/Autobuild/raspiosbuster-armv7l.sh
new file mode 100644 (file)
index 0000000..d872829
--- /dev/null
+++ b/Autobuild/raspiosbuster-armv7l.sh
@@ -0,0 +1,3 @@
+source Autobuild/armv7l.sh
+DEBDIST=raspbianbuster
+source Autobuild/debian.sh

diff --git a/Autobuild/raspiosjessie-armv7l.sh b/Autobuild/raspiosjessie-armv7l.sh
new file mode 100644 (file)
index 0000000..1031ef6
--- /dev/null
+++ b/Autobuild/raspiosjessie-armv7l.sh
@@ -0,0 +1,3 @@
+source Autobuild/armv7l.sh
+DEBDIST=raspbianjessie
+source Autobuild/debian.sh

diff --git a/Autobuild/raspiosstretch-armv7l.sh b/Autobuild/raspiosstretch-armv7l.sh
new file mode 100644 (file)
index 0000000..5db3627
--- /dev/null
+++ b/Autobuild/raspiosstretch-armv7l.sh
@@ -0,0 +1,3 @@
+source Autobuild/armv7l.sh
+DEBDIST=raspbianstretch
+source Autobuild/debian.sh

diff --git a/Autobuild/sid-i386.sh b/Autobuild/sid-i386.sh
index a48912f18c7e50da7a207e7078bdd0a9d4a18a4c..9ff706e56939741b3b051c0b0f669e2ea44ff247 100644 (file)
--- a/Autobuild/sid-i386.sh
+++ b/Autobuild/sid-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=sid
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/sid.sh

diff --git a/Autobuild/sid-i686.sh b/Autobuild/sid-i686.sh
new file mode 100644 (file)
index 0000000..3d66a76
--- /dev/null
+++ b/Autobuild/sid-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/sid.sh

diff --git a/Autobuild/sid-x86_64.sh b/Autobuild/sid-x86_64.sh
new file mode 100644 (file)
index 0000000..e363e89
--- /dev/null
+++ b/Autobuild/sid-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/sid.sh

diff --git a/Autobuild/sid.sh b/Autobuild/sid.sh
new file mode 100644 (file)
index 0000000..358001b
--- /dev/null
+++ b/Autobuild/sid.sh
@@ -0,0 +1,2 @@
+DEBDIST=sid
+source Autobuild/debian.sh

diff --git a/Autobuild/stretch-aarch64.sh b/Autobuild/stretch-aarch64.sh
new file mode 100644 (file)
index 0000000..84f447f
--- /dev/null
+++ b/Autobuild/stretch-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch-amd64.sh b/Autobuild/stretch-amd64.sh
deleted file mode 100644 (file)
index bfbd452..0000000
--- a/Autobuild/stretch-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=stretch
-source Autobuild/debian.sh

diff --git a/Autobuild/stretch-armv6l.sh b/Autobuild/stretch-armv6l.sh
new file mode 100644 (file)
index 0000000..435d9af
--- /dev/null
+++ b/Autobuild/stretch-armv6l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv6l.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch-armv7l.sh b/Autobuild/stretch-armv7l.sh
new file mode 100644 (file)
index 0000000..6cd0ae9
--- /dev/null
+++ b/Autobuild/stretch-armv7l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv7l.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch-i386.sh b/Autobuild/stretch-i386.sh
index 05ce84829b824dfeb44fc88ae40bd524d130102e..b66efbf1df6f07d138bbd4aa566014bfcc43706c 100644 (file)
--- a/Autobuild/stretch-i386.sh
+++ b/Autobuild/stretch-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=stretch
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch-i686.sh b/Autobuild/stretch-i686.sh
new file mode 100644 (file)
index 0000000..43f0556
--- /dev/null
+++ b/Autobuild/stretch-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch-x86_64.sh b/Autobuild/stretch-x86_64.sh
new file mode 100644 (file)
index 0000000..71b9636
--- /dev/null
+++ b/Autobuild/stretch-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/stretch.sh

diff --git a/Autobuild/stretch.sh b/Autobuild/stretch.sh
new file mode 100644 (file)
index 0000000..2ca3e25
--- /dev/null
+++ b/Autobuild/stretch.sh
@@ -0,0 +1,2 @@
+DEBDIST=stretch
+source Autobuild/debian.sh

diff --git a/Autobuild/trusty-amd64.sh b/Autobuild/trusty-amd64.sh
deleted file mode 100644 (file)
index 740b5a7..0000000
--- a/Autobuild/trusty-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=trusty
-source Autobuild/debian.sh

diff --git a/Autobuild/trusty-i386.sh b/Autobuild/trusty-i386.sh
index c9509a260f4480afc4a559c5f6d4c433842239c1..a924f9cda23cee6f642b8910020375ad0d4e9af0 100644 (file)
--- a/Autobuild/trusty-i386.sh
+++ b/Autobuild/trusty-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=trusty
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/trusty.sh

diff --git a/Autobuild/trusty-i686.sh b/Autobuild/trusty-i686.sh
new file mode 100644 (file)
index 0000000..a605b13
--- /dev/null
+++ b/Autobuild/trusty-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/trusty.sh

diff --git a/Autobuild/trusty-x86_64.sh b/Autobuild/trusty-x86_64.sh
new file mode 100644 (file)
index 0000000..261cc57
--- /dev/null
+++ b/Autobuild/trusty-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/trusty.sh

diff --git a/Autobuild/trusty.sh b/Autobuild/trusty.sh
new file mode 100644 (file)
index 0000000..4ef045f
--- /dev/null
+++ b/Autobuild/trusty.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --nowerror"
+DEBDIST=trusty
+source Autobuild/debian.sh

diff --git a/Autobuild/sid-amd64.sh b/Autobuild/x86_64.sh
similarity index 65%
rename from Autobuild/sid-amd64.sh
rename to Autobuild/x86_64.sh
index 395b179d2934046e9ce347a8126e795fdbc4a4fd..feb0daf5204b1000c0e7bb4062ba7cc40e2ba20d 100644 (file)
--- a/Autobuild/sid-amd64.sh
+++ b/Autobuild/x86_64.sh
@@ -1,3 +1 @@
 AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=sid
-source Autobuild/debian.sh

diff --git a/Autobuild/xenial-aarch64.sh b/Autobuild/xenial-aarch64.sh
new file mode 100644 (file)
index 0000000..6df1c98
--- /dev/null
+++ b/Autobuild/xenial-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/xenial.sh

diff --git a/Autobuild/xenial-amd64.sh b/Autobuild/xenial-amd64.sh
deleted file mode 100644 (file)
index dae40df..0000000
--- a/Autobuild/xenial-amd64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64"
-DEBDIST=xenial
-source Autobuild/debian.sh

diff --git a/Autobuild/xenial-arm64.sh b/Autobuild/xenial-arm64.sh
deleted file mode 100644 (file)
index c5ca601..0000000
--- a/Autobuild/xenial-arm64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=arm64"
-DEBDIST=xenial
-source Autobuild/debian.sh

diff --git a/Autobuild/xenial-armv7l.sh b/Autobuild/xenial-armv7l.sh
new file mode 100644 (file)
index 0000000..bb208be
--- /dev/null
+++ b/Autobuild/xenial-armv7l.sh
@@ -0,0 +1,2 @@
+source Autobuild/armv7l.sh
+source Autobuild/xenial.sh

diff --git a/Autobuild/xenial-i386.sh b/Autobuild/xenial-i386.sh
index 3b54576c7712d256b4a830d1c2ce935202c8baeb..adf3302a38874a1e6085cde0345c08798aaea5aa 100644 (file)
--- a/Autobuild/xenial-i386.sh
+++ b/Autobuild/xenial-i386.sh
@@ -1,3 +1,2 @@
-AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
-DEBDIST=xenial
-source Autobuild/debian.sh
+source Autobuild/i386.sh
+source Autobuild/xenial.sh

diff --git a/Autobuild/xenial-i686.sh b/Autobuild/xenial-i686.sh
new file mode 100644 (file)
index 0000000..1b70c6e
--- /dev/null
+++ b/Autobuild/xenial-i686.sh
@@ -0,0 +1,2 @@
+source Autobuild/i686.sh
+source Autobuild/xenial.sh

diff --git a/Autobuild/xenial-x86_64.sh b/Autobuild/xenial-x86_64.sh
new file mode 100644 (file)
index 0000000..4878900
--- /dev/null
+++ b/Autobuild/xenial-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/xenial.sh

diff --git a/Autobuild/xenial.sh b/Autobuild/xenial.sh
new file mode 100644 (file)
index 0000000..71a07ac
--- /dev/null
+++ b/Autobuild/xenial.sh
@@ -0,0 +1,2 @@
+DEBDIST=xenial
+source Autobuild/debian.sh

diff --git a/support/cloudsmith.sh b/support/cloudsmith.sh
new file mode 100755 (executable)
index 0000000..d3829fe
--- /dev/null
+++ b/support/cloudsmith.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# Entry point for the Cloudsmith upload system
+#
+# (c) Flole 2022. All rights reserved.
+#
+#
+
+set -eu
+
+TARGET=""
+OSPREFIX=""
+OS=""
+FILE=""
+
+while getopts "t:p:f:" OPTION
+do
+  case $OPTION in
+      t)
+          TARGET="$OPTARG"
+          ;;
+      p)
+          OSPREFIX="$OPTARG"
+          ;;
+      f)
+          FILE="$OPTARG"
+          ;;
+  esac
+done
+
+if [[ -z $FILE ]]; then
+    echo "No file specified"
+    exit 1
+fi
+
+if [[ -z $TARGET ]]; then
+    source Autobuild/identify-os.sh
+    TARGET="$DISTRO"
+fi
+
+case $OSPREFIX$TARGET in
+    bookworm|bullseye|buster|sid|stretch|jessie)
+        OS="debian";;
+    bionic|focal|jammy|impish|trusty|xenial)
+        OS="ubuntu";;
+    raspiosbullseye|raspiosbuster|raspiosjessieraspiosstretch)
+        OS="raspbian";;
+    *) echo "OS $TARGET could not be recognized" && exit 1;;
+esac
+
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+export DEBIAN_FRONTEND=noninteractive
+
+apt install -y python3.7 || true
+
+apt install -y python3-pip || apt install -y python-pip
+
+pip3 install --upgrade pip || pip install --upgrade pip || pip2 install --upgrade pip
+
+pip3 install --upgrade cloudsmith-cli || pip install --upgrade cloudsmith-cli || pip2 install --upgrade cloudsmith-cli
+
+FILEARRAY=($FILE)
+
+for package in "${FILEARRAY[@]}"; do
+    python3 /usr/local/bin/cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package || python /usr/local/bin/cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package || cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package
+done

diff --git a/support/pcloud-ca-bundle.crt b/support/pcloud-ca-bundle.crt
index 218edec95adbc41f56363db31e935dca95605fb6..5aa290d9b1a8f2f87f631a32f9cd281ca3ad4aeb 100644 (file)
--- a/support/pcloud-ca-bundle.crt
+++ b/support/pcloud-ca-bundle.crt
@@ -138,3 +138,39 @@ DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
 PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
 ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
 -----END CERTIFICATE-----
+
+# Sectigo Root CA
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
+MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
+3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
+tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
+Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
+VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
+79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
+c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
+Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
+c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
+UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
+Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
+Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
+VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
+ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
+8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
+iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
+Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
+XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
+qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
+VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
+L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
+jjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----