timezone-data: remove tzdata-setup script

now, on tz change, xbmc saves the timezone directly
into /storage/.cache/timezone in format: TIMEZONE=xx/yy

defaults to UTC if not (yet) set (first boot)
This commit is contained in:
Stephan Raue 2014-08-18 18:34:20 +03:00
parent 5e6f7203c6
commit c1386eb0cc
3 changed files with 3 additions and 47 deletions

View File

@ -50,9 +50,6 @@ post_makeinstall_target() {
mkdir -p $INSTALL/etc
ln -sf /var/run/localtime $INSTALL/etc/localtime
mkdir -p $INSTALL/usr/lib/openelec
cp -PR $PKG_DIR/scripts/tzdata-setup $INSTALL/usr/lib/openelec
}
post_install() {

View File

@ -1,41 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
if [ -z "$1" ] ; then
# called from systemd. read timezone if set
if [ -f /storage/.cache/timezone ] ; then
TIMEZONE=`cat /storage/.cache/timezone`
else
if [ -f /storage/.xbmc/userdata/guisettings.xml ] ; then
TIMEZONE=`sed -n -e 's/.*<timezone>\(.*\)<\/timezone>.*/\1/p' /storage/.xbmc/userdata/guisettings.xml`
fi
if [ -z "TIMEZONE" ] ; then
TIMEZONE="UTC"
fi
# save it!
echo "$TIMEZONE" > /storage/.cache/timezone
fi
else
# called from xbmc. save the timezone!
TIMEZONE="$1"
echo "$TIMEZONE" > /storage/.cache/timezone
fi
ln -sf "/usr/share/zoneinfo/$TIMEZONE" /var/run/localtime

View File

@ -2,11 +2,11 @@
Description=Setup Timezone data
Before=xbmc.service
ConditionPathExists=/storage/.xbmc/userdata/guisettings.xml
[Service]
Type=oneshot
ExecStart=/usr/lib/openelec/tzdata-setup
Environment=TIMEZONE=UTC
EnvironmentFile=-/storage/.cache/timezone
ExecStart=/bin/ln -sf /usr/share/zoneinfo/${TIMEZONE} /var/run/localtime
RemainAfterExit=yes
StartLimitInterval=0