From: mpmc <hello@markclarkstone.co.uk>
Date: Thu, 24 May 2018 17:54:06 +0000 (+0100)
Subject: doozer: workaround for makedev issues on bionic and add bionic i386
X-Git-Tag: v4.2.7~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13576f815d0bb373f354037ce31b3032ab965314;p=thirdparty%2Ftvheadend.git

doozer: workaround for makedev issues on bionic and add bionic i386
---

diff --git a/.doozer.json b/.doozer.json
index d3c7bf827..428236ee0 100644
--- a/.doozer.json
+++ b/.doozer.json
@@ -416,11 +416,46 @@
         "libdvbcsa-dev",
         "python",
         "debhelper",
-        "ccache"
+        "ccache",
+        "sudo",
       ],
       "buildcmd": [
+        "sudo apt-get -y purge makedev; sudo apt-get -y install makedev || true",
+        "sudo rm /var/lib/dpkg/info/makedev.postinst; sudo apt-get install -f",
+        "sudo ./Autobuild.sh -o deps -t ${TARGET}",
         "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"
       ]
     },
+    "bionic-i386": {
+      "buildenv": "docker:i386/ubuntu:bionic",
+      "builddeps": [
+        "cmake",
+        "git",
+        "build-essential",
+        "pkg-config",
+        "gettext",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+        "libpcre2-dev",
+        "libdvbcsa-dev",
+        "python",
+        "debhelper",
+        "ccache",
+        "sudo",
+      ],
+      "buildcmd": [
+        "sudo apt-get -y purge makedev; sudo apt-get -y install makedev || true",
+        "sudo rm /var/lib/dpkg/info/makedev.postinst; sudo apt-get install -f",
+        "sudo ./Autobuild.sh -o deps -t ${TARGET}",
+        "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"
+      ]
+    }
   }
 }
diff --git a/Autobuild/bionic-i386.sh b/Autobuild/bionic-i386.sh
new file mode 100644
index 000000000..12df5691d
--- /dev/null
+++ b/Autobuild/bionic-i386.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686"
+DEBDIST=bionic
+source Autobuild/debian.sh