[PATCH 0/2] Remove some uses of oe_filter_out

[PATCH 0/2] Remove some uses of oe_filter_out

[Joshua Lock]

Replace a couple of uses of oe_filter_out() with removes override syntax,
which is much clearer and better matches modern style and convention.

Furthermore this allows us to drop two uses of immediate expansion.

The following changes since commit a42229df424552955c0ac62da1063461f97f5938:

  openssh: CVE-2016-1907 (2016-01-17 11:32:21 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib joshuagl/filter
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/filter

Joshua Lock (2):
  gcc-runtime: switch to removal override syntax to modify CXXFLAGS
  uclibc: remove a use of immediate expansion and oe_filter_out ()

 meta/recipes-core/uclibc/uclibc.inc       | 2 +-
 meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.5.0

[PATCH 1/2] gcc-runtime: switch to removal override syntax to modify CXXFLAGS

[Joshua Lock]

The use of immediate expansion can cause issues when trying to
override variables, further the removal override syntax is clearer
than oe_filter_out () — switch to using removal override syntax
instead.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index c31072a..075afbd 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -1,6 +1,6 @@
 require gcc-configure-common.inc
 
-CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
+CXXFLAGS_remove = "-fvisibility-inlines-hidden"
 
 EXTRA_OECONF_PATHS = "\
     --with-gxx-include-dir=${includedir}/c++/${BINV} \
-- 
2.5.0

Re: [PATCH 1/2] gcc-runtime: switch to removal override syntax to modify CXXFLAGS

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]


> On Jan 19, 2016, at 2:44 AM, Joshua Lock <joshua.g.lock@intel.com> wrote:
> 
> The use of immediate expansion can cause issues when trying to
> override variables, further the removal override syntax is clearer
> than oe_filter_out () — switch to using removal override syntax
> instead.

LGTM

> 
> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
> ---
> meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> index c31072a..075afbd 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> @@ -1,6 +1,6 @@
> require gcc-configure-common.inc
> 
> -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
> +CXXFLAGS_remove = "-fvisibility-inlines-hidden"
> 
> EXTRA_OECONF_PATHS = "\
>     --with-gxx-include-dir=${includedir}/c++/${BINV} \
> --
> 2.5.0
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

[PATCH 2/2] uclibc: remove a use of immediate expansion and oe_filter_out ()

[Joshua Lock]

The remove overrides syntax is much clearer here, and more closely
matches the preferred style for modern metadata.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
 meta/recipes-core/uclibc/uclibc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 2b34c34..b63158a 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -62,7 +62,7 @@ export V="2"
 # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860
 #
-CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}"
+CFLAGS_remove_arm = "-fno-omit-frame-pointer"
 UCLIBC_EXTRA_CFLAGS  := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"
 
 configmangle = '/^KERNEL_HEADERS/d; \
-- 
2.5.0

Re: [PATCH 2/2] uclibc: remove a use of immediate expansion and oe_filter_out ()

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]


> On Jan 19, 2016, at 2:44 AM, Joshua Lock <joshua.g.lock@intel.com> wrote:
> 
> The remove overrides syntax is much clearer here, and more closely
> matches the preferred style for modern metadata.
> 
> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
> ---
> meta/recipes-core/uclibc/uclibc.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
> index 2b34c34..b63158a 100644
> --- a/meta/recipes-core/uclibc/uclibc.inc
> +++ b/meta/recipes-core/uclibc/uclibc.inc
> @@ -62,7 +62,7 @@ export V="2"
> # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported
> # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860
> #
> -CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}"
> +CFLAGS_remove_arm = "-fno-omit-frame-pointer”

LGTM

> UCLIBC_EXTRA_CFLAGS  := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"
> 
> configmangle = '/^KERNEL_HEADERS/d; \
> --
> 2.5.0
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]