diff options
author | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-24 21:01:32 +0800 |
---|---|---|
committer | Jia Zhang <lans.zhang2008@gmail.com> | 2017-08-24 21:01:32 +0800 |
commit | aa14422754dc70581e2b153bb870c92528dfd2b1 (patch) | |
tree | 7b068ee62aeaf19e59d7bbead90934fde02257a6 | |
parent | 5a24b8f94f3388cece4f697f909c7c66a3bf8d49 (diff) | |
download | meta-secure-core-aa14422754dc70581e2b153bb870c92528dfd2b1.tar.gz |
meta-ids: install packagegroup-ids if the feature ids configured
Signed-off-by: Jia Zhang <lans.zhang2008@gmail.com>
-rw-r--r-- | meta-ids/conf/layer.conf | 5 | ||||
-rw-r--r-- | meta-ids/recipes-base/packagegroups/packagegroup-ids.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/images/secure-core-image.inc | 2 |
3 files changed, 7 insertions, 1 deletions
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" | |||
11 | 11 | ||
12 | BBLAYERS_LAYERINDEX_NAME_ids = "meta-ids" | 12 | BBLAYERS_LAYERINDEX_NAME_ids = "meta-ids" |
13 | 13 | ||
14 | LAYERDEPENDS_ids = "core" | 14 | LAYERDEPENDS_ids = "\ |
15 | core \ | ||
16 | networking-layer \ | ||
17 | " | ||
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 = "\ | |||
8 | inherit packagegroup | 8 | inherit packagegroup |
9 | 9 | ||
10 | RDEPENDS_${PN} += "\ | 10 | RDEPENDS_${PN} += "\ |
11 | snort \ | ||
11 | mtree \ | 12 | mtree \ |
12 | " | 13 | " |
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 += "\ | |||
12 | "packagegroup-ima", "", d)} \ | 12 | "packagegroup-ima", "", d)} \ |
13 | ${@bb.utils.contains("DISTRO_FEATURES", "luks", \ | 13 | ${@bb.utils.contains("DISTRO_FEATURES", "luks", \ |
14 | "packagegroup-luks", "", d)} \ | 14 | "packagegroup-luks", "", d)} \ |
15 | ${@bb.utils.contains("DISTRO_FEATURES", "ids", \ | ||
16 | "packagegroup-ids", "", d)} \ | ||
15 | " | 17 | " |
16 | 18 | ||
17 | IMAGE_INSTALL = "\ | 19 | IMAGE_INSTALL = "\ |