diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-09 14:01:30 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2019-09-09 12:30:46 -0400 |
commit | e2185e487b437e811725e8bbe489d5194267a56a (patch) | |
tree | a0687d637abd9395378e1a69622e9ed8e6da20e6 | |
parent | 10d4a50fc5b4d6da9dc74247ad5ab5ca0eda68bb (diff) | |
download | meta-selinux-e2185e487b437e811725e8bbe489d5194267a56a.tar.gz |
conf/layer.conf: use BBFILES_DYNAMIC for dynamic layers
The previous code add all BBFILE_COLLECTIONS/recipes*/*/*.bbappend to BBFILES,
which causes the parsing very slow when there are many layers, e.g., I have 87
layers:
* Before:
$ rm -fr tmp-glibc/ cache; time bitbake -p
real 0m45.173s
user 0m0.560s
sys 0m0.060s
* After:
$ rm -fr tmp-glibc/ cache; time bitbake -p
real 0m25.542s
user 0m0.572s
sys 0m0.040s
It wasted 20s which wasn't worth (The host has 128 threads, it should cost more
time on less power host), use BBFILES_DYNAMIC can fix the problem.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r-- | conf/layer.conf | 11 | ||||
-rw-r--r-- | dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian (renamed from networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian) | 0 | ||||
-rw-r--r-- | dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend (renamed from networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend) | 0 | ||||
-rw-r--r-- | dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc (renamed from networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc) | 0 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend (renamed from meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend) | 0 | ||||
-rw-r--r-- | dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend (renamed from virtualization-layer/recipes-containers/lxc/lxc_%.bbappend) | 0 |
6 files changed, 7 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 9dd34b1..89b9468 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -5,10 +5,13 @@ BBPATH .= ":${LAYERDIR}" | |||
5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | # Let us add layer-specific bbappends which are only applied when that | 8 | BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ |
9 | # layer is included in our configuration | 9 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ |
10 | BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \ | 10 | networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ |
11 | for layer in BBFILE_COLLECTIONS.split())}" | 11 | networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ |
12 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ | ||
13 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \ | ||
14 | " | ||
12 | 15 | ||
13 | BBFILE_COLLECTIONS += "selinux" | 16 | BBFILE_COLLECTIONS += "selinux" |
14 | BBFILE_PATTERN_selinux = "^${LAYERDIR}/" | 17 | BBFILE_PATTERN_selinux = "^${LAYERDIR}/" |
diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian index 43fb348..43fb348 100644 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian | |||
diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend index 7719d3b..7719d3b 100644 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend | |||
diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc index 81fe7b7..81fe7b7 100644 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc | |||
diff --git a/meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend index b01ad25..b01ad25 100644 --- a/meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend | |||
diff --git a/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend index 74e22b3..74e22b3 100644 --- a/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend +++ b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend | |||