Bot Updating Package Versions

Bot Updating Templated Files
2019-10-20 18:39:50 -04:00 · 2019-10-20 17:57:43 -04:00 · 2019-10-20 22:56:20 +01:00 · 2019-10-20 22:55:00 +01:00 · 2019-10-20 14:00:11 -07:00 · 2019-10-02 18:05:34 -04:00
10 changed files with 126 additions and 157 deletions
--- a/57
+++ b/57
@@ -3,11 +3,12 @@ FROM lsiobase/alpine:3.10 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT

 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"

 # copy patches
@@ -31,18 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
-	libva-dev \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -78,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -120,7 +118,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -141,44 +139,41 @@ RUN \
 make test && \
 make DESTDIR=/tmp/xmltv-build install

+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
 echo "**** compile tvheadend ****" && \
 if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
 	| jq -r '. | .sha'); \
 fi && \
 mkdir -p \
-	/tmp/tvheadend && \
+        /tmp/tvheadend && \
 git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
 cd /tmp/tvheadend && \
 git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
-	--enable-vaapi \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -241,18 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
-	libva \
-	libva-intel-driver \
-	mesa-dri-ati \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -287,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -327,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -3,11 +3,12 @@ FROM lsiobase/alpine:arm64v8-3.10 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT

 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"

 # copy patches
@@ -31,17 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -119,7 +118,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -140,11 +139,19 @@ RUN \
 make test && \
 make DESTDIR=/tmp/xmltv-build install

+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
 echo "**** compile tvheadend ****" && \
 if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
 fi && \
 mkdir -p \
        /tmp/tvheadend && \
@@ -152,31 +159,21 @@ RUN \
 cd /tmp/tvheadend && \
 git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -239,15 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -282,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -322,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,11 +3,12 @@ FROM lsiobase/alpine:arm32v7-3.10 as buildstage

 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG TVH_VER="release/4.2"
+ARG XMLTV_VER="v0.5.70"
+ARG TVHEADEND_COMMIT

 # environment settings
 ARG TZ="Europe/Oslo"
-ARG TVHEADEND_COMMIT
 ENV HOME="/config"

 # copy patches
@@ -31,17 +32,16 @@ RUN \
 	git \
 	gzip \
 	jq \
-	libcurl \
-	libdvbcsa-dev \
 	libgcrypt-dev \
 	libhdhomerun-dev \
+	libressl-dev \
 	libtool \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	mercurial \
 	opus-dev \
 	patch \
 	pcre2-dev \
@@ -77,7 +77,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -119,7 +118,7 @@ RUN \

 RUN \
 echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -L http://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches

 RUN \
@@ -140,11 +139,19 @@ RUN \
 make test && \
 make DESTDIR=/tmp/xmltv-build install

+RUN \
+ echo "**** compile dvb-apps ****" && \
+ hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
+ cd /tmp/dvb-apps && \
+ make -C lib && \
+ make -C lib DESTDIR=/tmp/dvbapps-build install && \
+ cp -pr /tmp/dvbapps-build/usr/* /usr/
+
 RUN \
 echo "**** compile tvheadend ****" && \
 if [ -z ${TVHEADEND_COMMIT+x} ]; then \
-        TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/master \
-        | jq -r '. | .sha'); \
+	TVHEADEND_COMMIT=$(curl -sX GET https://api.github.com/repos/tvheadend/tvheadend/commits/${TVH_VER} \
+	| jq -r '. | .sha'); \
 fi && \
 mkdir -p \
        /tmp/tvheadend && \
@@ -152,31 +159,21 @@ RUN \
 cd /tmp/tvheadend && \
 git checkout ${TVHEADEND_COMMIT} && \
 ./configure \
-	`#Encoding` \
+	--disable-avahi \
+	--disable-bintray_cache \
+	--disable-dbus_1 \
 	--disable-ffmpeg_static \
+	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
+	--disable-libmfx_static \
 	--disable-libtheora_static \
-	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
-	--disable-libfdkaac \
-	--enable-libopus \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	\
-	`#Options` \
-	--disable-avahi \
-	--disable-dbus_1 \
-	--disable-bintray_cache \
-	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
 	--enable-pngquant \
-	--enable-trace \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -239,15 +236,14 @@ RUN \
 	ffmpeg-libs \
 	gzip \
 	libcrypto1.1 \
-	libcurl \
-	libdvbcsa \
+	libcurl	\
 	libhdhomerun-libs \
+	libressl \
 	libssl1.1 \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
-	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -282,7 +278,6 @@ RUN \
 	perl-lingua-en-numbers-ordinate \
 	perl-lingua-preferred \
 	perl-list-moreutils \
-	perl-lwp-useragent-determined \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
@@ -322,6 +317,7 @@ RUN \
 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
 COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
+COPY --from=buildstage /tmp/dvbapps-build/usr/ /usr/
 COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
--- a/68
+++ b/68
@@ -14,7 +14,7 @@ pipeline {
  environment {
    BUILDS_DISCORD=credentials('build_webhook_url')
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
-    EXT_GIT_BRANCH = 'master'
+    EXT_GIT_BRANCH = 'release/4.2'
    EXT_USER = 'tvheadend'
    EXT_REPO = 'tvheadend'
    BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
@@ -42,7 +42,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':release-4.2 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -127,10 +127,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a release-4.2 build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -148,7 +148,7 @@ pipeline {
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "release-4.2"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -215,7 +215,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -226,7 +226,7 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=release-4.2 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -234,7 +234,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f release-4.2
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
@@ -266,7 +266,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -365,7 +365,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -393,7 +393,7 @@ pipeline {
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f release-4.2
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -417,7 +417,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -431,7 +431,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "master"
+        branch "release-4.2"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -516,12 +516,12 @@ pipeline {
          sh '''#! /bin/bash
             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
             '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
-          sh "docker push ${IMAGE}:latest"
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:release-4.2"
+          sh "docker push ${IMAGE}:release-4.2"
          sh "docker push ${IMAGE}:${META_TAG}"
          sh '''docker rmi \
                ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest || :'''
+                ${IMAGE}:release-4.2 || :'''
                
        }
      }
@@ -551,32 +551,32 @@ pipeline {
                  docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi'''
-          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
-          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-release-4.2"
+          sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-release-4.2"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-release-4.2"
          sh "docker push ${IMAGE}:amd64-${META_TAG}"
          sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-latest"
-          sh "docker push ${IMAGE}:arm32v7-latest"
-          sh "docker push ${IMAGE}:arm64v8-latest"
-          sh "docker manifest push --purge ${IMAGE}:latest || :"
-          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
+          sh "docker push ${IMAGE}:amd64-release-4.2"
+          sh "docker push ${IMAGE}:arm32v7-release-4.2"
+          sh "docker push ${IMAGE}:arm64v8-release-4.2"
+          sh "docker manifest push --purge ${IMAGE}:release-4.2 || :"
+          sh "docker manifest create ${IMAGE}:release-4.2 ${IMAGE}:amd64-release-4.2 ${IMAGE}:arm32v7-release-4.2 ${IMAGE}:arm64v8-release-4.2"
+          sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm32v7-release-4.2 --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:release-4.2 ${IMAGE}:arm64v8-release-4.2 --os linux --arch arm64 --variant v8"
          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:latest"
+          sh "docker manifest push --purge ${IMAGE}:release-4.2"
          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
          sh '''docker rmi \
                ${IMAGE}:amd64-${META_TAG} \
-                ${IMAGE}:amd64-latest \
+                ${IMAGE}:amd64-release-4.2 \
                ${IMAGE}:arm32v7-${META_TAG} \
-                ${IMAGE}:arm32v7-latest \
+                ${IMAGE}:arm32v7-release-4.2 \
                ${IMAGE}:arm64v8-${META_TAG} \
-                ${IMAGE}:arm64v8-latest \
+                ${IMAGE}:arm64v8-release-4.2 \
                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
        }
@@ -585,7 +585,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "release-4.2"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -597,17 +597,17 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to release-4.2",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "release-4.2",\
                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
--- a/README.md
+++ b/README.md
@@ -82,15 +82,14 @@ docker create \
  -v <path to data>:/config \
  -v <path to recordings>:/recordings \
  --device /dev/dri:/dev/dri `#optional` \
-  --device /dev/dvb:/dev/dvb `#optional` \
+  --device /dev/drb:/dev/dvb `#optional` \
  --restart unless-stopped \
  linuxserver/tvheadend
 ```

 #### Host vs. Bridge

-If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
+If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.


 ### docker-compose
@@ -117,7 +116,7 @@ services:
      - 9982:9982
    devices:
      - /dev/dri:/dev/dri #optional
-      - /dev/dvb:/dev/dvb #optional
+      - /dev/drb:/dev/dvb #optional
    restart: unless-stopped
 ```

@@ -279,14 +278,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **02.10.19:** - Improve permission fixing on render & dvb devices.
-* **18.08.19:** - Add AMD drivers.
+* **02.10.19:** - Improve permissions fixing on render & dvb devices.
 * **02.08.19:** - Attempt to automatically fix permissions on /dev/dri and /dev/dvb.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **27.03.19:** - Rebase to Alpine 3.9, fix init logic to only chown once.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **01.03.19:** - Bump xmltv to 0.6.1.
-* **28.02.19:** - add perl-lwp-useragent-determined.
 * **17.02.19:** - Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend.
 * **14.02.19:** - Add picons path to config.
 * **15.01.19:** - Add pipeline logic and multi arch.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,11 +3,11 @@
 # jenkins variables
 project_name: docker-tvheadend
 external_type: github_commit
-release_type: stable
-release_tag: latest
-ls_branch: master
+release_type: prerelease
+release_tag: release-4.2
+ls_branch: release-4.2
 repo_vars:
-  - EXT_GIT_BRANCH = 'master'
+  - EXT_GIT_BRANCH = 'release/4.2'
  - EXT_USER = 'tvheadend'
  - EXT_REPO = 'tvheadend'
  - BUILD_VERSION_ARG = 'TVHEADEND_COMMIT'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -10,7 +10,6 @@ ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
 coreutils-8.31-r0
 curl-7.66.0-r0
-elfutils-libelf-0.168-r2
 expat-2.2.8-r0
 ffmpeg-4.1.4-r0
 ffmpeg-libs-4.1.4-r0
@@ -32,7 +31,6 @@ libc-utils-0.7.1-r0
 libcrypto1.1-1.1.1d-r0
 libcurl-7.66.0-r0
 libdrm-2.4.98-r0
-libdvbcsa-1.1.0-r1
 libffi-3.2.1-r6
 libgcc-8.3.0-r0
 libgcrypt-1.8.5-r0
@@ -43,6 +41,10 @@ libjpeg-turbo-2.0.2-r0
 libogg-1.3.3-r2
 libpciaccess-0.14-r0
 libpng-1.6.37-r1
+libressl-2.7.5-r0
+libressl2.7-libcrypto-2.7.5-r0
+libressl2.7-libssl-2.7.5-r0
+libressl2.7-libtls-2.7.5-r0
 libssl1.1-1.1.1d-r0
 libstdc++-8.3.0-r0
 libtasn1-4.14-r0
@@ -52,7 +54,6 @@ libunistring-0.9.10-r0
 liburiparser-0.9.3-r0
 libuuid-2.33.2-r0
 libva-2.4.1-r0
-libva-intel-driver-2.3.0-r0
 libvdpau-1.2-r0
 libvorbis-1.3.6-r2
 libvpx-1.8.0-r0
@@ -63,14 +64,9 @@ libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-5.0.3-r2
 libxml2-2.9.9-r2
-libxshmfence-1.3-r0
 libxslt-1.1.33-r1
 linux-headers-4.19.36-r0
 linux-pam-1.3.0-r1
-llvm8-libs-8.0.0-r1
-mesa-19.0.6-r0
-mesa-dri-ati-19.0.6-r0
-mesa-glapi-19.0.6-r0
 musl-1.1.22-r3
 musl-utils-1.1.22-r3
 ncurses-libs-6.1_p20190518-r0
@@ -78,7 +74,6 @@ ncurses-terminfo-6.1_p20190518-r0
 ncurses-terminfo-base-6.1_p20190518-r0
 nettle-3.4.1-r1
 nghttp2-libs-1.39.2-r0
-openssl-1.1.1d-r0
 opus-1.3.1-r0
 p11-kit-0.23.16.1-r0
 pcre2-10.33-r0
@@ -141,7 +136,6 @@ perl-lingua-preferred-0.2.4-r1
 perl-list-moreutils-0.428-r0
 perl-list-moreutils-xs-0.428-r1
 perl-lwp-mediatypes-6.04-r0
-perl-lwp-useragent-determined-1.07-r0
 perl-module-build-0.4229-r0
 perl-module-implementation-0.09-r1
 perl-module-metadata-1.000036-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -53,15 +53,14 @@ opt_param_usage_include_ports: false
 opt_param_device_map: true
 opt_param_devices:
  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "Only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi)." }
-  - { device_path: "/dev/dvb", device_host_path: "/dev/dvb", desc: "Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out." }
+  - { device_path: "/dev/dvb", device_host_path: "/dev/drb", desc: "Only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out." }
 opt_cap_add_param: false
 optional_block_1: true
 optional_block_1_items:
  - |
    #### Host vs. Bridge

-    If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because to work with these services Tvheadend requires a multicast address of `239.255.255.250` and a UDP port of `1900` which at this time is not possible with docker bridge mode.
-    If you have other host services which also use multicast such as SSDP/DLNA/Emby you may experience stabilty problems. These can be solved by giving tvheadend its own IP using macavlan.
+    If you use IPTV, SAT>IP or HDHomeRun, you need to create the container with --net=host and remove the -p flags. This is because of a limitation in docker and multicast.

 # application setup block
 app_setup_block_enabled: true
@@ -126,14 +125,11 @@ app_setup_block: |

 # changelog
 changelogs:
-  - { date: "02.10.19:", desc: "Improve permission fixing on render & dvb devices." }
-  - { date: "18.08.19:", desc: "Add AMD drivers." }
+  - { date: "02.10.19:", desc: "Improve permissions fixing on render & dvb devices." }
  - { date: "02.08.19:", desc: "Attempt to automatically fix permissions on /dev/dri and /dev/dvb." }
  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
  - { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "01.03.19:", desc: "Bump xmltv to 0.6.1." }
-  - { date: "28.02.19:", desc: "add perl-lwp-useragent-determined." }
  - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }
  - { date: "14.02.19:", desc: "Add picons path to config." }
  - { date: "15.01.19:", desc: "Add pipeline logic and multi arch." }
--- a/root/defaults/config
+++ b/root/defaults/config
@@ -1,7 +1,7 @@
 {
-        "prefer_picon": true,
-        "chiconpath": "file:///picons/%C.png",
-        "piconpath": "file:///picons/",
-        "piconscheme": 0,
-        "chiconscheme": 2
+	"prefer_picon": true,
+	"chiconpath": "file:///picons/%C.png",
+	"piconpath": "file:///picons/",
+	"piconscheme": 0,
+	"chiconscheme": 2
 }
--- a/root/etc/services.d/tvheadend/run
+++ b/root/etc/services.d/tvheadend/run
Author	SHA1	Message	Date
LinuxServer-CI	add0f71bb5	Bot Updating Package Versions	2019-10-20 18:39:50 -04:00
LinuxServer-CI	f361044cd9	Bot Updating Templated Files	2019-10-20 17:57:43 -04:00
LinuxServer-CI	dbc64ffec6	Bot Updating Templated Files	2019-10-20 22:56:20 +01:00
chbmb	2ace13ff57	Merge pull request #148 from thelamer/release-4.2 bugfix for alpine	2019-10-20 22:55:00 +01:00
thelamer	e9bcbed67d	bugfix for alpine	2019-10-20 14:00:11 -07:00
LinuxServer-CI	c2d877e27c	Bot Updating Package Versions	2019-10-02 18:05:34 -04:00
LinuxServer-CI	d9d6268f24	Bot Updating Templated Files	2019-10-02 17:12:00 -04:00
LinuxServer-CI	59907cf1df	Bot Updating Templated Files	2019-10-02 17:10:52 -04:00
aptalca	cc7c79eb44	Improve permission fixing on render & dvb devices	2019-10-02 17:09:42 -04:00
LinuxServer-CI	1bb93b5a30	Bot Updating Package Versions	2019-08-02 15:18:17 -04:00
aptalca	5615df900e	fix video device permissions	2019-08-02 11:09:06 -07:00
LinuxServer-CI	f7af259238	Bot Updating Package Versions	2019-06-30 22:09:01 +00:00
LinuxServer-CI	bf90cea801	Bot Updating Templated Files	2019-06-30 20:21:43 +01:00
chbmb	ebcc0518bf	Merge pull request #135 from linuxserver/release-4.2-3.10 Rebasing to Alpine 3.10	2019-06-30 20:20:39 +01:00
thelamer	7cf6a4290e	Rebasing to Alpine 3.10	2019-06-28 19:08:29 -07:00
LinuxServer-CI	e052b086ce	Bot Updating Package Versions	2019-06-13 19:23:28 -04:00
LinuxServer-CI	118f21be42	Bot Updating Templated Files	2019-06-12 18:36:45 -04:00
LinuxServer-CI	0f8ca85398	Bot Updating Templated Files	2019-06-12 23:35:45 +01:00
Ryan Kuba	e7ffd7fb7f	Extract Picons on boot Release-4.2 (#128 ) * reworking logic to untar on first boot and reducing sample size for chown logic as it is not recursive * bad path in arm variants	2019-03-28 17:18:44 +01:00
LinuxServer-CI	6eb29390f0	Bot Updating Package Versions	2019-03-28 07:53:07 +00:00
Ryan Kuba	c064466ce4	#72 fix chowning Release 4.2 (#126 ) * making mods for release-4.2 branch * typo	2019-03-28 08:03:35 +01:00
LinuxServer-CI	b6a321aee6	Bot Updating Package Versions	2019-03-25 02:02:20 +01:00
Ryan Kuba	3d34a9cf03	Merge pull request #124 from thelamer/release-4.2 Switching to new Base images, shift to arm32v7 tag.	2019-03-24 17:10:13 -07:00
thelamer	e0a76e29e2	Switching to new Base images, shift to arm32v7 tag.	2019-03-23 22:18:13 -07:00
LinuxServer-CI	13f64cbc4b	Bot Updating Package Versions	2019-03-22 00:31:34 +00:00
LinuxServer-CI	2c696d51b0	Bot Updating Package Versions	2019-03-07 19:02:51 -05:00
LinuxServer-CI	780b22728e	Bot Updating Templated Files	2019-03-07 18:14:52 -05:00
aptalca	9417e1f9c4	Merge pull request #121 from thelamer/release-4.2 libiconv shifted to community repos- release 4.2	2019-03-07 18:14:02 -05:00
thelamer	5fb3338564	libiconv shifted to community repos	2019-03-07 14:12:48 -08:00
LinuxServer-CI	89322d5956	Bot Updating Package Versions	2019-03-02 00:28:07 +00:00
LinuxServer-CI	267e3ef786	Bot Updating Templated Files	2019-03-01 18:35:41 -05:00
saarg	5de6faf27f	Merge pull request #114 from thelamer/release-4.2 switching back to clone and checkout release-4.2	2019-02-17 22:54:37 +01:00
thelamer	dab37e4ecd	bumping to xmltv 0.5.70 and pulling it from github instead of sourceforge	2019-02-17 12:42:34 -08:00
thelamer	6ab17ce8b7	adding jq package for commit parsing on local build	2019-02-17 12:15:38 -08:00
thelamer	81c71ee54d	switching back to clone and checkout	2019-02-17 10:41:49 -08:00
saarg	a5fe08ef84	Merge pull request #111 from thelamer/release-4.2 Fix for picons Release 4.2	2019-02-16 21:33:35 +01:00
thelamer	65b2f3c3c7	making requested changes to default config	2019-02-16 09:23:06 -08:00
thelamer	7d94cc4b64	forgot schema value	2019-02-15 13:03:14 -08:00
thelamer	e834619ec3	fixing paths for initial config	2019-02-15 12:58:34 -08:00
thelamer	ab115449e7	need to untar picons for htem to be read by the app	2019-02-15 11:45:41 -08:00
thelamer	322e35bb00	adding picons path to config if this is a first boot	2019-02-14 22:19:37 -08:00
j0nnymoe	6dfbb30c0a	Merge pull request #108 from thelamer/release-4.2 adding dynamic readme	2019-02-12 14:34:26 +00:00
thelamer	94b0bc34c7	adding dynamic readme	2019-02-11 21:07:25 -08:00
LinuxServer-CI	2c89a24550	Bot Updating Package Versions	2019-02-11 22:20:05 +00:00
LinuxServer-CI	4d2207db61	Bot Updating Templated Files	2019-02-11 21:42:22 +00:00
aptalca	27ac3525fb	Merge pull request #105 from linuxserver/pipeline-4.2 adding multi arch and pipeline logic, pulling picons from object storage	2019-02-11 16:41:43 -05:00
thelamer	946c4fd8a9	adding multi arch and pipeline logic, pulling picons from object storage	2019-01-17 22:46:45 -08:00
aptalca	bf0911b6f5	Merge pull request #95 from linuxserver/release-4.2_rebase_alpine_3.8 rebase to alpine 3.8 and use buildstage type build	2018-09-12 15:31:15 -04:00
sparklyballs	1a9770d227	rebase to alpine 3.8	2018-09-12 15:46:35 +01:00
sparklyballs	c0a3661442	rebase to alpine 3.8 and use buildstage type build	2018-09-03 12:38:00 +01:00
saarg	ba0a26bfb1	Merge pull request #85 from linuxserver/xmltv_4.2 Add JSON::XS Perl package for grab_tv_huro	2018-04-21 21:00:35 +02:00
tobbenb	ac7dc7b478	Add JSON::XS Perl package for grab_tv_huro	2018-04-21 16:41:11 +02:00
sparklyballs	24d94ed4ad	Merge pull request #79 from linuxserver/release-4.2_use_sourceforge_master_xmltv use sourceforge master rather than mirror for xmltv	2018-03-04 11:26:02 +00:00
sparklyballs	fb45df2646	use sourceforge master rather than mirror for xmltv	2018-03-04 09:39:23 +00:00
sparklyballs	57893d0451	Merge pull request #76 from linuxserver/pngquant Add missing pngquant package	2018-02-23 13:06:20 +00:00
tobbenb	692ee67cf4	Add missing pngquant package	2018-02-22 21:57:43 +01:00
saarg	cacfb82b62	Merge pull request #75 from linuxserver/iconv_4.2 Fix wrong version of Iconv and add build options	2018-02-21 23:41:34 +01:00
tobbenb	e3b56a32cc	Remove old libiconv patch	2018-02-21 23:01:55 +01:00
tobbenb	b487342878	Sparklyfi Dockerfile	2018-02-21 21:57:19 +01:00
tobbenb	0a365513dd	Update README	2018-02-21 21:54:23 +01:00
tobbenb	1075ff6c38	Add build options from CvH	2018-02-21 21:52:32 +01:00
tobbenb	76d27bb36d	Fix iconv runtime crash	2018-02-21 21:50:56 +01:00
sparklyballs	2f197666ac	Merge pull request #66 from linuxserver/release-4.2_deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-04 20:45:39 +00:00
sparklyballs	34b9ebf98f	deprecate cpu_core routine lack of scaling	2018-01-04 11:49:17 +00:00
sparklyballs	e1e7730dcc	Merge pull request #64 from linuxserver/release-4.2_3.7 bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 14:44:51 +00:00
sparklyballs	8269eee493	bump alpine 3.7, fix continuation lines, linting fixes	2017-12-11 12:42:03 +00:00
sparklyballs	4fa1634986	Update README.md	2017-12-09 00:40:09 +00:00
sparklyballs	5b5dee7f67	dot resolves weird github/jenkins syncing commits	2017-12-02 00:08:48 +00:00
aptalca	56c3b9a524	Merge pull request #61 from linuxserver/release-4.2_config_patches increased uniformity across all archs	2017-07-13 20:28:00 -04:00
sparklyballs	a815f66aa3	increased uniformity across all archs	2017-07-13 20:21:04 +01:00
sparklyballs	bcaaad93e4	update of README with badges for new ci	2017-07-11 09:38:21 +01:00
sparklyballs	1cd1bf3fc5	Merge pull request #59 from linuxserver/readme-release Update README with full path for comskip	2017-07-09 12:25:22 +01:00
tobbenb	b210ad4793	Update README with full path for comskip	2017-07-08 12:28:27 +02:00
sparklyballs	4af4d02187	Merge pull request #57 from linuxserver/dockerfile_tidy tidy up Dockerfile and install runtime packages all in one	2017-07-03 11:12:17 +01:00
sparklyballs	c340938778	tidy up Dockerfile and install runtime packages all in one	2017-07-03 05:42:55 +01:00
tobbenb	cce4adf7e4	Move to one branch for all 4.2 releases	2017-07-02 16:40:53 +02:00
saarg	ee18601f12	Merge pull request #55 from linuxserver/stable-4.2.1_alpine3.6 bump to alpine 3.6	2017-05-28 16:12:22 +02:00
sparklyballs	68cc40f86e	bump to alpine 3.6	2017-05-28 02:29:34 +01:00
sparklyballs	9b1f7b3303	Merge pull request #51 from linuxserver/4.2.1 Update to tvheadend 4.2.1 stable	2017-05-01 13:56:26 +01:00
sparklyballs	01af20a3df	Update README.md	2017-05-01 12:37:09 +01:00
tobbenb	f65d09bea2	Cleaning up after sparklys cut and paste double	2017-05-01 13:17:08 +02:00
tobbenb	aab4fb1b35	Update to tvheadend 4.2.1 stable	2017-05-01 12:55:41 +02:00