ソースを参照

Update vim, shadow, linux, less, and util-linux

Update to vim-8.1.1535.
Update to shadow-4.7.
Update to linux-5.1.10.
Update to less-551.
Update to util-linux-2.34.
Remove eudev instructions referring to /tools.

was r11619.
Bruce Dubbs 6 年 前
コミット
8f3e4c18a6
6 ファイル変更81 行追加34 行削除
  1. 30 0
      chapter01/changelog.xml
  2. 6 6
      chapter01/whatsnew.xml
  3. 15 7
      chapter06/eudev.xml
  4. 10 1
      chapter06/vim.xml
  5. 3 3
      general-orig.ent
  6. 17 17
      packages.ent

+ 30 - 0
chapter01/changelog.xml

@@ -42,6 +42,36 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2019-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.1.1535. Fixes
+          <ulink url="&lfs-ticket-root;4482">#4482</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to shadow-4.7. Fixes
+          <ulink url="&lfs-ticket-root;4481">#4481</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.1.10. Fixes
+          <ulink url="&lfs-ticket-root;4478">#4478</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to less-551. Fixes
+          <ulink url="&lfs-ticket-root;4477">#4477</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.34. Fixes
+          <ulink url="&lfs-ticket-root;4452">#4462</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove eudev instructions referring to /tools. Fixes
+          <ulink url="&lfs-ticket-root;4480">#4480</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>2019-06-12</para>
       <itemizedlist>

+ 6 - 6
chapter01/whatsnew.xml

@@ -141,9 +141,9 @@
     <!--<listitem>
       <para>Kmod-&kmod-version;</para>
    </listitem>-->
-   <!--<listitem>
+   <listitem>
       <para>Less-&less-version;</para>
-   </listitem>-->
+   </listitem>
     <listitem>
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>
@@ -216,9 +216,9 @@
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Shadow-&shadow-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
@@ -243,9 +243,9 @@
    <listitem>
       <para>Util-Linux-&util-linux-version;</para>
    </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->

+ 15 - 7
chapter06/eudev.xml

@@ -49,6 +49,7 @@
 
 <screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
 -->
+<!--
     <para>首先,采用一个规避措施,防止 /tools 目录被硬编码到
     Eudev 二进制文件的库文件位置中:</para>
 
@@ -58,6 +59,7 @@ BLKID_LIBS="-lblkid"
 BLKID_CFLAGS="-I/tools/include"
 EOF</userinput></screen>
 
+-->
 <para>准备安装 Eudev:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
@@ -69,23 +71,26 @@ EOF</userinput></screen>
             --with-rootprefix=      \
             --with-rootlibdir=/lib  \
             --enable-manpages       \
-            --disable-static        \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
+<!--           - -config-cache</userinput></screen> -->
 
 <para>编译该软件包:</para>
 
+<screen><userinput remap="make">make</userinput></screen>
+<!--
 <screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
 
-<!--note><para>The LIBRARY_PATH variable here and the LD_LIBRARY_PATH variable
+<!- -note><para>The LIBRARY_PATH variable here and the LD_LIBRARY_PATH variable
 below are needed to allow the use of libraries that were installed in /tools,
 but have not yet been installed in the main system.  LIBRARY_PATH is
 used to find libraries during the linking process.  LD_LIBRARY_PATH is
-used to find libraries during program execution.</para></note-->
+used to find libraries during program execution.</para></note- ->
 <note><para>这里的 LIBRARY_PATH 变量和下面的 LD_LIBRARY_PATH 允许使用
 	/tools 中存在,但尚未安装到主系统中的库。LIBRARY_PATH
 	被用于在链接过程中查找库,LD_LIBRARY_PATH 用于在程序执行过程中查找库。
 </para></note>
 
+-->
 <para>创建一些目录,它们目前被用于测试,但之后也会成为安装好的
 eudev 的一部分。</para>
 
@@ -94,11 +99,13 @@ mkdir -pv /etc/udev/rules.d</userinput></screen>
 
 <para>运行以下命令以测试编译结果:</para>
 
-<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
+<!--<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
 
     <para>安装该软件包:</para>
 
-<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
+<!--<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>-->
 
     <para>安装一些在 LFS 环境中很有用的自定义规则和支持文件:</para>
 
@@ -125,7 +132,8 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
     <application>Eudev</application> 需要将这些信息编译到二进制数据库
     <filename>/etc/udev/hwdb.bin</filename> 中。初始化该数据库:</para>
 
-<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update</userinput></screen>
+<!--<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb - -update</userinput></screen>-->
+<screen><userinput>udevadm hwdb --update</userinput></screen>
 
     <para>每次硬件信息有更新时,都要运行该命令。</para>
 

+ 10 - 1
chapter06/vim.xml

@@ -65,7 +65,16 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>运行以下命令以测试编译结果:</para>
+    <para>为了准备运行测试套件,需要使得
+    <systemitem class="username">nobody</systemitem>
+    拥有写入源代码目录树的权限:</para>
+
+<screen><userinput remap="test">chown -Rv nobody .</userinput></screen>
+
+    <para>现在,以 <systemitem
+    class="username">nobody</systemitem> 用户运行测试:</para>
+
+<screen><userinput remap="test">su nobody -s /bin/bash -c "LANG=en_US.UTF-8 make -j1 test" &amp;> vim-test.log</userinput></screen>
 
 <screen><userinput remap="test">LANG=en_US.UTF-8 make -j1 test &amp;&gt; vim-test.log</userinput></screen>
 

+ 3 - 3
general-orig.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190612">
+<!ENTITY version         "SVN-20190616">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190612-systemd">
+<!ENTITY versiond        "20190616-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "June 12, 2019">
+<!ENTITY releasedate     "June 16, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">

+ 17 - 17
packages.ent

@@ -373,10 +373,10 @@
 <!ENTITY kmod-ch6-du "13 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
 
-<!ENTITY less-version "530">
-<!ENTITY less-size "332 KB">
+<!ENTITY less-version "551">
+<!ENTITY less-size "339 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "6a39bccf420c946b0fd7ffc64961315b">
+<!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
 <!ENTITY less-ch6-du "3.9 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
@@ -423,12 +423,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-patch-version "10">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "103,771 KB">
+<!ENTITY linux-size "103,774 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "252fe34c28205fcaaa6b1b3782576b84">
+<!ENTITY linux-md5 "81c6849be703c8d4be09a3c0e45102cc">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -606,10 +606,10 @@
 <!ENTITY sed-ch6-du "32 MB">
 <!ENTITY sed-ch6-sbu "0.3 SBU">
 
-<!ENTITY shadow-version "4.6">
-<!ENTITY shadow-size "1,639 KB">
+<!ENTITY shadow-version "4.7">
+<!ENTITY shadow-size "1,587 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "b491fecbf1232632c32ff8f1437fd60e">
+<!ENTITY shadow-md5 "f7ce18c8dfd05f1a009266cb604d58b7">
 <!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> 
 <!ENTITY shadow-ch6-du "46 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
@@ -687,23 +687,23 @@
 <!ENTITY udev-lfs-md5     "d92afb0c6e8e616792068ee4737b0d24">
 <!ENTITY udev-lfs-home    " ">
 
-<!ENTITY util-linux-minor "2.33">
-<!ENTITY util-linux-version "2.33.2"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "4,597 KB">
+<!ENTITY util-linux-minor "2.34">
+<!ENTITY util-linux-version "2.34"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "4,859 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "91653b90fcbe9c161153e39b8cc69fb5">
+<!ENTITY util-linux-md5 "a78cbeaed9c39094b96a48ba8f891d50">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "147 MB">
 <!ENTITY util-linux-ch5-sbu "1 SBU">
 <!ENTITY util-linux-ch6-du "214 MB">
 <!ENTITY util-linux-ch6-sbu "1.5 SBU">
 
-<!ENTITY vim-version "8.1">
+<!ENTITY vim-version "8.1.1535">
 <!ENTITY vim-majmin "81">
 <!ENTITY vim-docdir "vim/vim81">
-<!ENTITY vim-size "10,995 KB">
-<!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "1739a1df312305155285f0cfa6118294">
+<!ENTITY vim-size "14,028 KB">
+<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!ENTITY vim-md5 "95935d54145e03a1c5a499bb3712817d">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-ch6-du "169 MB">
 <!ENTITY vim-ch6-sbu "1.3 SBU">