diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-04-13 11:06:40 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-04-13 11:06:40 +0000 |
| commit | 3d3716802d5fcd629a433f97e74894f9dfdd63d5 (patch) | |
| tree | d1d403280c0d1faab75338b27681981cb7931911 /sys-libs | |
| parent | small fix (diff) | |
| download | historical-3d3716802d5fcd629a433f97e74894f9dfdd63d5.tar.gz historical-3d3716802d5fcd629a433f97e74894f9dfdd63d5.tar.bz2 historical-3d3716802d5fcd629a433f97e74894f9dfdd63d5.zip | |
try to fix /etc/localtime symlink issue
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.2.5-r2.ebuild | 17 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.2.5-r3.ebuild | 15 |
3 files changed, 31 insertions, 8 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 768e5ed79799..05a7795956a9 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.4 2002/04/03 21:20:29 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.5 2002/04/13 11:06:40 azarah Exp $ + + 13 Apr 2002; M.Schlemmer <azarah@gentoo.org> glibc-2.2.5-r2.ebuild : + + Try to fix the pkg_postinst() and /etc/localtime issue sanely. It just + newking my /etc/localtime with a symlink was starting to get irritating. *glibc-2.2.5-r3 (03 Apr 2002) diff --git a/sys-libs/glibc/glibc-2.2.5-r2.ebuild b/sys-libs/glibc/glibc-2.2.5-r2.ebuild index 4e9946d03334..9936ced16c9f 100644 --- a/sys-libs/glibc/glibc-2.2.5-r2.ebuild +++ b/sys-libs/glibc/glibc-2.2.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r2.ebuild,v 1.6 2002/03/18 20:18:32 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r2.ebuild,v 1.7 2002/04/13 11:06:40 azarah Exp $ S=${WORKDIR}/${P} DESCRIPTION="GNU libc6 (also called glibc2) C library" @@ -129,10 +129,19 @@ src_install() { pkg_postinst() { - if [ ! -L ${ROOT}etc/localtime ] + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] then echo "Please remember to set your timezone using the zic command." rm -f ${ROOT}/etc/localtime - ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime - fi + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi } diff --git a/sys-libs/glibc/glibc-2.2.5-r3.ebuild b/sys-libs/glibc/glibc-2.2.5-r3.ebuild index 264d0a84da26..f0f7e821ead7 100644 --- a/sys-libs/glibc/glibc-2.2.5-r3.ebuild +++ b/sys-libs/glibc/glibc-2.2.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r3.ebuild,v 1.1 2002/04/03 21:20:29 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r3.ebuild,v 1.2 2002/04/13 11:06:40 azarah Exp $ S=${WORKDIR}/${P} DESCRIPTION="GNU libc6 (also called glibc2) C library" @@ -132,10 +132,19 @@ src_install() { pkg_postinst() { - if [ ! -L ${ROOT}etc/localtime ] + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] then echo "Please remember to set your timezone using the zic command." rm -f ${ROOT}/etc/localtime ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime - fi + fi } |