From: Jaroslav Kysela Date: Fri, 20 Apr 2018 13:12:10 +0000 (+0200) Subject: doozer: use docker, add bionic-amd64, fedora27, fedora28 targets, remove fedora24... X-Git-Tag: v4.2.7~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66f0b9580f257427dda5ee77dfc06c42ca7cdcc1;p=thirdparty%2Ftvheadend.git doozer: use docker, add bionic-amd64, fedora27, fedora28 targets, remove fedora24 target --- diff --git a/.doozer.json b/.doozer.json index b2bf81575..d3c7bf827 100644 --- a/.doozer.json +++ b/.doozer.json @@ -310,9 +310,10 @@ "support/bintray.py publish filelist.txt" ] }, - "fedora24-x86_64": { - "buildenv": "fedora24-x86_64", + "fedora27-x86_64": { + "buildenv": "docker:fedora:27", "builddeps": [ + ["https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-27.noarch.rpm"], "gcc-c++", "which", "rpm-build", @@ -325,9 +326,40 @@ "avahi-devel", "openssl-devel", "zlib-devel", + "libdvbcsa-devel", "wget", "bzip2", "uriparser-devel", + "pcre2-devel", + "python", + "ccache" + ], + "buildcmd": [ + "./configure --disable-dvbscan && make -C rpm build-doozer", + "support/bintray.py publish filelist.txt" + ] + }, + "fedora28-x86_64": { + "buildenv": "docker:fedora:28", + "builddeps": [ + ["https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm"], + "gcc-c++", + "which", + "rpm-build", + "rpmdevtools", + "git", + "make", + "cmake", + "gettext-devel", + "dbus-devel", + "avahi-devel", + "openssl-devel", + "zlib-devel", + "libdvbcsa-devel", + "wget", + "bzip2", + "uriparser-devel", + "pcre2-devel", "python", "ccache" ], @@ -337,8 +369,9 @@ ] }, "centos7-x86_64": { - "buildenv": "centos7-x86_64", + "buildenv": "docker:centos:7", "builddeps": [ + ["https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm"], "gcc-c++", "which", "rpm-build", @@ -351,9 +384,11 @@ "avahi-devel", "openssl-devel", "zlib-devel", + "libdvbcsa-devel", "wget", "bzip2", "uriparser-devel", + "pcre2-devel", "python", "ccache" ], @@ -361,6 +396,31 @@ "./configure --disable-dvbscan && make -C rpm build-doozer", "support/bintray.py publish filelist.txt" ] - } + }, + "bionic-amd64": { + "buildenv": "docker: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" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}", + ] + }, } }