This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-8-g73f79bb
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Feb 2014 11:48:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-8-g73f79bb
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 73f79bb7e7e518a912df938613da6268316c17ed (commit)
from 8da79b60ae2242b07a760c073ff79612d8b5864e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=73f79bb7e7e518a912df938613da6268316c17ed
commit 73f79bb7e7e518a912df938613da6268316c17ed
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat Jan 25 00:16:49 2014 -0500
tzselect: stop requiring ksh
This script works fine under bash (which we already require), so drop
the legacy ksh munging.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/ChangeLog b/ChangeLog
index c012167..6aaca42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-02-08 Mike Frysinger <vapier@gentoo.org>
+ * timezone/Makefile: Delete $(have-ksh) check.
+ ($(objpfx)tzselect): Change $(KSH) to $(BASH).
+ * timezone/tzselect.ksh: Add +x mode bits.
+
+2014-02-08 Mike Frysinger <vapier@gentoo.org>
+
* sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define.
(ANON_INODE_FS_MAGIC): Likewise.
(BDEVFS_MAGIC): Likewise.
diff --git a/timezone/Makefile b/timezone/Makefile
index f5fb424..6c640fd 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -44,10 +44,8 @@ include ../Makeconfig # Get objpfx defined so we can use it below.
CPPFLAGS-zic = -DNOT_IN_libc
-ifeq ($(have-ksh),yes)
install-bin-script = tzselect
generated += tzselect
-endif
include ../Rules
@@ -113,7 +111,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- sed -e 's|/bin/bash|$(KSH)|g' \
+ sed -e 's|/bin/bash|$(BASH)|' \
-e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
old mode 100644
new mode 100755
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
timezone/Makefile | 4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
mode change 100644 => 100755 timezone/tzselect.ksh
hooks/post-receive
--
GNU C Library master sources