[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. c560da394d5edf4d2d3e02d0ee17cb795e53921c

git git at cross-lfs.org
Thu Nov 1 15:38:04 PDT 2012


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  c560da394d5edf4d2d3e02d0ee17cb795e53921c (commit)
       via  08cfbeb89014d239849c1f908a9ba1f07c3d2e05 (commit)
       via  41e917bc0af3e2cff38e63c84b363f83875b3a80 (commit)
       via  99db8b1cb6d919f6488f11bcb7b4933bbc77317d (commit)
       via  52368aaca0f9771e4a194d2b16889a622b60849a (commit)
      from  b66a9a4f5f8cd8706bc6b2944dc41458859756c1 (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 c560da394d5edf4d2d3e02d0ee17cb795e53921c
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Nov 1 16:38:08 2012 -0500

    Remove Patch test fixes patch from final system patch build.

diff --git a/BOOK/final-system/common/patch.xml b/BOOK/final-system/common/patch.xml
index 783a0da..41617e4 100644
--- a/BOOK/final-system/common/patch.xml
+++ b/BOOK/final-system/common/patch.xml
@@ -26,10 +26,6 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
-    <para os="p1">The following patch removes tests that require Ed:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&patch-test-patch;</userinput></screen>
-
     <para os="a">Prepare Patch for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>

commit 08cfbeb89014d239849c1f908a9ba1f07c3d2e05
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Nov 1 16:19:24 2012 -0500

    Remove patch-2.6.1-test_fix-1.patch.

diff --git a/patches/patch-2.6.1-test_fix-1.patch b/patches/patch-2.6.1-test_fix-1.patch
deleted file mode 100644
index d80f766..0000000
--- a/patches/patch-2.6.1-test_fix-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Submitted by:            Matt Burgess <matthew at linuxfromscratch.org>
-Date:                    2010-01-03
-Initial Package Version: 2.6.1
-Upstream Status:         Submitted
-Origin:                  Matt Burgess
-Description:             Prevents a test from failing when ed is not available.
-
-diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
---- patch-2.6.1.orig/tests/crlf-handling	2009-12-30 12:56:30.000000000 +0000
-+++ patch-2.6.1/tests/crlf-handling	2010-01-03 11:06:00.340849916 +0000
-@@ -89,10 +89,14 @@
- 
- # --------------------------------------------------------------
- 
--diff -e a b > ab.diff
--cp a c
--check 'patch c < ab.diff' <<EOF
-+if ! have_ed ; then
-+    echo "The ed utility is not available; skipping ed related tests"
-+else
-+    diff -e a b > ab.diff
-+    cp a c
-+    check 'patch c < ab.diff' <<EOF
- EOF
-+fi
- 
- check 'cat -A c' <<EOF
- 1b^M$

commit 41e917bc0af3e2cff38e63c84b363f83875b3a80
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Nov 1 16:18:55 2012 -0500

    Remove Patch test fix patch entry.

diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 73d3b43..36be199 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -65,10 +65,6 @@
 <!ENTITY ncurses-branch_update-patch-md5 "5f8be727e09d39784c7f6088c3489237">
 <!ENTITY ncurses-branch_update-patch-size "2,492 KB">
 
-<!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
-<!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
-<!ENTITY patch-test-patch-size "4 KB">
-
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "2adb1094aa7230bfcc7a6b6fc5e14416">
 <!ENTITY perl-libc-patch-size "20 KB">

commit 99db8b1cb6d919f6488f11bcb7b4933bbc77317d
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Nov 1 16:18:38 2012 -0500

    Remove Patch test fix patch entry.

diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index d2e1421..b1839ba 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -136,15 +136,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Patch Test Patch - <token>&patch-test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&patch-test-patch;"/></para>
-        <para>MD5 sum: <literal>&patch-test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

commit 52368aaca0f9771e4a194d2b16889a622b60849a
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Nov 1 16:18:14 2012 -0500

    Update introduction changelog.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 79580cd..df48f83 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -62,7 +62,9 @@
         <listitem>
           <para>[William Harrington - Linux kernel to 3.4.17.</para>
         </listitem>
-
+        <listitem>
+          <para>[William Harrington - Remove patch test fix patch.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/patch.xml     |    4 ----
 BOOK/introduction/common/changelog.xml |    4 +++-
 BOOK/materials/common/patches.xml      |    9 ---------
 BOOK/patches.ent                       |    4 ----
 patches/patch-2.6.1-test_fix-1.patch   |   28 ----------------------------
 5 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 patches/patch-2.6.1-test_fix-1.patch


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list