[oe-commits] [openembedded-core] 09/10: opkg-keyrings: do not use 'exit 1' to postpone to first boot

git at git.openembedded.org git at git.openembedded.org
Thu Sep 6 09:37:03 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a6e62aae8f83696755828631e5ff67a579a6462f
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Wed Sep 5 08:36:02 2018 -0400

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb | 12 ++----------
 1 file 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 18d6abd..a20e316 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
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list