Changeset 8b6d8b6

Timestamp:

11/28/2017 06:10:14 PM (6 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

47515cfe

Parents:

d3f7318

Message:

Version 2.9.1, fix #10078
Add files to mkinitramfs

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19547 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/editors/nano.xml (modified) (2 diffs)
• postlfs/filesystems/initramfs.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>November 28th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to nano-2.9.1. Fixes
+          <ulink url="&blfs-ticket-root;10078">#10078</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Add readlink and basename to mkinitramfs.
+          Required in some udev rules.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 27th, 2017</para>
       <itemizedlist>

packages.ent

@@ -71 +71 @@
 <!ENTITY joe-version                  "4.5">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "2.9.0">
+<!ENTITY nano-version                 "2.9.1">
 <!ENTITY vim-version                  "8.0.586">
 <!ENTITY vim-majmin                   "80">

postlfs/editors/nano.xml

@@ -8 +8 @@
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v2.9/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "a7f0a70fea21431745aa07ee2c5c8d3a">
+  <!ENTITY nano-md5sum        "ecb29612c30996d0d1139b47d3a413ba">
   <!ENTITY nano-size          "1.4 MB">
   <!ENTITY nano-buildsize     "17 MB">
@@ -167 +167 @@
 set suspend</literal></screen>
 
-      <para>You probably want to create the directory
-        <filename class="directory">$HOME/.local/share/nano</filename>.
-        This is where <application>Nano</application> will store search
-        and position log files. Required only if you have either historylog
-        and/or positionlog enabled. When using those settings in a system-wide
-        configuration, you may want to update
-        <filename class="directory">/etc/skel</filename> to make the
-        directory available for all (new) users.
+      <para>If you want <application>Nano</application> to store
+        search and position log files, make sure that the directory 
+        <filename class="directory">$HOME/.local/share</filename> exists.
+        When using those settings in a system-wide configuration, you 
+        should update <filename class="directory">/etc/skel</filename> to
+        make the directory available for all (new) users.
       </para>
 

postlfs/filesystems/initramfs.xml

@@ -94 +94 @@
 binfiles="sh cat cp dd killall ls mkdir mknod mount "
 binfiles="$binfiles umount sed sleep ln rm uname"
+binfiles="$binfiles readlink basename"
 
 # Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
@@ -114 +115 @@
 
 # Create base directory structure
-mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc}
+mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc,usr}
 mkdir -p $WDIR/etc/{modprobe.d,udev/rules.d}
 touch $WDIR/etc/modprobe.d/modprobe.conf
 ln -s lib $WDIR/lib64
+ln -s ../bin $WDIR/usr/bin
 
 # Create necessary device nodes
@@ -154 +156 @@
 # Install basic binaries
 for f in $binfiles ; do
-  ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
-  copy $f bin
+  if [ -e /bin/$f ]; then d="/bin"; else d="/usr/bin"; fi
+  ldd $d/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
+  copy $d/$f bin
 done