gentoo resync : 31.03.2018

6 files changed, 26 insertions, 157 deletions

diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 1d1679492a5e..222c78701ca4 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -1,17 +1,13 @@
 AUX OSD_RAW_CMD_patch_2.diff 843 BLAKE2B 5bfe6200c3cb86cf42e359fd345af1b92f01bd88ca28cf467b1aa50998601444270fda755b566d17f89d5a9c412f72a4740c898796bd8de3fb39360d564ff862 SHA512 57688acc06ac9fcde332e3fba9d4048ac962d7c65c3844ff60e1d48956f7fe0f02315859f427cd5e21695ffa0c3d5cbd46ff953d7d1eca4b3e2ab165f6985e71
 AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 BLAKE2B d85a95e36fb0bb1d81035e7e2ed0b43b8e1b1fe0ba5da7ae5c76c285a83ee14ed58cb87f6489d0c5b4597db159368f28159cf1be5ca36ea7e470d5591b2eecd8 SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116
 AUX v4l-dvb-saa716x-4.10-fix-compile.patch 515 BLAKE2B 1617e86b85b411dd807a50353fe97ed6230362b3df79272cdcc2775e0b1a212bd394731e33ccfcfb72d85e4051ec7ee97480d3488ef40c7345628ef50b034d8f SHA512 6dc1b7b24c0d4c4b21f765ee0ac72f8b48f85ec40bb2cb7d51e589d03e64521d026a4e49f4b8c5d0e5b46b4e9332ac3785fa9a682a19dbad94f3b7ac50950653
+AUX v4l-dvb-saa716x-4.14.0-fix-compile.patch 572 BLAKE2B 28e625d28b81899e3cdb9cdbcdf01b7b14d359d3861de0507f0d4d1dcde5dd4d112c7de551a6a58fd2147d6f24c49d3c76272522ed34d49dadf976adde08d83e SHA512 b57bdd443d3ad33c170d4b40f35e7e8c5bb9a9bc7ba5f3defd2deff08c8ec377ffdae14c0d5fc8fab3ea1df10607fe9883904757ea359b4048ce43004645c453
 AUX v4l-dvb-saa716x-4.2-fix-compile.patch 2397 BLAKE2B f6b82c6441524d5045971e3b1fc723074733e95bfac85da03c7cdf39ee327ca0ceda98b1715feaea38d1cb5cf47cb00c996beba9c31251b7778f2e4f9e5fefba SHA512 621852c315437a9f5ada9f5624f08d25154d331cd0a95c479f3835ba9452cd0a17ecf6fdc4b37b5eb7504456ab8565e8d6670be8680e4ea6052b5f5c22c15c12
 AUX v4l-dvb-saa716x-4.5.2-fix-compile.patch 498 BLAKE2B 584300132b72ef0385c3e0b430df36788b57ff49884ee874b610d15fba024a949a81a014883c24b5ac4de77393bbc645715d68b55ec44139d8d5c6006421c9ed SHA512 3c94389b3ffb380a585d51b7e27e3fdf36b053524983fd58531e1d00b1ade2680759822df41363fa2e2ef279570f364178c7f4870c9c6b2fb52124f83eb4afb1
 AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8285409e3d6f4991e3fdd0b7593b5ec816f737ff2d2fc3e457ae6370efa6396e844af314de6986902e0e7de90cf294ff839b31e48 SHA512 64b03e316d938a3830b7aad3c6b6431a9360202470e62d3c696c4203ee98b15595be3bda727468b28a6f43b539931530a408582aab6fe280b8a0200224f2b96f
 AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901
 AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0
-DIST v4l-dvb-saa716x-0.0.1_p20140322.tar.gz 5026505 BLAKE2B e1746e159315487cd2abf96f5f5353872c51a2350e91d27b71c8f89a451db0620f9e4738813bc132534025b2a33ef768a1962f75c3ebab88d269f829be8a3286 SHA512 2b452f6951064f01e88ccf1a2a6f0c9db8ac96779f7b8d56d33cf387d6ed196922edf6b6234d5887ce9dfdb7013772dc874be5ad5893b8e92b23ffe1f2b5d6ea
-DIST v4l-dvb-saa716x-0.0.1_p20141109.tar.gz 5028238 BLAKE2B 1865916ad903613462affae62bb995821e1c02dcbdad9334921a01581d1704446f2fb6a08773ac7e289b6b2feb6eaf8bd45a9cbd3e9528eb193b4ff05d2c4f62 SHA512 a67f095d4878b4ceb3b340e725925385fee33b289e875e9e0903370d0ec909d66893d9ac846d5c7fedf469129a3327e3458668db5a83ff2718c04174e6e07c66
 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343
-EBUILD v4l-dvb-saa716x-0.0.1_p20140322.ebuild 1493 BLAKE2B e5f955cd45000bb685a2e60cc9f0fe0c5482dc29e326f5dba6be915a72ccdd2e90755884ad1dbcafa001b642d5242b675821acf2341bf3dd57a966aa1f436d98 SHA512 85ffe9b460ee5a115d2baa3f476af9efcdaf9b05843cdbff00667388dcbb8e5ebbecb776c2ab84c1d39477e7f3cc0cb2c4311114e268890672c0a057e0e6e493
-EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild 1572 BLAKE2B f0629ebc890456a7c13f4cc73d1219a1d090837c4c7b0619f69d8dcea77bb143094d15764a9d2e4845b366150e285240b109349cef3a74791b61cc26b267a4b6 SHA512 b70c2a9cf61989aa4f20d4791a96709ba10ec6261f488f8a64fbf02377965e8f8eb1b874645c81fefe46aea7a1b59d04717e916fc06fc1e6c1e3661c6c3673e5
-EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild 1752 BLAKE2B e661289b436087979317da2ac440b6d65edfc364aeea687c6702f1f4f34b85d1477b8cecd30ce1efd11117ba55bda0b1b45b2957809808a4cdf091b804ba28e8 SHA512 a2f0cbf26b1ef39347094e58279589cb3a154fd928a0cdd39aca2aa3e0d8783789c814dd9d804613afd4884e48ad273b40150dc9dcd75411abc5710d0a133922
-EBUILD v4l-dvb-saa716x-0.0.1_p20141109.ebuild 1491 BLAKE2B 15bba2f802e6cf9d7adc4d8211295730e32dfdda66e40ff8d458e7e89fd8b00f6da39da94127d2a3f672e6f1aa924899cf1ac80d10fb7ea571ebbd7e737f0b81 SHA512 e6b8afdac784dd57fe95dabd210211233ea6b2967d242fdbd4f16458fba02a2ae9de259bda95479765700dd0013d04c22f5f3fb3a900b7ab5661307c9aa2e817
+EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2107 BLAKE2B 386fa03512228d6ffa69e4e8502d000142b3d007b2e7fce3f7cefb70af206901789e2a1ab177d7587e1c22f48af53b636371074cec91f135a020675a8fedc0d2 SHA512 1bbab03bcf60829ea4b7e4a19ed0455483ae1a61b6a473cc63b239d5207554c26c2f2ec1d416f55f07ef98aaa9c4cbf39ad8e017658b5d6644cbba8d7a8e67d5
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 BLAKE2B 77b4e83a6e100fc1a07c447682defdf0e8860594e5ae344a450ef878f787a12ab3262b8e3dd96aeccc888f4c4f7ac52999c84dc1d23636202b94ec2faeacb88e SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8
 MISC metadata.xml 635 BLAKE2B 2c8d153d32728595bc4e69133e1794d9adec5dd76ca2de200af8b8b799d3e76bebc33df93605ce80ad6a7c079d56ed8f6b39211dd1afef0120094c9c49355a93 SHA512 2f26fc45a2f6ef5f9fe30ea530ef217db685753279c9827124f550e193d8abd0fb675f889744c018fde9a7f41dd39a6352c748605bbda372e4812a0a913a1235
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch
new file mode 100644
index 000000000000..fce2d5177985
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch
@@ -0,0 +1,11 @@
+--- a/linux/drivers/media/common/saa716x/saa716x_pci.c	2018-03-24 11:39:20.777643694 +0100
++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c	2018-03-24 11:41:02.135696671 +0100
+@@ -39,7 +39,7 @@
+ 	for (i = 0; i < SAA716x_MSI_MAX_VECTORS; i++)
+ 		saa716x->msix_entries[i].entry = i;
+ 
+-	ret = pci_enable_msix(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS);
++	ret = pci_enable_msix_range(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS, SAA716x_MSI_MAX_VECTORS);
+ 	if (ret < 0)
+ 		dprintk(SAA716x_ERROR, 1, "MSI-X request failed <%d>", ret);
+ 	if (ret > 0)
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
deleted file mode 100644
index 8626d4e09949..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20140322.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod
-
-DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
-HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
-
-HG_REVISION="196681f1e154"
-HG_REVISION_DATE="20140322"
-
-SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/v4l-dvb-saa716x/archive/${HG_REVISION}.tar.gz
--> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+firmware"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	firmware? ( sys-firmware/tt-s2-6400-firmware )"
-
-S="${WORKDIR}/v4l-dvb-saa716x-${HG_REVISION}"
-
-BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
-
-CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
-
-src_prepare() {
-	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
-	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
-}
-
-src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${ROOT}"/usr/src/linux/
-	linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
deleted file mode 100644
index a316f64eb3fd..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod
-
-DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
-HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
-
-HG_REVISION="d7e98fc59230"
-HG_REVISION_DATE="20141109"
-
-SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
--> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	firmware? ( sys-firmware/tt-s2-6400-firmware )"
-
-S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
-
-BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
-
-CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
-
-src_prepare() {
-	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
-	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
-	kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
-}
-
-src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${ROOT}"/usr/src/linux/
-	linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild
deleted file mode 100644
index 5b7cf5e6c860..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod
-
-DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
-HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
-
-HG_REVISION="d7e98fc59230"
-HG_REVISION_DATE="20141109"
-
-SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
--> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	firmware? ( sys-firmware/tt-s2-6400-firmware )"
-
-S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
-
-BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
-
-CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
-
-src_prepare() {
-	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
-	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
-}
-
-src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${ROOT}"/usr/src/linux/
-	linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
index 71af713e0c72..665d4501782b 100644
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit linux-info linux-mod
 DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
 HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
 
-HG_REVISION="d7e98fc59230"
-HG_REVISION_DATE="20141109"
+HG_REVISION="3b9fce66666a"
+HG_REVISION_DATE="20160322"
 
 SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
 -> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
@@ -26,12 +26,12 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
 
 BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
 
-CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
 
 src_prepare() {
 	default
@@ -41,12 +41,16 @@ src_prepare() {
 	kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
 	kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
 	kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
+	kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch"
+	kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
+	kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
+	kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch"
 }
 
 src_compile() {
 	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
 	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
 	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${ROOT}"/usr/src/linux/
+	addpredict "${EROOT%/}"/usr/src/linux/
 	linux-mod_src_compile
 }