On Fri, Jul 18, 2014 at 02:52:02PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <[email protected]>
>
> Signed-off-by: Denys Dmytriyenko <[email protected]>
I'll have to send v2 that preserves filter_out as it's used by
Chase's ASSUME_PROVIDED.
> ---
> meta-arago-distro/conf/distro/arago.conf | 2 +-
> meta-arago-distro/conf/distro/include/arago-prefs.inc | 4 ----
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/meta-arago-distro/conf/distro/arago.conf
> b/meta-arago-distro/conf/distro/arago.conf
> index 2686264..3ac30ce 100644
> --- a/meta-arago-distro/conf/distro/arago.conf
> +++ b/meta-arago-distro/conf/distro/arago.conf
> @@ -49,7 +49,7 @@ TARGET_CPPFLAGS += "-fstack-protector"
> require conf/distro/include/arago-prefs.inc
>
> # Hack out sgx flag for now, as breaking on kernels >= 3.14
> -MACHINE_FEATURES := "${@filter_out('sgx','${MACHINE_FEATURES}',d)}"
> +MACHINE_FEATURES_remove = "sgx"
>
> # Allow branding on top of Arago Distro and Core TI-SDK
> # If ARAGO_BRAND is not set in local.conf, default to core
> diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> index 8261d10..650a71d 100644
> --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> @@ -103,7 +103,3 @@ PREFERRED_PROVIDER_gstreamer =
> "${@base_contains('MACHINE_FEATURES', 'mmip', 'gs
> PREFERRED_PROVIDER_gst-plugins-bad = "${@base_contains('MACHINE_FEATURES',
> 'mmip', 'gst-plugins-bad-mm-accel', 'gst-plugins-bad', d)}"
> PREFERRED_PROVIDER_gst-plugins-base = "${@base_contains('MACHINE_FEATURES',
> 'mmip', 'gst-plugins-base-mm-accel', 'gst-plugins-base', d)}"
> PREFERRED_PROVIDER_gst-plugins-good = "${@base_contains('MACHINE_FEATURES',
> 'mmip', 'gst-plugins-good-mm-accel', 'gst-plugins-good', d)}"
> -
> -def filter_out(f, str, d):
> - from re import match
> - return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
> --
> 2.0.0
>
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
