zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge trunk r3766

Browse source
This commit is contained in:
Pierre Labastie 2013-12-22 16:59:31 +00:00
parent dda2496778
commit f5337a92d7
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
LFS/master.sh
View file

@ -330,7 +330,8 @@ chapter78_Makefiles() {
# as a dependency. Also call the echo_message function. # as a dependency. Also call the echo_message function.
CHROOT_wrt_target "${this_script}" "$PREV" 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 case "${this_script}" in
*bootscripts) *bootscripts)
name="lfs-bootscripts" name="lfs-bootscripts"
@ -340,6 +341,14 @@ chapter78_Makefiles() {
fi fi
CHROOT_Unpack "$pkg_tarball" 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) *kernel)
name="linux" name="linux"
pkg_tarball=$(get_package_tarball_name $name) pkg_tarball=$(get_package_tarball_name $name)
@ -366,14 +375,18 @@ chapter78_Makefiles() {
esac esac
case "${this_script}" in case "${this_script}" in
*bootscripts) CHROOT_wrt_RemoveBuildDirs "dummy" *bootscripts) CHROOT_wrt_RemoveBuildDirs "dummy"
if [ "${INSTALL_LOG}" = "y" ] ; then if [ "${INSTALL_LOG}" = "y" ] ; then
CHROOT_wrt_LogNewFiles "$name" CHROOT_wrt_LogNewFiles "$name"
fi ;; fi ;;
*kernel) CHROOT_wrt_RemoveBuildDirs "dummy" *network-scripts) CHROOT_wrt_RemoveBuildDirs "dummy"
if [ "${INSTALL_LOG}" = "y" ] ; then if [ "${INSTALL_LOG}" = "y" ] ; then
CHROOT_wrt_LogNewFiles "$name" CHROOT_wrt_LogNewFiles "$name"
fi ;; fi ;;
*kernel) CHROOT_wrt_RemoveBuildDirs "dummy"
if [ "${INSTALL_LOG}" = "y" ] ; then
CHROOT_wrt_LogNewFiles "$name"
fi ;;
esac esac
# Include a touch of the target name so make can check # Include a touch of the target name so make can check