[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-755-g21403ba
git
git at cross-lfs.org
Sun Jan 19 19:24:33 PST 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, systemd has been updated
via 21403ba6968b7eea4e5d754c6d412ab88e644b15 (commit)
via 5de15f060f6d9501f09ea3deef3f32f55a9ad025 (commit)
via 4302a8c94f9c61c345343637a62a07a1498654d2 (commit)
via 78dd6d6bf2ad1ae34a01c807502e350d137e4216 (commit)
via 28b984755e6637b2acc97b3be3d82b190c75e115 (commit)
via 26d330b4fcbd3e5a1f11b2ba8499c87f9c7bdb4a (commit)
via 4301b1eca44bb16f535c4ccbbd6cd31b888be34b (commit)
from ca758f8006026c181ca052ce4ffb32a5019e675e (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 21403ba6968b7eea4e5d754c6d412ab88e644b15
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 21:15:38 2014 -0600
Fix command substitution syntax near token ( error in final system xz.
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 7cfc912..295e008 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -52,7 +52,7 @@
location, and recreate the symlink pointing to it:</para>
<screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
-ln -sfv ../../lib/($readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index 944e5ce..0f86ac4 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -64,7 +64,7 @@
xpointer="xpointer(//*[@os='j'])"/>
<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
-ln -sfv ../../lib64/($readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
+ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index 16364d1..cc23881 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -55,7 +55,7 @@
xpointer="xpointer(//*[@os='j'])"/>
<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
-ln -sfv ../../lib32/($readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
+ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
</sect2>
commit 5de15f060f6d9501f09ea3deef3f32f55a9ad025
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:55:49 2014 -0600
Use readlink when creating symbolic links to ncurses dynamic libraries of libncurses, libform, libpanel, and libmenu.
diff --git a/BOOK/final-system/common/ncurses.xml b/BOOK/final-system/common/ncurses.xml
index ff95a04..293d556 100644
--- a/BOOK/final-system/common/ncurses.xml
+++ b/BOOK/final-system/common/ncurses.xml
@@ -56,11 +56,13 @@
<para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
-ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
-ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
-ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
+ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
+ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
+ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
+rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
<para os="l">Now we will make our Ncurses compatible for older and non-widec compatible programs
can build properly:</para>
diff --git a/BOOK/final-system/multilib/ncurses-64bit.xml b/BOOK/final-system/multilib/ncurses-64bit.xml
index 9cc6cd9..8d153a6 100644
--- a/BOOK/final-system/multilib/ncurses-64bit.xml
+++ b/BOOK/final-system/multilib/ncurses-64bit.xml
@@ -73,11 +73,13 @@ ln -svf multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
<para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
-<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
-ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
-ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
-ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
+ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
+ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
+ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
+rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="ncurses.xml"
diff --git a/BOOK/final-system/multilib/ncurses-n32.xml b/BOOK/final-system/multilib/ncurses-n32.xml
index dffb5d2..da80b71 100644
--- a/BOOK/final-system/multilib/ncurses-n32.xml
+++ b/BOOK/final-system/multilib/ncurses-n32.xml
@@ -73,11 +73,13 @@
<para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
-<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
-ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
-ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
-ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
+ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
+ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
+ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
+rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="ncurses.xml"
commit 4302a8c94f9c61c345343637a62a07a1498654d2
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:55:10 2014 -0600
Use radlink when creating the symblink links for zlib dynamic library.
diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index 0967c55..dfc1ccd 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -51,7 +51,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
to <filename class="directory">/usr/lib</filename>:</para>
<screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
-ln -svf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
+ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/zlib-64bit.xml b/BOOK/final-system/multilib/zlib-64bit.xml
index ec84a9c..e24f98c 100644
--- a/BOOK/final-system/multilib/zlib-64bit.xml
+++ b/BOOK/final-system/multilib/zlib-64bit.xml
@@ -61,7 +61,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
to <filename class="directory">/usr/lib64</filename>:</para>
<screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
-ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
+ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/zlib-n32.xml b/BOOK/final-system/multilib/zlib-n32.xml
index 16b0fce..70d44a1 100644
--- a/BOOK/final-system/multilib/zlib-n32.xml
+++ b/BOOK/final-system/multilib/zlib-n32.xml
@@ -62,7 +62,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
to <filename class="directory">/usr/lib32</filename>:</para>
<screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
-ln -svf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
+ln -sfv ../../lib32/$(readlink /usr/lib32/libz.so) /usr/lib32/libz.so</userinput></screen>
</sect2>
commit 78dd6d6bf2ad1ae34a01c807502e350d137e4216
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:53:32 2014 -0600
Use readlink when creating symbolic links for the dynamic libraries and remove the need for readlin-version2 entity.
diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index 806878c..87279ff 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -52,13 +52,12 @@
<screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
- <para os="l">Next, remove the <filename class="extension">.so</filename>
- files in <filename class="directory">/lib</filename> and relink them into
- <filename class="directory">/usr/lib</filename>.</para>
+ <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
-<screen os="m"><userinput>rm -v /lib/lib{readline,history}.so
-ln -svf ../../lib/libreadline.so.&readline-version2; /usr/lib/libreadline.so
-ln -svf ../../lib/libhistory.so.&readline-version2; /usr/lib/libhistory.so</userinput></screen>
+<screen os="m"><userinput>
+ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
+ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
+rm -v /lib/lib{readline,history}.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/readline-64bit.xml b/BOOK/final-system/multilib/readline-64bit.xml
index b425241..bcf9577 100644
--- a/BOOK/final-system/multilib/readline-64bit.xml
+++ b/BOOK/final-system/multilib/readline-64bit.xml
@@ -70,13 +70,12 @@
<screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
- <para os="l">Next, remove the <filename class="extension">.so</filename>
- files in <filename class="directory">/lib64</filename> and relink them into
- <filename class="directory">/usr/lib64</filename>.</para>
+ <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
-<screen os="m"><userinput>rm -v /lib64/lib{readline,history}.so
-ln -svf ../../lib64/libreadline.so.&readline-version2; /usr/lib64/libreadline.so
-ln -svf ../../lib64/libhistory.so.&readline-version2; /usr/lib64/libhistory.so</userinput></screen>
+<screen os="m"><userinput>
+ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
+ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
+rm -v /lib64/lib{readline,history}.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/readline-n32.xml b/BOOK/final-system/multilib/readline-n32.xml
index 5416f95..313fc08 100644
--- a/BOOK/final-system/multilib/readline-n32.xml
+++ b/BOOK/final-system/multilib/readline-n32.xml
@@ -71,13 +71,12 @@
<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
- <para os="l">Next, remove the <filename class="extension">.so</filename>
- files in <filename class="directory">/lib32</filename> and relink them into
- <filename class="directory">/usr/lib32</filename>.</para>
+ <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
-<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
-ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
-ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
+<screen os="m"><userinput>
+ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
+ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
+rm -v /lib32/lib{readline,history}.so</userinput></screen>
</sect2>
commit 28b984755e6637b2acc97b3be3d82b190c75e115
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:53:02 2014 -0600
Use readlink when creating symbolic links for Xz and liblzma and remove the need for xz-version entity when doing so.
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 9c3b80f..7cfc912 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -52,7 +52,7 @@
location, and recreate the symlink pointing to it:</para>
<screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
-ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
+ln -sfv ../../lib/($readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index ce7175b..944e5ce 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -64,7 +64,7 @@
xpointer="xpointer(//*[@os='j'])"/>
<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
-ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
+ln -sfv ../../lib64/($readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index b031367..16364d1 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -55,7 +55,7 @@
xpointer="xpointer(//*[@os='j'])"/>
<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
-ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
+ln -sfv ../../lib32/($readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
</sect2>
commit 26d330b4fcbd3e5a1f11b2ba8499c87f9c7bdb4a
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:52:14 2014 -0600
Add master changelog entry for using readlink.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 0e73710..1afea01 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -42,6 +42,9 @@
<listitem>
<para>[William Harrington] - Update DHCPCD to 6.2.1.</para>
</listitem>
+ <listitem>
+ <para>[William Harrington] - Use readlink when creating links for dynamic libraries for zlib, xz, ncurses, and readline.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit 4301b1eca44bb16f535c4ccbbd6cd31b888be34b
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sun Jan 19 20:51:17 2014 -0600
Remove readline-version2 which is no longer needed since using readlink.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 6418518..545aa55 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -401,8 +401,7 @@
<!ENTITY psmisc-md5 "a25fc99a6dc7fa7ae6e4549be80b401f">
<!ENTITY psmisc-home "http://psmisc.sourceforge.net">
-<!ENTITY readline-version2 "6">
-<!ENTITY readline-version "&readline-version2;.2">
+<!ENTITY readline-version "6.2">
<!ENTITY readline-size "2,228 KB">
<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
<!ENTITY readline-md5 "67948acb2ca081f23359d0256e9a271c">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/ncurses.xml | 12 +++++++-----
BOOK/final-system/common/readline.xml | 11 +++++------
BOOK/final-system/common/xz.xml | 2 +-
BOOK/final-system/common/zlib.xml | 2 +-
BOOK/final-system/multilib/ncurses-64bit.xml | 12 +++++++-----
BOOK/final-system/multilib/ncurses-n32.xml | 12 +++++++-----
BOOK/final-system/multilib/readline-64bit.xml | 11 +++++------
BOOK/final-system/multilib/readline-n32.xml | 11 +++++------
BOOK/final-system/multilib/xz-64bit.xml | 2 +-
BOOK/final-system/multilib/xz-n32.xml | 2 +-
BOOK/final-system/multilib/zlib-64bit.xml | 2 +-
BOOK/final-system/multilib/zlib-n32.xml | 2 +-
BOOK/introduction/common/changelog.xml | 3 +++
BOOK/packages.ent | 3 +--
14 files changed, 46 insertions(+), 41 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list