From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ye0-f176.google.com ([209.85.213.176]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1U3pZ1-0007Sd-Ar for openembedded-core@lists.openembedded.org; Fri, 08 Feb 2013 16:08:37 +0100 Received: by mail-ye0-f176.google.com with SMTP id m1so862830yen.7 for ; Fri, 08 Feb 2013 06:52:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ExVGGY4ULlCfpLdfwJIKiWzBWdBzrqBH/YkoMR7j8Po=; b=IE9xNofh+cMT0kIt2pz9U8+XSkgNQ5wn2Bm+th1XONzbXU9uXR+XLJwixGUSBbUKk9 sDmfOkmmV3rNZSmfbe48SfdMVbFaXFLCBQLFAes56iL6SbzTh48vAmJ4hoZpzqA5IHTN ByVPmac4N3TW4OnDthqQFTv4jmK81uCEK4mhJ/oBDdkVOQQ+4lkSCzUqE71tRoPBOREU VYRMV4b2TeZ9O6vSDxFZSm2z/TzPjtkwUIbv8RmYZYm9JTTc+S4sJktFhU87mHEg40eO te3eu5Ck3g5b4DLCemZilzjf4xr+tGlH+qA7S9/PoEyetNkpgelj8qY/bQV6P+wpWWU6 HQBQ== X-Received: by 10.236.142.101 with SMTP id h65mr6217520yhj.95.1360335157184; Fri, 08 Feb 2013 06:52:37 -0800 (PST) Received: from localhost.localdomain ([187.23.144.59]) by mx.google.com with ESMTPS id w19sm7136954anh.15.2013.02.08.06.52.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Feb 2013 06:52:36 -0800 (PST) Sender: Otavio Salvador From: Otavio Salvador To: openembedded-core@lists.openembedded.org Date: Fri, 8 Feb 2013 12:52:20 -0200 Message-Id: <1360335140-8690-2-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1360335140-8690-1-git-send-email-otavio@ossystems.com.br> References: <1360335140-8690-1-git-send-email-otavio@ossystems.com.br> Cc: Otavio Salvador Subject: [PATCH v3 2/2] tzdata: Simplify code removing not used cases X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2013 15:08:41 -0000 We shouldn't have an use-case where we'd use 'FUBAR' timezone so instead of adding postinst handling for this use case we handle it at install time and keep the Universal as fallback if user did something wrong. This also ensure the /etc/localtime file is kept as a symbolic link. This will make timezone not available when /usr is in separated partition (and not mounted) however the applications ought to fallback to GMT timezone in this case and when /usr is made availble timezone will work fine. Change-Id: I9a4f05db7a0bdc06511deb5693d1d16569d2fc63 Signed-off-by: Otavio Salvador --- meta/recipes-extended/tzdata/tzdata_2012d.bb | 36 ++++++------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/meta/recipes-extended/tzdata/tzdata_2012d.bb b/meta/recipes-extended/tzdata/tzdata_2012d.bb index 9ec6715..4811072 100644 --- a/meta/recipes-extended/tzdata/tzdata_2012d.bb +++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb @@ -47,48 +47,30 @@ do_install () { cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo # Install default timezone - install -d ${D}${sysconfdir} - echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone - ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime + if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then + install -d ${D}${sysconfdir} + echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone + ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime + else + bberror "DEFAULT_TIMEZONE is set to an invalid value." + exit 1 + fi chown -R root:root ${D} } pkg_postinst_${PN} () { - -# code taken from Gentoo's tzdata ebuild - etc_lt="$D${sysconfdir}/localtime" src="$D${sysconfdir}/timezone" if [ -e ${src} ] ; then tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") - else - tz="FUBAR" fi if [ -z ${tz} ] ; then return 0 fi - if [ ${tz} = "FUBAR" ] ; then - echo "You do not have TIMEZONE set in ${src}." - - if [ ! -e ${etc_lt} ] ; then - # if /etc/localtime is a symlink somewhere, assume they - # know what they're doing and they're managing it themselves - if [ ! -L ${etc_lt} ] ; then - cp -f "$D${datadir}/zoneinfo/Universal" "${etc_lt}" - echo "Setting ${etc_lt} to Universal." - else - echo "Assuming your ${etc_lt} symlink is what you want; skipping update." - fi - else - echo "Skipping auto-update of ${etc_lt}." - fi - return 0 - fi - if [ ! -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!" @@ -97,7 +79,7 @@ pkg_postinst_${PN} () { if [ -L ${etc_lt} ] ; then rm -f "${etc_lt}" fi - cp -f "$D${datadir}/zoneinfo/${tz}" "${etc_lt}" + ln -s "${datadir}/zoneinfo/${tz}" "${etc_lt}" fi } -- 1.7.2.5