Improve armv6l-packages and remove various outdated references/commands

Author: Flole998

.github/workflows/build-ci.yml

@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     name: Build on Raspberry Pi ${{ matrix.arch }}
+    env:
+      NODIRTY: ${{ secrets.NODIRTY }}
     strategy:
       matrix:
         arch: [armv6l, armv7l, aarch64]
@@ -104,6 +106,7 @@ jobs:
           # Pass some environment variables to the container
           env: | # YAML, but pipe character is necessary
             artifact_name: git-${{ matrix.distro }}_${{ matrix.arch }}
+            NODIRTY: ${{ secrets.NODIRTY }}
 
 
           # The shell to run commands with in the container
@@ -191,6 +194,8 @@ jobs:
         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') || '' }}
+        env:
+          NODIRTY: ${{ secrets.NODIRTY }}
       - name: copy-result
         run: cp ../tvheadend*.deb .
       - uses: actions/upload-artifact@v3
@@ -230,5 +235,5 @@ jobs:
           name: Tvheadend-RPM
           path: tvheadend*.rpm
           if-no-files-found: error
-      # - name: upload-cloudsmith
-      #   run: support/cloudsmith.sh -n -f 'tvheadend*.rpm'
+      - name: upload-cloudsmith
+        run: support/cloudsmith.sh -n -f 'tvheadend*.rpm'

.github/workflows/build-cloudsmith.yml

@@ -18,6 +18,7 @@ jobs:
       CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
       CLOUDSMITH_OWNER: ${{ secrets.CLOUDSMITH_OWNER }}
       CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
+      NODIRTY: ${{ secrets.NODIRTY }}
     strategy:
       matrix:
         arch: [armv6l, armv7l, aarch64]
@@ -109,6 +110,7 @@ jobs:
             CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
             CLOUDSMITH_OWNER: ${{ secrets.CLOUDSMITH_OWNER }}
             CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
+            NODIRTY: ${{ secrets.NODIRTY }}
 
 
           # The shell to run commands with in the container
@@ -197,6 +199,8 @@ jobs:
         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') || '' }}
+        env:
+          NODIRTY: ${{ secrets.NODIRTY }}
       - name: copy-result
         run: cp ../tvheadend*.deb .
       - uses: actions/upload-artifact@v3

.gitignore

@@ -38,6 +38,8 @@ debian/changelog
 debian/files
 debian/tvheadend
 debian/tvheadend-dbg
+debian/tvheadend-armv6l
+debian/tvheadend-dbg-armv6l
 debian/tvheadend*substvars
 debian/tvheadend*.debhelper*
 

Autobuild.sh

@@ -48,8 +48,8 @@ do
 	  ARCHOVR="$OPTARG"
 	  ;;
       p)
-          OSPREFIX="$OPTARG"
-          ;;
+      OSPREFIX="$OPTARG"
+      ;;
       o)
 	  OP="$OPTARG"
 	  ;;
@@ -66,22 +66,6 @@ fi
 
 TARGET=$OSPREFIX$TARGET
 
-#
-# $1 = local file path
-# $2 = type
-# $3 = content-type
-# $4 = filename
-#
-artifact() {
-    echo "doozer-artifact:$PWD/$1:$2:$3:$4"
-    echo "$PWD/$1" >> "$FILELIST"
-}
-
-versioned_artifact() {
-    echo "doozer-versioned-artifact:$PWD/$1:$2:$3:$4"
-    echo "$PWD/$1" >> "$FILELIST"
-}
-
 git status
 
 if [ -f Autobuild/${TARGET}.sh ]; then

Autobuild/armv6l.sh

@@ -1,4 +1,5 @@
 AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=armel"
 sed -i -E '/-armv6l$/! s/^Package: (.*)(-armv6l)*$/Package: \1-armv6l/g' debian/control
 sed -i -E 's/^Depends: tvheadend/Depends: tvheadend-armv6l/g' debian/control
-sed -i -E '/armv6l/! s/package=tvheadend([^ ]*)/package=tvheadend\1-armv6l/g' debian/rules
+sed -i -E '/armv6l/! s/package=tvheadend([^ ]*)/package=tvheadend\1-armv6l/g' debian/rules
+sed -i -E '/armv6l/! s/--destdir=debian\/tvheadend/--destdir=debian\/tvheadend-armv6l/g' debian/rules

Autobuild/debian.sh

@@ -24,11 +24,6 @@ END {
   print out;
 }' debian/control`
 
-case "${DEBDIST}" in
-precise|trusty|jessie|raspbianjessie)
-  BUILD_DEPS=`echo ${BUILD_DEPS} | sed -e 's/libpcre2-dev/libpcre3-dev/g'` ;;
-esac
-
 build() 
 {
     $(dirname $0)/support/changelog "$CHANGELOG" "$DEBDIST" "$VER"
@@ -48,14 +43,6 @@ build()
     export USE_CCACHE
 
     dpkg-buildpackage -b -us -uc
-
-    for a in ../tvheadend*${VER}*.deb; do
-        versioned_artifact "$a" deb application/x-deb `basename $a`
-    done
-
-    for a in ../tvheadend*${VER}*.changes; do
-        versioned_artifact "$a" changes text/plain `basename $a`
-    done
 }
 
 clean() 

CONTRIBUTING.md

@@ -9,8 +9,7 @@ For further info, please see https://tvheadend.org/projects/tvheadend/wiki/Contr
 ## Before you start
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Make sure you have a [Redmine account](https://tvheadend.org)
-* Log on to the IRC channel (#hts on freenode), this is the best place to discussion development work.
+* Log on to the [Forum](https://tvheadend.org), this is the best place to discussion development work.
 * Fork the repository on Github
 
 ## Making Changes
@@ -33,8 +32,8 @@ This fixes #1234.
 # Additional Resources
 
 * [More information on contributing](https://tvheadend.org/projects/tvheadend/wiki/Contributors)
-* [Bug tracker (Redmine)](https://tvheadend.org)
+* [Forum](https://tvheadend.org)
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #hts IRC channel on freenode.org
+* #hts IRC channel on libera.chat
 

debian/control

@@ -1,11 +1,11 @@
 Source: tvheadend
 Section: video
 Priority: extra
-Maintainer: Adam Sutton <aps@tvheadend.org>
+Maintainer: Tvheadend Project <admin@tvheadend.org>
 Build-Depends: debhelper (>= 7.0.50), pkg-config, gettext, libavahi-client-dev, libssl-dev | libssl1.0-dev, zlib1g-dev, wget, bzip2, git-core, liburiparser-dev, python | python3, python-requests | python3-requests, ca-certificates, cmake, libpcre2-dev | libpcre3-dev, libdvbcsa-dev
 Standards-Version: 3.7.3
 
-Package: tvheadend
+Package: tvheadend-armv6l
 Architecture: any
 Depends: ${shlibs:Depends}, libavahi-client3, zlib1g, liburiparser1, bzip2
 Recommends: xmltv-util, python, python-requests
@@ -17,10 +17,10 @@ Description: Tvheadend
    - supports a variety of inputs (DVB-S(2)/T(2)/C, ISDB-S/T/C, ATSC-T/C, IPTV, SAT>IP, HDHR)
    - supports a variety of clients (Movian, Smart TV, Kodi, VLC)
 
-Package: tvheadend-dbg
+Package: tvheadend-dbg-armv6l
 Architecture: any
 Section: debug
 Priority: extra
-Depends: tvheadend (= ${binary:Version}), ${misc:Depends}
+Depends: tvheadend-armv6l (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for Tvheadend
  This package contains the debugging symbols for Tvheadend.

debian/copyright

@@ -1,4 +1,4 @@
-HTS Tvheadend is copyright (c) Andreas Öman 2006 - 2009
+HTS Tvheadend is copyright (c) Tvheadend Project 2006 - 2024
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

debian/rules

@@ -15,14 +15,14 @@ override_dh_auto_build:
 	make ${JARGS}
 
 override_dh_strip:
-	dh_strip --dbg-package=tvheadend-dbg
+	dh_strip --dbg-package=tvheadend-dbg-armv6l
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 override_dh_auto_install:
 	dh_systemd_enable || true
 	dh_systemd_start || true
-	dh_auto_install --destdir=debian/tvheadend
+	dh_auto_install --destdir=debian/tvheadend-armv6l
 
 override_dh_auto_clean: