summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-10-16 13:26:41 -0400
committerScott Murray <scott.murray@konsulko.com>2021-10-16 13:31:05 -0400
commit92e603a99431be43f92cb3216b4acbe7da3c7d33 (patch)
tree7cbb62e446e8a2473153e6bfcc205c26fe25bac2
parentb8b8439dec3fee6f7ecc6c4313f0602426ef549c (diff)
Add missing pkgconfig inheritsnext
Upstream poky no longer automatically pulls in several build tools by default to cut down the dependency graph and speed up builds. This means pkgconfig needs to be explicitly inherited in recipes that require it, where previously they managed to work without doing so. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I0fb834c12853b2327a7f1237028aaea96b955123
-rw-r--r--meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb2
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.bb4
-rw-r--r--meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb2
-rw-r--r--meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb2
-rw-r--r--meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb2
-rw-r--r--meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb2
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager.inc2
7 files changed, 8 insertions, 8 deletions
diff --git a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
index afbbc09..e476304 100644
--- a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
+++ b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb
@@ -3,7 +3,7 @@ require recipes-devtools/libafb-helpers/libafb-helpers_git.inc
DEPENDS:append = " qtwebsockets"
RDEPENDS:${PN}:append = " af-binder"
-inherit cmake_qt5
+inherit cmake_qt5 pkgconfig
EXTRA_OECMAKE:append = " -DAFB_HELPERS_QT=ON -DAFB_HELPERS=OFF"
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.bb b/meta-app-framework/recipes-core/af-main/af-main_git.bb
index 1b3ec9b..8246569 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.bb
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.bb
@@ -7,8 +7,8 @@ require af-main_${PV}.inc
SECTION = "base"
-DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder sed m4"
-DEPENDS:class-native = "openssl-native libxml2-native xmlsec1-native libzip-native json-c-native"
+DEPENDS = "m4-native openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder sed m4"
+DEPENDS:class-native = "m4-native openssl-native libxml2-native xmlsec1-native libzip-native json-c-native"
RDEPENDS:${PN}:class-target += "af-binder-tools nss-localuser cynagoauth"
inherit cmake pkgconfig useradd systemd
diff --git a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
index 9ca32fd..7c2dfb4 100644
--- a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
+++ b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb
@@ -1,6 +1,6 @@
require libafb-helpers_git.inc
-inherit cmake
+inherit cmake pkgconfig
RDEPENDS:${PN}:append = " af-binder"
diff --git a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
index 74fe081..160e0d9 100644
--- a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
+++ b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/git"
DEPENDS:append = " af-binder libafb-helpers lua"
RDEPENDS:${PN}:append = " af-binder lua"
-inherit cmake
+inherit cmake pkgconfig
ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
index d76181c..6165459 100644
--- a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
+++ b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
DEPENDS = "json-c libmicrohttpd openssl cynagora"
-inherit cmake
+inherit cmake pkgconfig
EXTRA_OECMAKE += " \
-DDEFAULTHOSTS=:7777 \
diff --git a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
index 2ed1b15..aad69d6 100644
--- a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
+++ b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
DEPENDS = "systemd libcap"
-inherit cmake
+inherit cmake pkgconfig
EXTRA_OECMAKE += " \
-DSYSTEMD_UNIT_DIR=${systemd_system_unitdir} \
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager.inc b/meta-app-framework/recipes-security/security-manager/security-manager.inc
index c6bc123..f998249 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager.inc
+++ b/meta-app-framework/recipes-security/security-manager/security-manager.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Security manager and utilities"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327;beginline=3"
-inherit cmake
+inherit cmake pkgconfig
B = "${S}"