summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-09-05 08:36:02 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-06 10:36:31 +0100
commit1d313f7cda527a2c4631d874e7406ea1a13ab86f (patch)
treec7701ef1eae10886a70491677101f4c319fb69d0
parent5c5f9990a2a5ab3dd6bff0ceeaf571442fd6a82a (diff)
downloadpoky-1d313f7cda527a2c4631d874e7406ea1a13ab86f.tar.gz
opkg-keyrings: 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. (From OE-Core rev: a6e62aae8f83696755828631e5ff67a579a6462f) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb12
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
index 18d6abdded..a20e316a3d 100644
--- a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
+++ b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
@@ -35,14 +35,6 @@ FILES_${PN} = "${datadir}/opkg/keyrings"
35# We need 'opkg-key' to run the postinst script 35# We need 'opkg-key' to run the postinst script
36RDEPENDS_${PN} = "opkg" 36RDEPENDS_${PN} = "opkg"
37 37
38pkg_postinst_${PN} () { 38pkg_postinst_ontarget_${PN} () {
39#! /bin/sh 39opkg-key populate
40set -e
41
42if [ x"$D" = "x" ]; then
43 # On target
44 opkg-key populate
45else
46 exit 1
47fi
48} 40}