diff options
| author |   Maxime Roussin-B?langer <maxime.roussinbelanger@gmail.com> | 2020-04-15 12:24:46 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-04-30 11:59:59 -1000 |
| commit | ebf675abd0a077bc9aa71acf62b0477a84e1f536 (patch) | |
| tree | e2ff98012d70dbbaac100c11bb2ddb1a0c9d1f27 /meta/recipes-extended | |
| parent | a2b1af47316a9f5c522db0c9feff1fbe0d39e022 (diff) | |
| download | openembedded-core-contrib-ebf675abd0a077bc9aa71acf62b0477a84e1f536.tar.gz | |
tzdata: remove exit 0 from pkg_postinst
Documentation says that if you exit 0 in a pkg_postinst it will marked as
installed.
If you exit 0, before running postinst-intercepts defer_to_first_boot, the
pkg_postinst_ontarget script will not be present on target.
The "exit 0" in tzdata makes it difficult to have a bbappend with a
pkg_postinst_target step when you have `INSTALL_TIMEZONE_FILE = 0`
Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/timezone/tzdata.bb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index 1e2d9bd1b9..1e2b440fb0 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb @@ -60,12 +60,8 @@ pkg_postinst_${PN} () { if [ -e ${src} ] ; then tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") fi - - if [ -z "${tz}" ] ; then - exit 0 - fi - - if [ ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then + + if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then echo "You have an invalid TIMEZONE setting in ${src}" echo "Your ${etc_lt} has been reset to Universal; enjoy!" tz="Universal" |