From 2a88d4df8eb35b67cf0bdb2573abc7fbb5a7d108 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 2 Aug 2012 17:49:01 +0100 Subject: mesa: Use 'require' instead of 'include' These include files are really required, not optional. (From OE-Core rev: 1aa6c4a083e406de0119f92e9654068d6cc2e4de) Signed-off-by: Damien Lespiau Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb | 6 +++--- meta/recipes-graphics/mesa/mesa-dri_git.bb | 6 +++--- meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb | 6 +++--- meta/recipes-graphics/mesa/mesa-xlib_git.bb | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb index 219e55517c..bd62c98ce4 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb @@ -1,4 +1,4 @@ -include mesa-common.inc -include mesa-${PV}.inc -include mesa-dri.inc +require mesa-common.inc +require mesa-${PV}.inc +require mesa-dri.inc PR = "${INC_PR}.1" diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index a0e19459f1..4b36f20beb 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb @@ -1,6 +1,6 @@ -include mesa-common.inc -include mesa-git.inc -include mesa-dri.inc +require mesa-common.inc +require mesa-git.inc +require mesa-dri.inc # this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default DEFAULT_PREFERENCE = "-2" diff --git a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb index 7547b22cc7..a89640e444 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_8.0.4.bb @@ -1,5 +1,5 @@ -include mesa-common.inc -include mesa-${PV}.inc -include mesa-xlib.inc +require mesa-common.inc +require mesa-${PV}.inc +require mesa-xlib.inc PR = "${INC_PR}.2" diff --git a/meta/recipes-graphics/mesa/mesa-xlib_git.bb b/meta/recipes-graphics/mesa/mesa-xlib_git.bb index be2f5d3cfe..66471201f6 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_git.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_git.bb @@ -1,6 +1,6 @@ -include mesa-common.inc -include mesa-git.inc -include mesa-xlib.inc +require mesa-common.inc +require mesa-git.inc +require mesa-xlib.inc # this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default DEFAULT_PREFERENCE = "-2" -- cgit v1.2.3-54-g00ecf