From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 5 Sep 2018 12:36:02 +0000 (-0400)
Subject: opkg-keyrings: do not use 'exit 1' to postpone to first boot
X-Git-Tag: uninative-2.3~422
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a6e62aae8f83696755828631e5ff67a579a6462f;p=openembedded-core.git

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.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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"
 # We need 'opkg-key' to run the postinst script
 RDEPENDS_${PN} = "opkg"
 
-pkg_postinst_${PN} () {
-#! /bin/sh
-set -e
-
-if [ x"$D" = "x" ]; then
-    # On target
-    opkg-key populate
-else
-    exit 1
-fi
+pkg_postinst_ontarget_${PN} () {
+opkg-key populate
 }