r3099 - in jhalfs/branches/experimental: CLFS2 LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Sep 11 04:18:03 PDT 2006


Author: manuel
Date: 2006-09-11 05:18:01 -0600 (Mon, 11 Sep 2006)
New Revision: 3099

Modified:
   jhalfs/branches/experimental/CLFS2/master.sh
   jhalfs/branches/experimental/LFS/master.sh
Log:
Removed remainig clean targets.

Modified: jhalfs/branches/experimental/CLFS2/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS2/master.sh	2006-09-03 15:56:19 UTC (rev 3098)
+++ jhalfs/branches/experimental/CLFS2/master.sh	2006-09-11 11:18:01 UTC (rev 3099)
@@ -152,7 +152,7 @@
         ;;
       *) ;;
     esac
-    
+
     #
     # Set the dependency for the first target.
     if [ -z $PREV ] ; then PREV=028-creating-sysfile ; fi
@@ -359,7 +359,7 @@
     #  phase.
     case ${this_script} in
       *chowning) chowning=${this_script}   ;;
-              *) bootable="$bootable $this_script"  ;;      
+              *) bootable="$bootable $this_script"  ;;
     esac
     #
     # Grab the name of the target, strip id number and misc words.
@@ -472,7 +472,7 @@
 	@\$(call echo_SU_request)
 	@sudo make SETUP
 	@touch \$@
-	
+
 mk_LUSER: mk_SETUP
 	@\$(call echo_SULUSER_request)
 	@( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
@@ -488,13 +488,9 @@
 
 ROOT:	$chowning
 
-clean-all:  clean
-	rm -rf ./{clfs2-commands,logs,Makefile,*.xsl,makefile-functions,packages,patches}
 
-clean:
-
 restart:
-	@echo "This feature does not exist for the CLFS makefile. (yet)"
+	@echo "This feature does not exist for the CLFS-2 makefile. (yet)"
 
 restore-luser-env:
 	@\$(call echo_message, Building)

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-09-03 15:56:19 UTC (rev 3098)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-09-11 11:18:01 UTC (rev 3099)
@@ -97,7 +97,7 @@
     # the names of the targets in the Makefile
     # DO NOT append the changingowner script.
     # A hack is necessary: create script in chap5 BUT run as a dependency for
-    #  chap6 CHROOT 
+    #  chap6 CHROOT
     case "${this_script}" in
       *changingowner) : ;;
                    *) chapter5="$chapter5 ${this_script}" ;;
@@ -362,12 +362,12 @@
 #----------------------------#
 
   echo "Creating Makefile... ${BOLD}START${OFF}"
-  
+
   cd $JHALFSDIR/${PROGNAME}-commands
 
   # Start with a clean Makefile.tmp file
   >$MKFILE
-  
+
   chapter4_Makefiles
   chapter5_Makefiles
   chapter6_Makefiles
@@ -443,7 +443,7 @@
 	@\$(call echo_SU_request)
 	@sudo make SETUP
 	@touch \$@
-	
+
 mk_LUSER: mk_SETUP
 	@\$(call echo_SULUSER_request)
 	@( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
@@ -452,7 +452,7 @@
 # The convoluted piece of code below is necessary to provide 'make' with a valid shell in the
 # chroot environment. (Unless someone knows a different way)
 # Manually create the /bin directory and provide link to the /tools dir.
-# Also change the original symlink creation to include (f)orce to prevent failure due to 
+# Also change the original symlink creation to include (f)orce to prevent failure due to
 #  pre-existing links.
 #
 mk_CHROOT: mk_LUSER 057-changingowner 059-kernfs
@@ -464,12 +464,12 @@
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@
 
-mk_BOOT: mk_CHROOT 
+mk_BOOT: mk_CHROOT
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BOOT")
 	@touch \$@
-	
 
+
 SETUP:	$chapter4
 
 LUSER:	$chapter5
@@ -479,43 +479,8 @@
 BOOT:	$chapter789
 
 
-
-clean-all:  clean
-	rm -rf ./{lfs-commands,logs,Makefile,*.xsl,makefile-functions,packages,patches}
-
-clean:  clean-chapter789 clean-chapter6 clean-chapter5 clean-chapter4
-
 restart: restart_code all
 
-clean-chapter4:
-	-if [ ! -f luser-exist ]; then \\
-		userdel \$(LUSER); \\
-		rm -rf /home/\$(LUSER); \\
-	fi;
-	rm -rf \$(MOUNT_PT)/tools
-	rm -f /tools
-	rm -f envars luser-exist
-	rm -f 02* logs/02*.log
-
-clean-chapter5:
-	rm -rf \$(MOUNT_PT)/tools/*
-	rm -f $chapter5 restore-luser-env sources-dir
-	cd logs && rm -f $chapter5 && cd ..
-
-clean-chapter6:
-	-umount \$(MOUNT_PT)/sys
-	-umount \$(MOUNT_PT)/proc
-	-umount \$(MOUNT_PT)/dev/shm
-	-umount \$(MOUNT_PT)/dev/pts
-	-umount \$(MOUNT_PT)/dev
-	rm -rf \$(MOUNT_PT)/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc,root,sbin,srv,sys,tmp,usr,var}
-	rm -f $chapter6
-	cd logs && rm -f $chapter6 && cd ..
-
-clean-chapter789:
-	rm -f $chapter789
-	cd logs && rm -f $chapter789 && cd ..
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\




More information about the alfs-log mailing list