[PATCH 0/1] Import ability for libx11 to skip itself

[PATCH 0/1] Import ability for libx11 to skip itself

[Anders Darander]

As of commit 2f94ff4fdb66755ba2448794baea19315ff96273 in oe-core, libx11 skips
itself if x11 is not in DISTRO_FEATURES.

Meta-oe has its own copy of libx11.inc, thus the commit has to be applied to
meta-oe also. This patch does the import.

The following changes since commit ceb4a1deaabe81e0acaf9dd179d08736f598203e:

  libxcb 1.7: turn into bbappend (2011-08-15 16:40:14 +0200)

are available in the git repository at:
  git://github.com/darander/meta-oe libx11
  https://github.com/darander/meta-oe/tree/libx11

Anders Darander (1):
  libx11: skip self if x11 not in DISTRO_FEATURES

 meta-oe/recipes-graphics/xorg-lib/libx11.inc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

-- 
1.7.5.4

[PATCH 1/1] libx11: skip self if x11 not in DISTRO_FEATURES

[Anders Darander]

This stops (most) x11 packages leaking into a non-x11 distro by mistake.

Signed-off-by: Phil Blundell <philb@gnu.org>

The patch was imported from the oe-core git server
(git://git.openembedded.org/openembedded-core) as of commit id
2f94ff4fdb66755ba2448794baea19315ff96273.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta-oe/recipes-graphics/xorg-lib/libx11.inc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
index 2aa9700..9f7e990 100644
--- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta-oe/recipes-graphics/xorg-lib/libx11.inc
@@ -45,3 +45,8 @@ do_compile_prepend() {
 		cd ../../
 	) || exit 1
 }
+
+python () {
+       if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
+       	  raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
+}
-- 
1.7.5.4

Re: [PATCH 1/1] libx11: skip self if x11 not in DISTRO_FEATURES

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 16-08-11 09:12, Anders Darander schreef:
> This stops (most) x11 packages leaking into a non-x11 distro by mistake.

Thanks, applied

> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> 
> The patch was imported from the oe-core git server (git://git.openembedded.org/openembedded-core) as of commit id 2f94ff4fdb66755ba2448794baea19315ff96273.
> 
> Signed-off-by: Anders Darander <anders@chargestorm.se> --- meta-oe/recipes-graphics/xorg-lib/libx11.inc |    5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-oe/recipes-graphics/xorg-lib/libx11.inc index 2aa9700..9f7e990 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libx11.inc +++ b/meta-oe/recipes-graphics/xorg-lib/libx11.inc @@ -45,3 +45,8 @@ do_compile_prepend() { cd ../../ ) || exit
> 1 } + +python () { +       if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): +       	  raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") +}

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOSiRqMkyGM64RGpERAnL8AJ0TOx00BOuGrgc8tOTyG7DRC6iKQQCgkemv
jur8/elTsckY0AojZuWEvWc=
=lrZE
-----END PGP SIGNATURE-----

Re: [PATCH 0/1] Import ability for libx11 to skip itself

[Anders Darander]

* Anders Darander <anders@chargestorm.se> [110816 09:13]:
> As of commit 2f94ff4fdb66755ba2448794baea19315ff96273 in oe-core, libx11 skips
> itself if x11 is not in DISTRO_FEATURES.

> Meta-oe has its own copy of libx11.inc, thus the commit has to be applied to
> meta-oe also. This patch does the import.

As is seen in the e-mail, the subject should have included [meta-oe]...

Cheers,
Anders

-- 
Anders Darander
ChargeStorm AB