[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1151-g74eaf4b
git
git at cross-lfs.org
Thu May 29 05:26:36 PDT 2014
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, sysvinit has been updated
via 74eaf4bafd8645d59b02c12eb32f8ab7eb1756e1 (commit)
via b00ce4ac4cf29bb912579f626fa66e5be933e40d (commit)
via 6f8f4a13f41da1542f1bb059be77d1d6ae60b3bc (commit)
via 6950fcbb7df8b617116c787d4678eede343ecb86 (commit)
via dccb1a6abd3c40758fb28b8b9e013c9632330933 (commit)
via f7b56cf7930cb9e59c4c87bb5de9a363a4f8e5be (commit)
via d3b6d34d389e4eda9003e3b3c4706d423e16a5db (commit)
from d91748945daed64444ea5574f86e97342aa576b1 (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 74eaf4bafd8645d59b02c12eb32f8ab7eb1756e1
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:13:51 2014 -0500
Remove perl libc patch from common materials.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 02211f1..72886bd 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -120,15 +120,6 @@
</varlistentry>
<varlistentry>
- <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&perl-libc-patch;"/></para>
- <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
commit b00ce4ac4cf29bb912579f626fa66e5be933e40d
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:12:43 2014 -0500
Add master change log entry for Perl 5.20.0 upgrade.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 874653e..d5d0eb8 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>29 May 2014</para>
<itemizedlist>
<listitem>
+ <para>[William Harrington] - Update Perl to 5.20.0.</para>
+ </listitem>
+ <listitem>
<para>[Chris] - Edited "how" page - removed details about
booting/chrooting and moved them to the "choose" page for temp-system.</para>
</listitem>
commit 6f8f4a13f41da1542f1bb059be77d1d6ae60b3bc
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:11:36 2014 -0500
Update perl version, size, and md5-hash.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index a2f0422..6d24098 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -342,10 +342,10 @@
<!ENTITY patch-md5 "e9ae5393426d3ad783a300a338c09b72">
<!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
-<!ENTITY perl-version "5.18.2">
-<!ENTITY perl-size "14,059 KB">
+<!ENTITY perl-version "5.20.0">
+<!ENTITY perl-size "13,770 KB">
<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "d549b16ee4e9210988da39193a9389c1">
+<!ENTITY perl-md5 "20cbecd4e9e880ee7a50a136c8b1484e">
<!ENTITY perl-home "http://www.perl.org">
<!ENTITY pkg-config-lite-version "0.28-1">
commit 6950fcbb7df8b617116c787d4678eede343ecb86
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:10:54 2014 -0500
Remove perl libc patch and update Perl multilib patch size and md5 hash.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index e119345..839c98a 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -56,10 +56,6 @@
<!ENTITY ncurses-branch_update-patch-md5 "c2b2dc2d31b02c218359e6218f12a72c">
<!ENTITY ncurses-branch_update-patch-size "2,492 KB">
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "0959d8c1d370ce152b0d2a6df5ccfd7e">
-<!ENTITY perl-libc-patch-size "1.657 KB">
-
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
<!ENTITY readline-branch_update-patch-md5 "db39169d31ee08517e69d5eaec2c61c6">
<!ENTITY readline-branch_update-patch-size "4.182 KB">
@@ -85,8 +81,8 @@
<!ENTITY iproute2-libdir-patch-size "1.990 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "5b79ffc5337193d4f725d4bfd3c60997">
-<!ENTITY perl-multilib-patch-size "2.000 KB">
+<!ENTITY perl-multilib-patch-md5 "x6c1df5fac5c88f9a79963a19e6f8bc02">
+<!ENTITY perl-multilib-patch-size "2.055 KB">
<!-- Start of Pure64 patches -->
commit dccb1a6abd3c40758fb28b8b9e013c9632330933
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:10:06 2014 -0500
Seds for lib32 and li64 path are no longer used in hints. The scripts use plibpth now and are rewwritten.
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index 2402e2c..cc9c3ad 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -36,18 +36,6 @@
<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
- <para os="s1">There is a further (possibly cosmetic) anomaly - if we
- install Perl and then run <command>perl -V</command> it will claim that
- libc is in <filename class="directory">/lib</filename>. The
- following sed fixes this, but only takes effect when
- <command>make install</command> is run:</para>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
-
- <para os="m2">We still need to tell Perl to actually use <filename class="directory">lib64</filename>:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >> hints/linux.sh</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index 605191c..4bc4d10 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -40,16 +40,6 @@
xpointer="xpointer(//*[@os='mp2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="perl-64bit.xml"
- xpointer="xpointer(//*[@os='s1'])"/>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib32@" hints/linux.sh</userinput></screen>
-
- <para os="m2">We still need to tell perl to actually use lib32:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >> hints/linux.sh</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
commit f7b56cf7930cb9e59c4c87bb5de9a363a4f8e5be
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:08:47 2014 -0500
Remove Perl libc patch as it is needed no longer, since nothing is hardcoded for libc. Script has been redone and uses plibpth.
diff --git a/BOOK/final-system/common/temp-perl.xml b/BOOK/final-system/common/temp-perl.xml
index 36397e3..1e6a144 100644
--- a/BOOK/final-system/common/temp-perl.xml
+++ b/BOOK/final-system/common/temp-perl.xml
@@ -22,11 +22,6 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para os="a">First adapt some hard-wired paths to the C library by applying
- the following patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
<para os="s1">Change a hardcoded path from
<filename class="directory">/usr/include</filename> to
<filename class="directory">/tools/include</filename>:</para>
diff --git a/BOOK/final-system/multilib/temp-perl.xml b/BOOK/final-system/multilib/temp-perl.xml
index 4dce6b1..78c1e86 100644
--- a/BOOK/final-system/multilib/temp-perl.xml
+++ b/BOOK/final-system/multilib/temp-perl.xml
@@ -24,14 +24,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/temp-perl.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/temp-perl.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/temp-perl.xml"
xpointer="xpointer(//*[@os='s1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/materials/mips64/patches.xml b/BOOK/materials/mips64/patches.xml
index 52a1c1a..18e3a95 100644
--- a/BOOK/materials/mips64/patches.xml
+++ b/BOOK/materials/mips64/patches.xml
@@ -36,10 +36,6 @@
href="../x86_64/patches.xml"
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/materials/ppc64/patches.xml b/BOOK/materials/ppc64/patches.xml
index 9cf1d08..086e102 100644
--- a/BOOK/materials/ppc64/patches.xml
+++ b/BOOK/materials/ppc64/patches.xml
@@ -25,10 +25,6 @@
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../ppc/patches.xml"
xpointer="xpointer(//*[@os='powerpcutils-fixes-patch'])"/>
diff --git a/BOOK/materials/sparc64/patches.xml b/BOOK/materials/sparc64/patches.xml
index 847ed55..17e5fe2 100644
--- a/BOOK/materials/sparc64/patches.xml
+++ b/BOOK/materials/sparc64/patches.xml
@@ -25,10 +25,6 @@
xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/patches.xml"
- xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../sparc/patches.xml"
xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
diff --git a/BOOK/materials/x86_64/patches.xml b/BOOK/materials/x86_64/patches.xml
index 67986cd..1ffc577 100644
--- a/BOOK/materials/x86_64/patches.xml
+++ b/BOOK/materials/x86_64/patches.xml
@@ -25,15 +25,6 @@
</listitem>
</varlistentry>
- <varlistentry os="perl-multilib-patch">
- <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&perl-multilib-patch;"/></para>
- <para>MD5 sum: <literal>&perl-multilib-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit d3b6d34d389e4eda9003e3b3c4706d423e16a5db
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed May 28 21:06:01 2014 -0500
Rename Perl Configure Multilib patch for 5.20.0 from 5.18.2.
diff --git a/patches/perl-5.18.2-libc-1.patch b/patches/perl-5.18.2-libc-1.patch
deleted file mode 100644
index 23b6de1..0000000
--- a/patches/perl-5.18.2-libc-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Submitted By: Jonathan Norman <Jonathan at bluesquarelinux.co.uk>
-Date: 2013-08-13
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
-Description: This patch adapts some hard-wired paths to the C library.
- It uses the $prefix variable to locate the correct libc.
-
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
- Against 5.10.1 By Jim Gifford on 2009-08-25
- Against 5.12.1 By Joe Ciccone on 2010-08-01
- Against 5.14.0 By Jonathan Norman on 2011-05-17
- Against 5.16.1 by William Harrington on 2012-08-26
-Rename for 5.16.2 by William Harrington on 2012-11-01
-
-Rediffed: Against 5.18.0 by William Harrington on 2013-05-27
-Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
-Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
-
-diff -Naur perl-5.18.2.orig/hints/linux.sh perl-5.18.2/hints/linux.sh
---- perl-5.18.2.orig/hints/linux.sh 2014-01-06 17:46:45.000000000 -0500
-+++ perl-5.18.2/hints/linux.sh 2014-01-10 02:34:36.000000000 -0500
-@@ -66,9 +66,9 @@
- # We don't use __GLIBC__ and __GLIBC_MINOR__ because they
- # are insufficiently precise to distinguish things like
- # libc-2.0.6 and libc-2.0.7.
--if test -L /lib/libc.so.6; then
-- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
-- libc=/lib/$libc
-+if test -L ${prefix}/lib/libc.so.6; then
-+ libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
-+ libc=${prefix}/lib/$libc
- fi
-
- # Configure may fail to find lstat() since it's a static/inline
-@@ -456,3 +456,9 @@
- libswanted="$libswanted pthread"
- ;;
- esac
-+
-+locincpth=""
-+loclibpth=""
-+glibpth="${prefix}/lib"
-+usrinc="${prefix}/include"
-+
diff --git a/patches/perl-5.18.2-Configure_multilib-1.patch b/patches/perl-5.20.0-Configure_multilib-1.patch
similarity index 97%
rename from patches/perl-5.18.2-Configure_multilib-1.patch
rename to patches/perl-5.20.0-Configure_multilib-1.patch
index 1bcb00f..9d9f384 100644
--- a/patches/perl-5.18.2-Configure_multilib-1.patch
+++ b/patches/perl-5.20.0-Configure_multilib-1.patch
@@ -16,6 +16,8 @@ Rediffed: Against 5.18.0 by William Harrington on 2013-05-28
Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
+Rename for 5.20.0 by William Harrington on 2014-05-29
+
diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
--- perl-5.18.2.orig/Configure 2014-01-06 17:46:42.000000000 -0500
+++ perl-5.18.2/Configure 2014-01-10 02:38:43.000000000 -0500
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/temp-perl.xml | 5 --
BOOK/final-system/multilib/perl-64bit.xml | 12 -----
BOOK/final-system/multilib/perl-n32.xml | 10 ----
BOOK/final-system/multilib/temp-perl.xml | 8 ----
BOOK/introduction/common/changelog.xml | 3 +
BOOK/materials/common/patches.xml | 9 ----
BOOK/materials/mips64/patches.xml | 4 --
BOOK/materials/ppc64/patches.xml | 4 --
BOOK/materials/sparc64/patches.xml | 4 --
BOOK/materials/x86_64/patches.xml | 9 ----
BOOK/packages.ent | 6 +-
BOOK/patches.ent | 8 +---
patches/perl-5.18.2-libc-1.patch | 45 --------------------
...atch => perl-5.20.0-Configure_multilib-1.patch} | 2 +
14 files changed, 10 insertions(+), 119 deletions(-)
delete mode 100644 patches/perl-5.18.2-libc-1.patch
rename patches/{perl-5.18.2-Configure_multilib-1.patch => perl-5.20.0-Configure_multilib-1.patch} (97%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list