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.11-316-g9e37946
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Apr 2010 08:02:37 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-316-g9e37946
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 9e37946dba22b53c5108eef777e867f93c894502 (commit)
from 22f4f44b6727887957aa1d4039eba290b064da63 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9e37946dba22b53c5108eef777e867f93c894502
commit 9e37946dba22b53c5108eef777e867f93c894502
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Apr 4 01:02:09 2010 -0700
Fix retrieving of kernel header version.
diff --git a/ChangeLog b/ChangeLog
index 99aa680..7db74b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-04 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #11287]
+ * csu/Makefile ($(objpfx)version-info.h): Handle newer kernel headers
+ which don't define UTS_RELEASE.
+
2010-04-04 H.J. Lu <hongjiu.lu@intel.com>
Ulrich Drepper <drepper@redhat.com>
diff --git a/csu/Makefile b/csu/Makefile
index 0e2ae07..69e07c7 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -1,5 +1,5 @@
# Makefile for csu code for GNU C library.
-# Copyright (C) 1995-2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1995-2004, 2005, 2006, 2010 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -209,9 +209,20 @@ $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
linux*) version=`(printf '%s\n%s\n' \
'#include <linux/version.h>' \
UTS_RELEASE \
- | $(CC) $(CPPFLAGS) -E -P - -DNOT_IN_libc=1 | \
+ | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 | \
sed -e 's/"\([^"]*\)".*/\1/p' -e d) 2>/dev/null`;\
if [ -z "$$version" ]; then \
+ version=`(printf '%s\n%s\n' \
+ '#include <linux/version.h>' \
+ LINUX_VERSION_CODE \
+ | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 \
+ | sed -n -e '/^[123456789].*/p' \
+ | awk '{v=$$1; \
+ printf("%d.%d.%d\n", \
+ v/65535, v/256%256, v%256)}') \
+ 2>/dev/null`; \
+ fi; \
+ if [ -z "$$version" ]; then \
if [ -r /proc/version ]; then \
version=`sed 's/.*Linux version \([^ ]*\) .*/>>\1<</' \
< /proc/version`; \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
csu/Makefile | 15 +++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources