From 3e832ce32fdbfbbde374d9f5c8c336b8dd1d284f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 13 May 2019 19:04:00 +0200 Subject: Revert "angstrom-qt5-x11-image.bb: workaround ordering of populate_sdk populate_sdk_qt5" This reverts commit 0af5df0bd71d1714c1b2623fd9f6d57619926278. meta_qt5 got fixed so that it is no longer needed to force an inherit order. This prevents that with every build of the image the sdk is also built. Also apply the same to lxqt-image. Signed-off-by: Max Krummenacher --- recipes-images/images/lxqt-image.bb | 2 +- recipes-images/images/qt5-x11-image.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb index b550f6e..14c6873 100644 --- a/recipes-images/images/lxqt-image.bb +++ b/recipes-images/images/lxqt-image.bb @@ -24,7 +24,7 @@ IMAGE_FEATURES += " \ '', d), d)} \ " -inherit populate_sdk populate_sdk_qt5 +inherit populate_sdk_qt5 IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb index a83da7f..9a2a911 100644 --- a/recipes-images/images/qt5-x11-image.bb +++ b/recipes-images/images/qt5-x11-image.bb @@ -29,7 +29,7 @@ IMAGE_FEATURES += " \ SYSTEMD_DEFAULT_TARGET = "graphical.target" -inherit populate_sdk populate_sdk_qt5 +inherit populate_sdk_qt5 IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" -- cgit v1.2.3