From e2185e487b437e811725e8bbe489d5194267a56a Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 9 Sep 2019 14:01:30 +0800 Subject: 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 Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- conf/layer.conf | 11 +- .../iscsi-initiator-utils/files/initd.debian | 123 +++++++++++++++++++++ .../iscsi-initiator-utils_%.bbappend | 1 + .../iscsi-initiator-utils_selinux.inc | 1 + .../recipes-support/augeas/augeas_%.bbappend | 1 + .../recipes-containers/lxc/lxc_%.bbappend | 1 + .../augeas/augeas/augeas_%.bbappend | 1 - .../iscsi-initiator-utils/files/initd.debian | 123 --------------------- .../iscsi-initiator-utils_%.bbappend | 1 - .../iscsi-initiator-utils_selinux.inc | 1 - .../recipes-containers/lxc/lxc_%.bbappend | 1 - 11 files changed, 134 insertions(+), 131 deletions(-) create mode 100644 dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian create mode 100644 dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend create mode 100644 dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc create mode 100644 dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend create mode 100644 dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend delete mode 100644 meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend delete mode 100644 networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian delete mode 100644 networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend delete mode 100644 networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc delete mode 100644 virtualization-layer/recipes-containers/lxc/lxc_%.bbappend 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}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -# Let us add layer-specific bbappends which are only applied when that -# layer is included in our configuration -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \ - for layer in BBFILE_COLLECTIONS.split())}" +BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ + openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ + virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ + virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \ + " BBFILE_COLLECTIONS += "selinux" BBFILE_PATTERN_selinux = "^${LAYERDIR}/" diff --git a/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian new file mode 100644 index 0000000..43fb348 --- /dev/null +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian @@ -0,0 +1,123 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: +# Required-Start: +# Required-Stop: +# Default-Start: +# Default-Stop: +# Short-Description: Starts and stops the iSCSI initiator services and logins to default targets +### END INIT INFO +#set -x +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/iscsid +ADM=/usr/sbin/iscsiadm +PIDFILE=/var/run/iscsid.pid + +[ -x "$DAEMON" ] || exit 0 + +if [ ! -d /sys/class/ ]; then + echo "Failure:" "iSCSI requires a mounted sysfs, not started." + exit 1 +fi + +nodestartup_re='s/^node\.conn\[0]\.startup[ ]*=[ ]*//p' + +RETVAL=0 + +start() { + echo "Starting iSCSI initiator service" "iscsid" + modprobe -q iscsi_tcp 2>/dev/null || : + modprobe -q ib_iser 2>/dev/null || : + if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then + INITIATORNAME=$(iscsi-iname) + cat >/etc/iscsi/initiatorname.iscsi </dev/null + if [ "$?" -ne "0" -a "$?" -ne "1" ]; then + status=1 + fi + modprobe -r iscsi_tcp 2>/dev/null + if [ "$?" -ne "0" -a "$?" -ne "1" ]; then + status=1 + fi +} + +restart() { + stop + if [ $RETVAL -ne 0 ]; then + echo "Failure:" "Stopping iSCSI initiator service failed, not starting" + return $RETVAL + fi + start +} + +restarttargets() { + stoptargets + if [ $RETVAL -ne 0 ]; then + echo "Failure:" "Could not stop all targets, try again later" + return $RETVAL + fi + starttargets +} + +status() { + #XXX FIXME: what to do here? + #status iscsid + # list active sessions + echo Current active iSCSI sessions: + $ADM -m session +} + +case "$1" in + start|starttargets|stop|stoptargets|restart|restarttargets|status) + $1 + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac +exit $RETVAL diff --git a/dynamic-layers/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 new file mode 100644 index 0000000..7719d3b --- /dev/null +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} diff --git a/dynamic-layers/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 new file mode 100644 index 0000000..81fe7b7 --- /dev/null +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend new file mode 100644 index 0000000..b01ad25 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend @@ -0,0 +1 @@ +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} diff --git a/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend new file mode 100644 index 0000000..74e22b3 --- /dev/null +++ b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend @@ -0,0 +1 @@ +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} diff --git a/meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend b/meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend deleted file mode 100644 index b01ad25..0000000 --- a/meta-python/recipes-extended/augeas/augeas/augeas_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian b/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian deleted file mode 100644 index 43fb348..0000000 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/files/initd.debian +++ /dev/null @@ -1,123 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: -# Required-Start: -# Required-Stop: -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the iSCSI initiator services and logins to default targets -### END INIT INFO -#set -x -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/iscsid -ADM=/usr/sbin/iscsiadm -PIDFILE=/var/run/iscsid.pid - -[ -x "$DAEMON" ] || exit 0 - -if [ ! -d /sys/class/ ]; then - echo "Failure:" "iSCSI requires a mounted sysfs, not started." - exit 1 -fi - -nodestartup_re='s/^node\.conn\[0]\.startup[ ]*=[ ]*//p' - -RETVAL=0 - -start() { - echo "Starting iSCSI initiator service" "iscsid" - modprobe -q iscsi_tcp 2>/dev/null || : - modprobe -q ib_iser 2>/dev/null || : - if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then - INITIATORNAME=$(iscsi-iname) - cat >/etc/iscsi/initiatorname.iscsi </dev/null - if [ "$?" -ne "0" -a "$?" -ne "1" ]; then - status=1 - fi - modprobe -r iscsi_tcp 2>/dev/null - if [ "$?" -ne "0" -a "$?" -ne "1" ]; then - status=1 - fi -} - -restart() { - stop - if [ $RETVAL -ne 0 ]; then - echo "Failure:" "Stopping iSCSI initiator service failed, not starting" - return $RETVAL - fi - start -} - -restarttargets() { - stoptargets - if [ $RETVAL -ne 0 ]; then - echo "Failure:" "Could not stop all targets, try again later" - return $RETVAL - fi - starttargets -} - -status() { - #XXX FIXME: what to do here? - #status iscsid - # list active sessions - echo Current active iSCSI sessions: - $ADM -m session -} - -case "$1" in - start|starttargets|stop|stoptargets|restart|restarttargets|status) - $1 - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac -exit $RETVAL diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend b/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend deleted file mode 100644 index 7719d3b..0000000 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} diff --git a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc b/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc deleted file mode 100644 index 81fe7b7..0000000 --- a/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend b/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend deleted file mode 100644 index 74e22b3..0000000 --- a/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} -- cgit v1.2.3-54-g00ecf