emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

first 3.0.4 thing: ELF note warning

Browse Source
This commit is contained in:
albert 2002-10-14 07:53:08 +00:00
parent 7a986f28b3
commit 1e1645c4d4
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -18,9 +18,9 @@
VERSION := 3 VERSION := 3
SUBVERSION := 0 SUBVERSION := 0
MINORVERSION := 3 MINORVERSION := 4
TARVERSION := 3.0.3 TARVERSION := 3.0.4
LIBVERSION := 3.0.3 LIBVERSION := 3.0.4
############ vars ############ vars

2
Makefile.noam
View File

@ -106,7 +106,7 @@ MINORVERSION = $(shell awk '/^%define revision/ { print $$3 }' < procps.spec)
# Note: LIBVERSION may be less than $(VERSION).$(SUBVERSION).$(MINORVERSION) # Note: LIBVERSION may be less than $(VERSION).$(SUBVERSION).$(MINORVERSION)
# LIBVERSION is only set to current $(VERSION).$(SUBVERSION).$(MINORVERSION) # LIBVERSION is only set to current $(VERSION).$(SUBVERSION).$(MINORVERSION)
# when an incompatible change is made in libproc. # when an incompatible change is made in libproc.
LIBVERSION = 3.0.3 LIBVERSION = 3.0.4
ifdef MINORVERSION ifdef MINORVERSION
LIBPROCPASS = SHARED=$(SHARED) SHLIBDIR=$(SHLIBDIR) VERSION=$(VERSION) SUBVERSION=$(SUBVERSION) MINORVERSION=$(MINORVERSION) LIBVERSION=$(LIBVERSION) LIBPROCPASS = SHARED=$(SHARED) SHLIBDIR=$(SHLIBDIR) VERSION=$(VERSION) SUBVERSION=$(SUBVERSION) MINORVERSION=$(MINORVERSION) LIBVERSION=$(LIBVERSION)
else else

4
NEWS
View File

@ -1,3 +1,7 @@
procps-3.0.3 --> procps-3.0.4
only Linux 2.4.0 supply the ELF note
procps-3.0.2 --> procps-3.0.3 procps-3.0.2 --> procps-3.0.3
more "make install" fixes more "make install" fixes

9
proc/sysinfo.c
View File

@ -127,7 +127,6 @@ static void old_Hertz_hack(void){
unsigned h; unsigned h;
char *savelocale; char *savelocale;
fprintf(stderr, "ELF note not found - report to albert@users.sf.net\n");
savelocale = setlocale(LC_NUMERIC, NULL); savelocale = setlocale(LC_NUMERIC, NULL);
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
do{ do{
@ -195,8 +194,12 @@ static void init_libproc(void){
smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); // or _SC_NPROCESSORS_ONLN smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); // or _SC_NPROCESSORS_ONLN
if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */ if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
Hertz = find_elf_note(AT_CLKTCK); if(linux_version_code > LINUX_VERSION(2, 4, 0)){
if(Hertz==42) old_Hertz_hack(); Hertz = find_elf_note(AT_CLKTCK);
if(Hertz!=42) return;
fprintf(stderr, "2.4 kernel w/o ELF notes? -- report to albert@users.sf.net\n");
}
old_Hertz_hack();
} }
/*********************************************************************** /***********************************************************************

8
procps.lsm
View File

@ -1,15 +1,15 @@
Begin4 Begin4
Title: procps Title: procps
Version: 3.0.3 Version: 3.0.4
Entered-date: 2002-10-14 Entered-date: 2002-10-15
Description: Linux system utilities Description: Linux system utilities
Keywords: procps /proc libproc sysctl Keywords: procps /proc libproc sysctl
ps uptime tload free w top vmstat watch skill snice kill pgrep pkill ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc. Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
Maintained-by: various <procps-feedback@lists.sf.net> Maintained-by: various <procps-feedback@lists.sf.net>
Primary-site: http://procps.sf.net/ Primary-site: http://procps.sf.net/
230kB procps-3.0.3.tar.gz 230kB procps-3.0.4.tar.gz
Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
230kB procps-3.0.3.tar.gz 230kB procps-3.0.4.tar.gz
Copying-policy: mixed Copying-policy: mixed
End End

2
procps.spec
View File

@ -2,7 +2,7 @@ Summary: Utilities for monitoring your system and processes on your system.
Name: procps Name: procps
%define major_version 3 %define major_version 3
%define minor_version 0 %define minor_version 0
%define revision 3 %define revision 4
%define version %{major_version}.%{minor_version}.%{revision} %define version %{major_version}.%{minor_version}.%{revision}
Version: %{version} Version: %{version}
Release: 1 Release: 1