Changeset 73ace20 for BOOK/boot/multilib

Timestamp:

Oct 10, 2012, 6:42:21 PM (13 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/boot/multilib

Files:

• createfiles.xml (modified) (1 diff)
• creatingdirs.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)
• flags.xml (added)
• grub-build.xml (added)
• kmod.xml (added)
• module-init-tools.xml (deleted)
• shadow.xml (added)
• udev.xml (modified) (1 diff)
• util-linux.xml (modified) (2 diffs)

BOOK/boot/multilib/createfiles.xml

@@ -15 +15 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,sleep,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,sleep,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
+ln -sv /tools/sbin/{agetty,blkid} ${CLFS}/sbin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
 ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
 ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
 ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
-ln -sv bash ${CLFS}/bin/sh</userinput></screen>
+ln -sv bash ${CLFS}/bin/sh
+ln -sv ../run ${CLFS}/var/run</userinput></screen>
 
 </sect1>

BOOK/boot/multilib/creatingdirs.xml

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

BOOK/boot/multilib/e2fsprogs.xml

@@ -55 +55 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
+    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
+    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/multilib/udev.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" ./configure --prefix=/usr \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-    --libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
+    BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+    KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
+    --libdir=/usr/lib64 --disable-introspection \
+    --with-usb-ids-path=no --with-pci-ids-path=no \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
+    --with-firmware-path=/lib/firmware</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/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="../../chroot/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../chroot/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -31 +39 @@
     --prefix=/tools --exec-prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+    --libdir=/tools/lib64 --disable-makeinstall-chown --config-cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"