diff options
| author |   Maxime Roussin-B?langer <maxime.roussinbelanger@gmail.com> | 2020-04-15 12:24:46 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:10:07 +0100 |
| commit | 5978daed3afd84ba0bf584675878e1fdcffc496d (patch) | |
| tree | e62f8cfd0bc55fc47c13f4347f73490d157db6fd /meta/recipes-extended/timezone/tzdata.bb | |
| parent | cec802aa4df2eb7d0e3096f26adc2c349d615265 (diff) | |
| download | poky-5978daed3afd84ba0bf584675878e1fdcffc496d.tar.gz poky-5978daed3afd84ba0bf584675878e1fdcffc496d.tar.bz2 poky-5978daed3afd84ba0bf584675878e1fdcffc496d.zip | |
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`
(From OE-Core rev: 338a67951c375d907b36b87d4115ee5489df722e)
Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/timezone/tzdata.bb')
| -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" |