From 5e3c8b3e135400f51c4f0b1f9f8508d7a98c470e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 25 Sep 2014 16:21:35 +0200 Subject: [PATCH] meta-digi-dey: move NETWORK_MANAGER variable to x11-sato bbappend NETWORK_MANAGER is a packagegroup-core-x11-sato recipe variable, so override it in a bbappend instead of at a distro level. At the same time remove a useless WEB variable from the image recipe. WEB is a packagegroup-core-x11-sato local variable as well, and overriding it in another recipe does not have any effect, so just remove it. https://jira.digi.com/browse/DEL-858 Signed-off-by: Javier Viguera --- meta-digi-dey/conf/distro/dey-gui.conf | 3 --- meta-digi-dey/recipes-core/images/dey-image-graphical.bb | 2 -- .../packagegroups/packagegroup-core-x11-sato.bbappend | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend diff --git a/meta-digi-dey/conf/distro/dey-gui.conf b/meta-digi-dey/conf/distro/dey-gui.conf index fed34e037..4ad19d5ee 100644 --- a/meta-digi-dey/conf/distro/dey-gui.conf +++ b/meta-digi-dey/conf/distro/dey-gui.conf @@ -1,6 +1,3 @@ include dey.conf DISTRO_FEATURES += "x11" - -# Disable network manager (included in packagegroup-core-x11-sato) -NETWORK_MANAGER = "" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb index c2c0417bd..5c4fdbcbf 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb @@ -18,8 +18,6 @@ include dey-image-minimal.bb REQUIRED_DISTRO_FEATURES = "x11" -WEB = "web-webkit" - SOC_IMAGE_INSTALL = "" SOC_IMAGE_INSTALL_mx5 = "amd-gpu-x11-bin-mx51" SOC_IMAGE_INSTALL_mx6 = "gpu-viv-bin-mx6q gpu-viv-g2d" diff --git a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend new file mode 100644 index 000000000..171a8fee6 --- /dev/null +++ b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend @@ -0,0 +1,4 @@ +# Copyright (C) 2014 Digi International + +# Disable network manager +NETWORK_MANAGER = ""