[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 6d1db7d24d91f671c539e905cbe95b395561913a
git
git at cross-lfs.org
Thu Feb 10 16:49:29 PST 2011
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 "Cross-LFS Book".
The branch, master has been updated
via 6d1db7d24d91f671c539e905cbe95b395561913a (commit)
via 054ff8c76156f0f4e4c6574b7b57be8a9f0d8d9b (commit)
via 590ddeb12e0206282d12199c3a5328aff89b449e (commit)
via 3e27692af45f434af11ff7b85187faa03f2f086d (commit)
from fd34dc31987bfd93a5df37c462cdc10364a3f146 (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 -----------------------------------------------------------------
commit 6d1db7d24d91f671c539e905cbe95b395561913a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Thu Feb 10 19:49:09 2011 -0500
Added a patch to procps to fix an issue when the
screen refresh rate isn't 60Hz.
diff --git a/BOOK/final-system/common/procps.xml b/BOOK/final-system/common/procps.xml
index 4ebb4a7..b005c3f 100644
--- a/BOOK/final-system/common/procps.xml
+++ b/BOOK/final-system/common/procps.xml
@@ -30,6 +30,11 @@
<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
+ <para os="p3">The following patch fixes an issue where some procps utils
+ print an error on the screen if the monitor isn't running at 60Hz:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
+
<para os="s1">The following fixes an issue with Make 3.82:</para>
<screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index ae56802..b805871 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>February 10, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Added patch to procps to fix an issue when the
+ screen refresh rate isn't 60Hz.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 30, 2011</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index d4f999a..f1a91a0 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -118,6 +118,15 @@
</varlistentry>
<varlistentry>
+ <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
+ <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 46468ba..a544654 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -56,6 +56,10 @@
<!ENTITY procps-ps_cgroup-patch-md5 "3c478ef88fad23353e332b1b850ec630">
<!ENTITY procps-ps_cgroup-patch-size "4 KB">
+<!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
+<!ENTITY procps-fix_HZ_errors-patch-md5 "2ea4c8e9a2c2a5a291ec63c92d7c6e3b">
+<!ENTITY procps-fix_HZ_errors-patch-size "4 KB">
+
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
<!ENTITY readline-branch_update-patch-md5 "91bb18428fcacb91b3f4c09d219e1258">
<!ENTITY readline-branch_update-patch-size "4 KB">
diff --git a/patches/procps-3.2.8-fix_HZ_errors-1.patch b/patches/procps-3.2.8-fix_HZ_errors-1.patch
new file mode 100644
index 0000000..287d2ac
--- /dev/null
+++ b/patches/procps-3.2.8-fix_HZ_errors-1.patch
@@ -0,0 +1,54 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2010-09-20
+Initial Package Version: 3.2.8
+Origin: Debian 30_sysinfo_7numbers.patch
+Upstream Status: Submitted
+Description: Fixes "unknown HZ value (##)" errors in procps utils.
+
+diff -Naurp procps-3.2.8-orig//proc/sysinfo.c procps-3.2.8//proc/sysinfo.c
+--- procps-3.2.8-orig//proc/sysinfo.c 2008-03-23 23:33:43.000000000 -0500
++++ procps-3.2.8//proc/sysinfo.c 2010-09-20 01:13:36.000000000 -0500
+@@ -124,24 +124,25 @@ int uptime(double *restrict uptime_secs,
+ unsigned long long Hertz;
+
+ static void old_Hertz_hack(void){
+- unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */
++ unsigned long long user_j, nice_j, sys_j, other_j, wait_j, hirq_j, sirq_j, stol_j; /* jiffies (clock ticks) */
+ double up_1, up_2, seconds;
+ unsigned long long jiffies;
+ unsigned h;
+ char *restrict savelocale;
+
++ wait_j = hirq_j = sirq_j = stol_j = 0;
+ savelocale = setlocale(LC_NUMERIC, NULL);
+ setlocale(LC_NUMERIC, "C");
+ do{
+ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1);
+ /* uptime(&up_1, NULL); */
+ FILE_TO_BUF(STAT_FILE,stat_fd);
+- sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j);
++ sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j);
+ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2);
+ /* uptime(&up_2, NULL); */
+ } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
+ setlocale(LC_NUMERIC, savelocale);
+- jiffies = user_j + nice_j + sys_j + other_j;
++ jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ;
+ seconds = (up_1 + up_2) / 2;
+ h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
+ /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */
+@@ -221,12 +222,13 @@ static void init_libproc(void){
+ // _SC_NPROCESSORS_ONLN returns 1, which should work OK
+ smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+ if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
+-
++#ifdef __linux__
+ if(linux_version_code > LINUX_VERSION(2, 4, 0)){
+ Hertz = find_elf_note(AT_CLKTCK);
+ if(Hertz!=NOTE_NOT_FOUND) return;
+ fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr);
+ }
++#endif
+ old_Hertz_hack();
+ }
+
commit 054ff8c76156f0f4e4c6574b7b57be8a9f0d8d9b
Author: Joe Ciccone <jciccone at gmail.com>
Date: Thu Feb 10 19:48:25 2011 -0500
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 48bfb26..d01853a 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "02"> <!-- Use two digits -->
<!ENTITY month_name "Feburary">
-<!ENTITY day "06"> <!-- Use two digits -->
+<!ENTITY day "10"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 590ddeb12e0206282d12199c3a5328aff89b449e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Feb 6 12:01:21 2011 -0500
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index c72aca3..48bfb26 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "01"> <!-- Use two digits -->
-<!ENTITY month_name "January">
-<!ENTITY day "30"> <!-- Use two digits -->
+<!ENTITY month "02"> <!-- Use two digits -->
+<!ENTITY month_name "Feburary">
+<!ENTITY day "06"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 3e27692af45f434af11ff7b85187faa03f2f086d
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Feb 6 12:00:52 2011 -0500
Fix spelling error.
diff --git a/BOOK/users_groups.ent b/BOOK/users_groups.ent
index b00dad3..cbb2873 100644
--- a/BOOK/users_groups.ent
+++ b/BOOK/users_groups.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- User IDs for use throught the book -->
+<!-- User IDs for use throughout the book -->
<!ENTITY uid-root "0">
<!ENTITY uid-bin "1">
@@ -13,7 +13,7 @@
<!ENTITY uid-postmaster "51">
<!ENTITY uid-nobody "65534">
-<!-- Group IDs for use throught the book -->
+<!-- Group IDs for use throughout the book -->
<!ENTITY gid-root "0">
<!ENTITY gid-bin "1">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/procps.xml | 5 +++
BOOK/general.ent | 6 ++--
BOOK/introduction/common/changelog.xml | 10 +++++
BOOK/materials/common/patches.xml | 9 +++++
BOOK/patches.ent | 4 ++
BOOK/users_groups.ent | 4 +-
patches/procps-3.2.8-fix_HZ_errors-1.patch | 54 ++++++++++++++++++++++++++++
7 files changed, 87 insertions(+), 5 deletions(-)
create mode 100644 patches/procps-3.2.8-fix_HZ_errors-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list