diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/include/maintainers.inc | 1 | ||||
| -rw-r--r-- | conf/layer.conf | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index 01136aab..d6f2306a 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc | |||
| @@ -54,4 +54,3 @@ RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mitta | |||
| 54 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" | 54 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" |
| 55 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" | 55 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" |
| 56 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" | 56 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" |
| 57 | RECIPE_MAINTAINER:pn-zlib-intel = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
diff --git a/conf/layer.conf b/conf/layer.conf index fb073b0d..b81d891c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
| @@ -32,10 +32,6 @@ BBFILES_DYNAMIC += " \ | |||
| 32 | 32 | ||
| 33 | require ${LAYERDIR}/conf/include/maintainers.inc | 33 | require ${LAYERDIR}/conf/include/maintainers.inc |
| 34 | 34 | ||
| 35 | PREFERRED_PROVIDER_zlib ?= "zlib" | ||
| 36 | PREFERRED_PROVIDER_zlib-native ?= "zlib-native" | ||
| 37 | PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" | ||
| 38 | |||
| 39 | # Use the libva from OE-Core when layer is included but no MACHINE | 35 | # Use the libva from OE-Core when layer is included but no MACHINE |
| 40 | # from meta-intel is being used. | 36 | # from meta-intel is being used. |
| 41 | PREFERRED_PROVIDER_libva ?= "libva" | 37 | PREFERRED_PROVIDER_libva ?= "libva" |