r3768 - jhalfs/branches/ablfs/LFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Dec 22 08:59:31 PST 2013


Author: pierre
Date: Sun Dec 22 08:59:31 2013
New Revision: 3768

Log:
merge trunk r3766

Modified:
   jhalfs/branches/ablfs/LFS/master.sh

Modified: jhalfs/branches/ablfs/LFS/master.sh
==============================================================================
--- jhalfs/branches/ablfs/LFS/master.sh	Sun Dec 22 00:04:06 2013	(r3767)
+++ jhalfs/branches/ablfs/LFS/master.sh	Sun Dec 22 08:59:31 2013	(r3768)
@@ -330,7 +330,8 @@
     # as a dependency. Also call the echo_message function.
     CHROOT_wrt_target "${this_script}" "$PREV"
 
-    # Find the bootscripts and kernel package names
+    # Find the bootscripts or networkscripts (for systemd)
+    # and kernel package names
     case "${this_script}" in
       *bootscripts)
             name="lfs-bootscripts"
@@ -340,6 +341,14 @@
             fi
             CHROOT_Unpack "$pkg_tarball"
         ;;
+      *network-scripts)
+            name="lfs-network-scripts"
+            pkg_tarball=$(get_package_tarball_name $name)
+            if [ "${INSTALL_LOG}" = "y" ] ; then
+              CHROOT_wrt_TouchTimestamp
+            fi
+            CHROOT_Unpack "$pkg_tarball"
+        ;;
       *kernel)
             name="linux"
             pkg_tarball=$(get_package_tarball_name $name)
@@ -366,14 +375,18 @@
     esac
 
     case "${this_script}" in
-      *bootscripts)  CHROOT_wrt_RemoveBuildDirs "dummy"
-                     if [ "${INSTALL_LOG}" = "y" ] ; then
-                       CHROOT_wrt_LogNewFiles "$name"
-                     fi ;;
-      *kernel)       CHROOT_wrt_RemoveBuildDirs "dummy"
-                     if [ "${INSTALL_LOG}" = "y" ] ; then
-                       CHROOT_wrt_LogNewFiles "$name"
-                     fi ;;
+      *bootscripts)      CHROOT_wrt_RemoveBuildDirs "dummy"
+                         if [ "${INSTALL_LOG}" = "y" ] ; then
+                           CHROOT_wrt_LogNewFiles "$name"
+                         fi ;;
+      *network-scripts)  CHROOT_wrt_RemoveBuildDirs "dummy"
+                         if [ "${INSTALL_LOG}" = "y" ] ; then
+                           CHROOT_wrt_LogNewFiles "$name"
+                         fi ;;
+      *kernel)           CHROOT_wrt_RemoveBuildDirs "dummy"
+                         if [ "${INSTALL_LOG}" = "y" ] ; then
+                           CHROOT_wrt_LogNewFiles "$name"
+                         fi ;;
     esac
 
     # Include a touch of the target name so make can check



More information about the alfs-log mailing list