Réorganisation des stages

[hvlinux.git] / stage2 / cis-coreutils

diff --git a/stage2/cis-coreutils b/stage2/cis-coreutils
index 941ee38..a421b65 100755 (executable)
--- a/stage2/cis-coreutils
+++ b/stage2/cis-coreutils
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -7,19 +9,20 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
-    --prefix=/usr &&
-make -j ${MAKEJOBS} &&
-make install &&
+    --prefix=/usr \
+    --enable-no-install-program=kill,uptime
+make -j ${MAKEJOBS}
+make install
 
 # Move some programs to their proper FHS locations:
-mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin &&
-mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin &&
-mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin &&
-mv -v /usr/bin/chroot /usr/sbin &&
+mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
+mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
+mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
+mv -v /usr/bin/chroot /usr/sbin
 
 # Some of the scripts in the LFS-Bootscripts package depend on head
 # sleep and nice. As /usr may not be available during the early stages