From 41897ebf7401ce4bb168cdb317e6578bc0f2a1df Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 8 May 2019 22:58:47 +0300 Subject: dvb-apps: Remove dvb-fe-xc5000c-4.1.30.7.fw Shipping firmware for some specific device in dvb-apps is wrong, even more so when the same binary is already in linux-firmware. The firmware was also not LICENSE = "GPLv2" as the recipe claimed. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb | 8 +------- .../dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw | Bin 16497 -> 0 bytes 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index ff9eabbb50..2aa7ccebf1 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35" SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \ - file://dvb-fe-xc5000c-4.1.30.7.fw \ file://dvb-scan-table \ file://0001-Fix-generate-keynames.patch \ file://0002-Fix-compiler-warning-flags.patch \ @@ -31,10 +30,6 @@ do_install() { install -d ${D}/${docdir}/dvb-apps/scan install -d ${D}/${docdir}/dvb-apps/szap chmod a+rx ${D}/${libdir}/*.so* - if [ "${DVB_WINTV_TUNER}" = "true" ]; then - install -d ${D}/lib/firmware - install -m 0644 ${WORKDIR}/*.fw ${D}/lib/firmware/ - fi cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ cp -R --no-dereference --preserve=mode,links ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb @@ -64,7 +59,7 @@ RDEPENDS_dvbnet =+ "libdvbapi" RCONFLICTS_dvb-evtest = "evtest" -FILES_${PN} = "${bindir} ${datadir}/dvb lib/firmware" +FILES_${PN} = "${bindir} ${datadir}/dvb" FILES_${PN}-doc = "" FILES_${PN}-dev = "${includedir}" FILES_dvb-evtest = "${bindir}/evtest" @@ -103,5 +98,4 @@ python populate_packages_prepend () { INSANE_SKIP_${PN} = "ldflags" INSANE_SKIP_${PN}-dev = "ldflags" -DVB_WINTV_TUNER = "true" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw b/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw deleted file mode 100644 index 5786ffa441..0000000000 Binary files a/meta-multimedia/recipes-multimedia/dvb-apps/files/dvb-fe-xc5000c-4.1.30.7.fw and /dev/null differ -- cgit 1.2.3-korg