From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Mon, 18 Sep 2017 18:21:37 +0000 (+0100)
Subject: doozer: 'fix' dirty build issue (4).
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=049cba99157da175163f9c6a6fa8a686f3fafa54;p=thirdparty%2Ftvheadend.git

doozer: 'fix' dirty build issue (4).

from (but modified): https://stackoverflow.com/questions/24533390/git-reset-files-with-typechange-status#27461055
---

diff --git a/.doozer.json b/.doozer.json
index 56fba4ad3..4962eef20 100644
--- a/.doozer.json
+++ b/.doozer.json
@@ -24,6 +24,7 @@
         "libx11-xcb-dev"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -50,6 +51,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -76,6 +78,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -101,6 +104,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -128,6 +132,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -155,6 +160,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -182,6 +188,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -209,6 +216,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -235,6 +243,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -261,6 +270,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}",
         "support/bintray.py publish filelist.txt"
       ]
@@ -288,6 +298,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "./configure --disable-dvbscan && make -C rpm build-doozer",
         "support/bintray.py publish filelist.txt"
       ]
@@ -315,6 +326,7 @@
         "ccache"
       ],
       "buildcmd": [
+        "git status | grep -e 'typechange' -e 'modified' | awk '{print $2}' | xargs git checkout",
         "./configure --disable-dvbscan && make -C rpm build-doozer",
         "support/bintray.py publish filelist.txt"
       ]