From aa14422754dc70581e2b153bb870c92528dfd2b1 Mon Sep 17 00:00:00 2001 From: Jia Zhang Date: Thu, 24 Aug 2017 21:01:32 +0800 Subject: meta-ids: install packagegroup-ids if the feature ids configured Signed-off-by: Jia Zhang --- meta-ids/conf/layer.conf | 5 ++++- meta-ids/recipes-base/packagegroups/packagegroup-ids.bb | 1 + meta/recipes-core/images/secure-core-image.inc | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-ids/conf/layer.conf b/meta-ids/conf/layer.conf index 1f2e0a6..00f6f1b 100644 --- a/meta-ids/conf/layer.conf +++ b/meta-ids/conf/layer.conf @@ -11,4 +11,7 @@ BBFILE_PRIORITY_ids = "10" BBLAYERS_LAYERINDEX_NAME_ids = "meta-ids" -LAYERDEPENDS_ids = "core" +LAYERDEPENDS_ids = "\ + core \ + networking-layer \ +" diff --git a/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb b/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb index 8f79c7a..8c8503d 100644 --- a/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb +++ b/meta-ids/recipes-base/packagegroups/packagegroup-ids.bb @@ -8,5 +8,6 @@ LIC_FILES_CHKSUM = "\ inherit packagegroup RDEPENDS_${PN} += "\ + snort \ mtree \ " diff --git a/meta/recipes-core/images/secure-core-image.inc b/meta/recipes-core/images/secure-core-image.inc index ca9a586..266d148 100644 --- a/meta/recipes-core/images/secure-core-image.inc +++ b/meta/recipes-core/images/secure-core-image.inc @@ -12,6 +12,8 @@ SECURE_CORE_IMAGE_EXTRA_INSTALL_append += "\ "packagegroup-ima", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "luks", \ "packagegroup-luks", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ids", \ + "packagegroup-ids", "", d)} \ " IMAGE_INSTALL = "\ -- cgit v1.2.3-54-g00ecf