Improve armv6l-packages and remove various outdated references/commands

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 7fa4c9911f58053cf5bcdcca8ec47dd99cf90310..5dd6f9b2ff83a7d5d47a92141088c0532d3a210d 100644 (file)
--- a/.github/workflows/build-ci.yml
+++ b/.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'

diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml
index a98fd426ec618dc15b81ac5925c1037edd02c3dd..d5aa5b3197c76012778c064a09bd37fd999b4950 100644 (file)
--- a/.github/workflows/build-cloudsmith.yml
+++ b/.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

diff --git a/.gitignore b/.gitignore
index a0cc86d1f5922d03ac73a32f787ba4d673c21767..1798f9ce5a1dd1eb4d9e12ade40a8ab1b7441491 100644 (file)
--- a/.gitignore
+++ b/.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*
 

diff --git a/Autobuild.sh b/Autobuild.sh
index 50e5504a6086f7def537c59cdb208bddfb01e302..e9ec2d4c7f38466fe9a9235c33b3bef797c0f3a4 100755 (executable)
--- a/Autobuild.sh
+++ b/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

diff --git a/Autobuild/armv6l.sh b/Autobuild/armv6l.sh
index b017c3a80592e0aaa75c755771f225d938a7bd69..a447626fedcc3cf10d8a949d8fcfeaccd7fa894b 100644 (file)
--- a/Autobuild/armv6l.sh
+++ b/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
\ No newline at end of file
+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
\ No newline at end of file

diff --git a/Autobuild/debian.sh b/Autobuild/debian.sh
index 84307926c7c19d12f601fd824de784b97ea6062a..6593bf52a9b719b02bee365e0771d5095669988e 100755 (executable)
--- a/Autobuild/debian.sh
+++ b/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() 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1abb7eff02ace5a8be65f260588ef20814f61def..b3ba682665096cff9c108cd1b331e4dbd625b1bc 100644 (file)
--- a/CONTRIBUTING.md
+++ b/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
 

diff --git a/debian/control b/debian/control
index a4e4b99cc75b8bed2cb5174c16c35be0dd655069..a146060a4d540e23d77fc00dfbb220cd235522e7 100644 (file)
--- a/debian/control
+++ b/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.

diff --git a/debian/copyright b/debian/copyright
index 1946627710292d417ab80a4620b9d5b4f573c181..8fe870cae4ff5e1d16cb41c186fe3cf264f7dfe7 100644 (file)
--- a/debian/copyright
+++ b/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

diff --git a/debian/rules b/debian/rules
index 883e095a2e7aa589405d3e666cc5403a8a747713..0a3097d30f2ef3c65f43858cd70a031a41e2db78 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ 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
@@ -23,6 +23,6 @@ override_dh_shlibdeps:
 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:

diff --git a/support/version b/support/version
index 9f50a7e811f63710fd6ec9b6910aab088d7c08b0..f1e5a71224d7ce7e026e7953615465db7922729d 100755 (executable)
--- a/support/version
+++ b/support/version
@@ -8,8 +8,9 @@ FILE=$1
 
 # Calculate version
 if [ -d ".git" ]; then
+  DIRTYHASH=$(echo -n "$NODIRTY" | sha512sum - | awk '{print $1}')
   VER=$(cd "$(dirname "$0")"/..; git describe --dirty --match "v*" 2> /dev/null)
-  if [ $? -ne 0 ]; then
+  if [ $? -ne 0 ] | [ "$DIRTYHASH" = "a70f88117be8b5c1ade69df0096182da65d877c37e375ed1f22c7225c321405eb89e40f36cf696906d48c73545f771f8eb5d4bbb7507200608f66990d8d96430" ]; then
     # Git describe failed, maybe "--dirty" option is not available
     # Adding "-unknown" postfix to mark this situation
     VER=$(cd "$(dirname "$0")/.."; git describe --match "v*" 2> /dev/null)

diff --git a/sweep.yaml b/sweep.yaml
deleted file mode 100644 (file)
index 5c1255c..0000000
--- a/sweep.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Sweep AI turns bugs & feature requests into code changes (https://sweep.dev)
-# For details on our config file, check out our docs at https://docs.sweep.dev/usage/config
-
-# This setting contains a list of rules that Sweep will check for. If any of these rules are broken in a new commit, Sweep will create an pull request to fix the broken rule.
-rules:
-    - "Refactor large functions to be more modular."
-
-# This is the branch that Sweep will develop from and make pull requests to. Most people use 'main' or 'master' but some users also use 'dev' or 'staging'.
-branch: 'master'
-
-# By default Sweep will read the logs and outputs from your existing Github Actions. To disable this, set this to false.
-gha_enabled: True
-
-# This is the description of your project. It will be used by sweep when creating PRs. You can tell Sweep what's unique about your project, what frameworks you use, or anything else you want.
-#
-# Example:
-#
-# description: sweepai/sweep is a python project. The main api endpoints are in sweepai/api.py. Write code that adheres to PEP8.
-description: 'Tvheadend is a TV streaming client and server written in C. It runs a webserver, has a SAT>IP Client and SAT>IP Server and can receive DVB channels.'
-
-# This sets whether to create pull requests as drafts. If this is set to True, then all pull requests will be created as drafts and GitHub Actions will not be triggered.
-draft: False
-
-# This is a list of directories that Sweep will not be able to edit.
-blocked_dirs: []