Changeset 73ace20 for BOOK/chroot/multilib

Timestamp:

Oct 10, 2012, 6:42:21 PM (14 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

Location:

BOOK/chroot/multilib

Files:

• createfiles.xml (modified) (1 diff)
• creatingdirs.xml (modified) (1 diff)
• util-linux.xml (modified) (2 diffs)

BOOK/chroot/multilib/createfiles.xml

@@ -21 +21 @@
 ln -sv /tools/lib/libstd* /usr/lib
 ln -sv /tools/lib64/libstd* /usr/lib64
-ln -sv bash /bin/sh</userinput></screen>
+ln -sv bash /bin/sh
+ln -sv /run /var/run</userinput></screen>
 
 </sect1>

BOOK/chroot/multilib/creatingdirs.xml

@@ -16 +16 @@
 
 <screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,run,spool}
+mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
+mkdir -pv /var/{lock,log,mail,spool}
 mkdir -pv /var/{opt,cache,lib{,64}/{misc,locate},local}
 install -dv /root -m 0750

BOOK/chroot/multilib/util-linux.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -29 +37 @@
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown</userinput></screen>
+    --disable-makeinstall-chown --config-cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"