summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-09-05 08:32:04 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-09-05 16:25:03 -0400
commita352f4081b907e5db602104cfaed202284ddba6c (patch)
tree6d265b693658aba115b4876d93f1f0fd8c662c0b
parentcdb64ac0d1f8f35e52bef18dd15ea25872fcf645 (diff)
downloadmeta-virtualization-a352f4081b907e5db602104cfaed202284ddba6c.tar.gz
openvswitch: do not use 'exit 1' to postpone to first boot
Since `229f4e9 package.bbclass: add support for pkg_postinst_ontarget()' applied in oe-core, use pkg_postinst_ontarget to run postinst at first boot. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-networking/openvswitch/openvswitch.inc13
1 files changed, 2 insertions, 11 deletions
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 70ac5bc5..8aab739b 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -134,22 +134,13 @@ do_install_append() {
134 cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/ 134 cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/
135} 135}
136 136
137pkg_postinst_${PN}-pki () { 137pkg_postinst_ontarget_${PN}-pki () {
138 # can't do this offline
139 if [ "x$D" != "x" ]; then
140 exit 1
141 fi
142 if test ! -d $D/${datadir}/${PN}/pki; then 138 if test ! -d $D/${datadir}/${PN}/pki; then
143 ovs-pki init --dir=$D/${datadir}/${PN}/pki 139 ovs-pki init --dir=$D/${datadir}/${PN}/pki
144 fi 140 fi
145} 141}
146 142
147pkg_postinst_${PN}-testcontroller () { 143pkg_postinst_ontarget_${PN}-testcontroller () {
148 # can't do this offline
149 if [ "x$D" != "x" ]; then
150 exit 1
151 fi
152
153 if test ! -d $D/${datadir}/${PN}/pki; then 144 if test ! -d $D/${datadir}/${PN}/pki; then
154 ovs-pki init --dir=$D/${datadir}/${PN}/pki 145 ovs-pki init --dir=$D/${datadir}/${PN}/pki
155 fi 146 fi