summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Roussin-B?langer <maxime.roussinbelanger@gmail.com>2020-04-15 12:24:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:07 +0100
commit5978daed3afd84ba0bf584675878e1fdcffc496d (patch)
treee62f8cfd0bc55fc47c13f4347f73490d157db6fd
parentcec802aa4df2eb7d0e3096f26adc2c349d615265 (diff)
downloadpoky-5978daed3afd84ba0bf584675878e1fdcffc496d.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` (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>
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb8
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} () {
60 if [ -e ${src} ] ; then 60 if [ -e ${src} ] ; then
61 tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") 61 tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
62 fi 62 fi
63 63
64 if [ -z "${tz}" ] ; then 64 if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then
65 exit 0
66 fi
67
68 if [ ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then
69 echo "You have an invalid TIMEZONE setting in ${src}" 65 echo "You have an invalid TIMEZONE setting in ${src}"
70 echo "Your ${etc_lt} has been reset to Universal; enjoy!" 66 echo "Your ${etc_lt} has been reset to Universal; enjoy!"
71 tz="Universal" 67 tz="Universal"