Changeset 421011f

Timestamp:

07/23/2012 03:15:49 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

60556bf

Parents:

6c8d947

Message:

Moved a few things around for ordering/convenience.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9918 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter03/patches.xml (modified) (1 diff)
• chapter06/chapter06.xml (modified) (2 diffs)
• chapter06/e2fsprogs.xml (modified) (3 diffs)
• packages.ent (modified) (1 diff)

chapter03/patches.xml

@@ -101 +101 @@
 
     <varlistentry>
+      <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
+        <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Kmod Testsuite Patch - <token>&kmod-testsuite-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kmod-testsuite-patch;"/></para>
         <para>MD5 sum: <literal>&kmod-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

chapter06/chapter06.xml

@@ -31 +31 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
@@ -47 +48 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>

chapter06/e2fsprogs.xml

@@ -53 +53 @@
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true         \
-LDFLAGS="-lblkid -luuid"           \
-../configure --prefix=/usr         \
+<screen><userinput remap="configure">../configure --prefix=/usr         \
              --with-root-prefix="" \
              --enable-elf-shlibs   \
@@ -65 +63 @@
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
         <term><parameter>PKG_CONFIG...</parameter></term>
@@ -73 +71 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter></term>

packages.ent

@@ -432 +432 @@
 <!ENTITY pkgconfig-version "0.27">
 <!ENTITY pkgconfig-size "1872 KB">
-<!ENTITY pkgconfig-url "http://people.freedesktop.org/pkg-config-&pkgconfig-version;.tar.gz">
+<!ENTITY pkgconfig-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
 <!ENTITY pkgconfig-md5 "3a4c9feab14b6719afd8904945d9b4e4">
 <!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config">