diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 16:05:31 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-22 16:05:31 +0000 |
commit | 56c3ce96a2a68669892777bb4a8dea4e942106f7 (patch) | |
tree | e25f6b348b9e52e65ab9fc5a576d5566c1f31865 /recipes-core | |
parent | d10d310cbebe393a7aa8ee5c6816a256dd1a54b8 (diff) | |
download | meta-virtualization-56c3ce96a2a68669892777bb4a8dea4e942106f7.tar.gz |
initscripts: make DISTRO_FEATURE safe
The initscripts bbappend should only activate when virtualization is
in distro features.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/initscripts/initscripts_1.%.bbappend | 16 | ||||
-rw-r--r-- | recipes-core/initscripts/initscripts_virtualization.inc | 16 |
2 files changed, 17 insertions, 15 deletions
diff --git a/recipes-core/initscripts/initscripts_1.%.bbappend b/recipes-core/initscripts/initscripts_1.%.bbappend index 0600ab2a..96b4ac57 100644 --- a/recipes-core/initscripts/initscripts_1.%.bbappend +++ b/recipes-core/initscripts/initscripts_1.%.bbappend | |||
@@ -1,16 +1,2 @@ | |||
1 | do_install_append() { | 1 | require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} |
2 | 2 | ||
3 | echo >> ${D}${sysconfdir}/init.d/functions | ||
4 | echo success \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
5 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
6 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
7 | echo failure \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
8 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
9 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
10 | echo warning \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
11 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
12 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
13 | echo begin \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
14 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
15 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
16 | } | ||
diff --git a/recipes-core/initscripts/initscripts_virtualization.inc b/recipes-core/initscripts/initscripts_virtualization.inc new file mode 100644 index 00000000..0600ab2a --- /dev/null +++ b/recipes-core/initscripts/initscripts_virtualization.inc | |||
@@ -0,0 +1,16 @@ | |||
1 | do_install_append() { | ||
2 | |||
3 | echo >> ${D}${sysconfdir}/init.d/functions | ||
4 | echo success \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
5 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
6 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
7 | echo failure \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
8 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
9 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
10 | echo warning \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
11 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
12 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
13 | echo begin \(\) \{ >> ${D}${sysconfdir}/init.d/functions | ||
14 | echo \ \ \ \ echo \$* >> ${D}${sysconfdir}/init.d/functions | ||
15 | echo \} >> ${D}${sysconfdir}/init.d/functions | ||
16 | } | ||