From 603ae6eb487489e65da69c68e532cb767ccc1fc2 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 22 Dec 2016 16:13:56 +1300 Subject: meta: use require instead of include when file should exist If the file is expected to exist, then we should always be using require so that if it doesn't we get an error rather than some other more obscure failure later on. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.10.2.bb | 3 ++- meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb | 2 +- meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 2 +- 15 files changed, 16 insertions(+), 15 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.2.bb index a3f3d04dd8..ed51a4fdaf 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-libav.inc +require gstreamer1.0-libav.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index f4604a34c8..b6c0d7d72e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-libav.inc +require gstreamer1.0-libav.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb index 74358a7245..3b4580f8a3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-omx.inc +require gstreamer1.0-omx.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb index 9705543529..49593b6b88 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-omx.inc +require gstreamer1.0-omx.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.2.bb index e257a589ad..73cf591f98 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-plugins-bad.inc +require gstreamer1.0-plugins-bad.inc LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb index 609ea0b25e..79ebcacf6d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-plugins-bad.inc +require gstreamer1.0-plugins-bad.inc LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.10.2.bb index 1b0fdacffc..b756ed91e2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-plugins-base.inc +require gstreamer1.0-plugins-base.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb index bdd4cb874a..4d63827c28 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-plugins-base.inc +require gstreamer1.0-plugins-base.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.2.bb index 82635dba10..18262d0bfd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-plugins-good.inc +require gstreamer1.0-plugins-good.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb index 120629c956..04a313de5a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-plugins-good.inc +require gstreamer1.0-plugins-good.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.10.2.bb index c07d3ff37d..95e3a2f309 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0-plugins-ugly.inc +require gstreamer1.0-plugins-ugly.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb index 61cdbe8380..5b792343ba 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0-plugins-ugly.inc +require gstreamer1.0-plugins-ugly.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.10.2.bb index 1c23fa074a..85b4d0af4b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.10.2.bb @@ -1,4 +1,5 @@ -include gstreamer1.0-rtsp-server.inc +require gstreamer1.0-rtsp-server.inc + SRC_URI[md5sum] = "3ed8878f076e84c59b3ed5bd38ab31ed" SRC_URI[sha256sum] = "822dd6f754fea2bbf3369a7c388372f49b74668fb57943c1888675e544b07235" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb index 05ef34d2c7..cc5c57f70b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb @@ -1,4 +1,4 @@ -include gstreamer1.0.inc +require gstreamer1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb index 6112f2a892..39f38a1cb7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include gstreamer1.0.inc +require gstreamer1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" -- cgit 1.2.3-korg