media-tv/v4l-dvb-saa716x: fix bugs
authorMartin Dummer <martin.dummer@gmx.net>
Mon, 25 Nov 2019 21:08:16 +0000 (22:08 +0100)
committerJoonas Niilola <juippis@gentoo.org>
Wed, 4 Dec 2019 14:48:05 +0000 (16:48 +0200)
make missing kernel configurations in CONFIG_CHECK fatal
adapt BUILD_PARAMS for kernel 5.1 and up
no version bump for current ebuild

Closes: https://bugs.gentoo.org/690372
Closes: https://bugs.gentoo.org/696292
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild

index 66babc6091c08464d5b69f102c6b24b2e246b819..4688975810c64a2716eca392fcf058f319e9d94b 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,12 +26,13 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
 
 BUILD_TARGETS="modules"
-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)"
+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
@@ -52,9 +53,9 @@ src_prepare() {
 }
 
 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 "${EROOT%/}"/usr/src/linux/
+       kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M"
+       BUILD_PARAMS+="=${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 "${EROOT}"/usr/src/linux/
        linux-mod_src_compile
 }