[meta-gnome][PATCH 1/5] libgnomekbd: Drop using autotools-brokensep

[meta-gnome][PATCH 1/5] libgnomekbd: Drop using autotools-brokensep

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
index 0381192..d148062 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
@@ -6,17 +6,13 @@ SECTION = "x11/gnome/libs"
 
 DEPENDS = "gconf gtk+ glib-2.0 libxklavier"
 
-inherit gnome autotools-brokensep
+inherit gnome
 
 SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd"
 SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256"
 
 do_configure_append() {
-    find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-    find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
 }
 
-
-
-
-
-- 
2.1.0

[meta-gnome][PATCH 2/5] nautilus: Drop using autotools-brokensep

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
index 58a45b1..4be3f08 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
@@ -11,7 +11,7 @@ PR = "r6"
 DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native"
 # optional: tracker
 
-inherit gnome autotools-brokensep
+inherit gnome
 
 SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911"
 SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2"
@@ -26,10 +26,10 @@ EXTRA_OECONF = " --disable-gtk-doc  --disable-update-mimedb "
 export SYSROOT = "${STAGING_DIR_HOST}"
 
 do_configure() {
-    sed -i -e /docs/d Makefile.am
+    sed -i -e /docs/d ${S}/Makefile.am
     autotools_do_configure
     # We need native orbit-idl with target idl files. No way to say it in a clean way:
-    find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
+    find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
 }
 
 RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking"
-- 
2.1.0

[meta-oe][PATCH 3/5] glade3: Enable gnome support in meta-gnome instead of meta-oe

[Khem Raj]

This decouples meta-oe dependencies on meta-gnome, right now
we have to use meta-gnome as dependent layer

ERROR: Nothing PROVIDES 'libbonoboui' (but
meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
DEPENDS on or otherwise requires it)

ERROR: Required build target 'glade3' has no buildable providers.

Missing or unbuildable dependency chain was: ['glade3', 'libbonoboui']

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipe-devtools/glade/glade3_%.bbappend | 1 +
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipe-devtools/glade/glade3_%.bbappend

diff --git a/meta-gnome/recipe-devtools/glade/glade3_%.bbappend b/meta-gnome/recipe-devtools/glade/glade3_%.bbappend
new file mode 100644
index 0000000..3abacfb
--- /dev/null
+++ b/meta-gnome/recipe-devtools/glade/glade3_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG ??= "gnome"
diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
index d0657e4..69d9eae 100644
--- a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
-PACKAGECONFIG ??= "gnome"
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
 
 do_configure_prepend() {
-- 
2.1.0

[meta-networking][PATCH 5/5] meta-networking: Update layer dependency information

[Khem Raj]

since python recipes are now spun out into its own layer
and there are recipes like crda which depend on M2Crypto
python module, of which the recipe is now moved from meta-oe
into meta-python, we need to express this change of layers
otherwise if you are not using meta-python then you end up
with errors e.g.

Nothing PROVIDES 'python-m2crypto-native' (but
meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
DEPENDS on or otherwise requires it).

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/README          | 8 ++++++--
 meta-networking/conf/layer.conf | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta-networking/README b/meta-networking/README
index 339d40e..e1ba27d 100644
--- a/meta-networking/README
+++ b/meta-networking/README
@@ -17,17 +17,21 @@ Dependencies
 
 This layer depends on:
 
-URI: git://github.com/openembedded/oe-core.git
+URI: git://github.com/openembedded/openembedded-core.git
 branch: master
 revision: HEAD
 
 For some recipes, the meta-oe layer is required:
 
-URI: git://github.com/openembedded/meta-oe.git
+URI: git://github.com/openembedded/meta-openembedded.git
 subdirectory: meta-oe
 branch: master
 revision: HEAD
 
+URI: git://github.com/openembedded/meta-openembedded.git
+subdirectory: meta-python
+branch: master
+revision: HEAD
 
 Maintenance
 -----------
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index 39c2ceb..d99d738 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -14,5 +14,7 @@ BBFILE_PRIORITY_networking-layer = "5"
 LAYERVERSION_networking-layer = "1"
 
 LAYERDEPENDS_networking-layer = "core"
+LAYERDEPENDS_networking-layer = "openembedded-layer"
+LAYERDEPENDS_networking-layer = "meta-python"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
-- 
2.1.0

Re: [meta-networking][PATCH 5/5] meta-networking: Update layer dependency information

[Joe MacDonald]

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

Merged, thanks.
-J.

[[oe] [meta-networking][PATCH 5/5] meta-networking: Update layer dependency information] On 14.09.02 (Tue 00:39) Khem Raj wrote:

> since python recipes are now spun out into its own layer
> and there are recipes like crda which depend on M2Crypto
> python module, of which the recipe is now moved from meta-oe
> into meta-python, we need to express this change of layers
> otherwise if you are not using meta-python then you end up
> with errors e.g.
> 
> Nothing PROVIDES 'python-m2crypto-native' (but
> meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
> DEPENDS on or otherwise requires it).
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-networking/README          | 8 ++++++--
>  meta-networking/conf/layer.conf | 2 ++
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-networking/README b/meta-networking/README
> index 339d40e..e1ba27d 100644
> --- a/meta-networking/README
> +++ b/meta-networking/README
> @@ -17,17 +17,21 @@ Dependencies
>  
>  This layer depends on:
>  
> -URI: git://github.com/openembedded/oe-core.git
> +URI: git://github.com/openembedded/openembedded-core.git
>  branch: master
>  revision: HEAD
>  
>  For some recipes, the meta-oe layer is required:
>  
> -URI: git://github.com/openembedded/meta-oe.git
> +URI: git://github.com/openembedded/meta-openembedded.git
>  subdirectory: meta-oe
>  branch: master
>  revision: HEAD
>  
> +URI: git://github.com/openembedded/meta-openembedded.git
> +subdirectory: meta-python
> +branch: master
> +revision: HEAD
>  
>  Maintenance
>  -----------
> diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
> index 39c2ceb..d99d738 100644
> --- a/meta-networking/conf/layer.conf
> +++ b/meta-networking/conf/layer.conf
> @@ -14,5 +14,7 @@ BBFILE_PRIORITY_networking-layer = "5"
>  LAYERVERSION_networking-layer = "1"
>  
>  LAYERDEPENDS_networking-layer = "core"
> +LAYERDEPENDS_networking-layer = "openembedded-layer"
> +LAYERDEPENDS_networking-layer = "meta-python"
>  
>  LICENSE_PATH += "${LAYERDIR}/licenses"
> -- 
> 2.1.0
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]