Changeset e5f5970 for CLFS/master.sh
- Timestamp:
- 07/03/2006 11:49:13 PM (18 years ago)
- Branches:
- 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 483ab89
- Parents:
- ac1d897
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/master.sh
rac1d897 re5f5970 42 42 025-addinguser: 024-creatingcrossdir 43 43 @\$(call echo_message, Building) 44 @if [ ! -d /home/ lfs ]; then \\45 groupadd lfs; \\46 useradd -s /bin/bash -g lfs -m -k /dev/nulllfs; \\44 @if [ ! -d /home/clfs ]; then \\ 45 groupadd clfs; \\ 46 useradd -s /bin/bash -g clfs -m -k /dev/null clfs; \\ 47 47 else \\ 48 touch user- lfs-exist; \\48 touch user-clfs-exist; \\ 49 49 fi; 50 @chown lfs \$(MOUNT_PT) && \\51 chown lfs \$(MOUNT_PT)/tools && \\52 chown lfs \$(MOUNT_PT)/cross-tools && \\53 chown lfs \$(MOUNT_PT)/sources && \\50 @chown clfs \$(MOUNT_PT) && \\ 51 chown clfs \$(MOUNT_PT)/tools && \\ 52 chown clfs \$(MOUNT_PT)/cross-tools && \\ 53 chown clfs \$(MOUNT_PT)/sources && \\ 54 54 touch \$@ && \\ 55 55 echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\ … … 58 58 026-settingenvironment: 025-addinguser 59 59 @\$(call echo_message, Building) 60 @if [ -f /home/ lfs/.bashrc -a ! -f /home/lfs/.bashrc.XXX ]; then \\61 mv /home/ lfs/.bashrc /home/lfs/.bashrc.XXX; \\60 @if [ -f /home/clfs/.bashrc -a ! -f /home/clfs/.bashrc.XXX ]; then \\ 61 mv /home/clfs/.bashrc /home/clfs/.bashrc.XXX; \\ 62 62 fi; 63 @if [ -f /home/ lfs/.bash_profile -a ! -f /home/lfs/.bash_profile.XXX ]; then \\64 mv /home/ lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\63 @if [ -f /home/clfs/.bash_profile -a ! -f /home/clfs/.bash_profile.XXX ]; then \\ 64 mv /home/clfs/.bash_profile /home/clfs/.bash_profile.XXX; \\ 65 65 fi; 66 @echo "set +h" > /home/ lfs/.bashrc && \\67 echo "umask 022" >> /home/ lfs/.bashrc && \\68 echo "CLFS=\$(MOUNT_PT)" >> /home/ lfs/.bashrc && \\69 echo "LC_ALL=POSIX" >> /home/ lfs/.bashrc && \\70 echo "PATH=/cross-tools/bin:/bin:/usr/bin" >> /home/ lfs/.bashrc && \\71 echo "export CLFS LC_ALL PATH" >> /home/ lfs/.bashrc && \\72 echo "" >> /home/ lfs/.bashrc && \\73 echo "unset CFLAGS" >> /home/ lfs/.bashrc && \\74 echo "unset CXXFLAGS" >> /home/ lfs/.bashrc && \\75 echo "" >> /home/ lfs/.bashrc && \\76 echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/ lfs/.bashrc && \\77 echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/ lfs/.bashrc && \\78 echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/ lfs/.bashrc && \\79 echo "source $JHALFSDIR/envars" >> /home/ lfs/.bashrc80 @chown lfs:lfs /home/lfs/.bashrc && \\66 @echo "set +h" > /home/clfs/.bashrc && \\ 67 echo "umask 022" >> /home/clfs/.bashrc && \\ 68 echo "CLFS=\$(MOUNT_PT)" >> /home/clfs/.bashrc && \\ 69 echo "LC_ALL=POSIX" >> /home/clfs/.bashrc && \\ 70 echo "PATH=/cross-tools/bin:/bin:/usr/bin" >> /home/clfs/.bashrc && \\ 71 echo "export CLFS LC_ALL PATH" >> /home/clfs/.bashrc && \\ 72 echo "" >> /home/clfs/.bashrc && \\ 73 echo "unset CFLAGS" >> /home/clfs/.bashrc && \\ 74 echo "unset CXXFLAGS" >> /home/clfs/.bashrc && \\ 75 echo "" >> /home/clfs/.bashrc && \\ 76 echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/clfs/.bashrc && \\ 77 echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/clfs/.bashrc && \\ 78 echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/clfs/.bashrc && \\ 79 echo "source $JHALFSDIR/envars" >> /home/clfs/.bashrc 80 @chown clfs:clfs /home/clfs/.bashrc && \\ 81 81 touch envars && \\ 82 82 touch \$@ && \\ … … 132 132 # If $pkg_tarball isn't empty, we've got a package... 133 133 # 134 [[ "$pkg_tarball" != "" ]] && wrt_unpack "$pkg_tarball"135 # 136 wrt_run_as_ su "${this_script}" "${file}"134 [[ "$pkg_tarball" != "" ]] && wrt_unpack_clfs "$pkg_tarball" 135 # 136 wrt_run_as_clfs_su "${this_script}" "${file}" 137 137 # 138 138 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}" … … 191 191 # Insert instructions for unpacking the package and to set the PKGDIR variable. 192 192 # 193 [[ "$pkg_tarball" != "" ]] && wrt_unpack "$pkg_tarball"193 [[ "$pkg_tarball" != "" ]] && wrt_unpack_clfs "$pkg_tarball" 194 194 [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 195 195 # 196 wrt_run_as_ su "${this_script}" "${file}"196 wrt_run_as_clfs_su "${this_script}" "${file}" 197 197 # 198 198 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}" … … 263 263 # Insert instructions for unpacking the package and changing directories 264 264 # 265 [[ "$pkg_tarball" != "" ]] && wrt_unpack "$pkg_tarball"265 [[ "$pkg_tarball" != "" ]] && wrt_unpack_clfs "$pkg_tarball" 266 266 [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 267 267 # … … 273 273 wrt_copy_fstab "${this_script}" 274 274 else 275 wrt_run_as_ su "${this_script}" "${file}"275 wrt_run_as_clfs_su "${this_script}" "${file}" 276 276 fi 277 277 ;; 278 *) wrt_run_as_ su "${this_script}" "${file}" ;;278 *) wrt_run_as_clfs_su "${this_script}" "${file}" ;; 279 279 esac 280 280 # … … 333 333 if [ "$pkg_tarball" != "" ] ; then 334 334 case $this_script in 335 *util-linux) wrt_unpack "$pkg_tarball" ;;335 *util-linux) wrt_unpack_clfs "$pkg_tarball" ;; 336 336 *) wrt_unpack2 "$pkg_tarball" ;; 337 337 esac … … 342 342 case $this_script in 343 343 *kernfs) wrt_run_as_clfs_root "${this_script}" "${file}" ;; 344 *util-linux) wrt_run_as_ su"${this_script}" "${file}" ;;344 *util-linux) wrt_run_as_clfs_s "${this_script}" "${file}" ;; 345 345 *) wrt_run_as_chroot1 "${this_script}" "${file}" ;; 346 346 esac … … 1064 1064 1065 1065 clean-chapter2: 1066 -if [ ! -f user- lfs-exist ]; then \\1067 userdel lfs; \\1068 rm -rf /home/ lfs; \\1066 -if [ ! -f user-clfs-exist ]; then \\ 1067 userdel clfs; \\ 1068 rm -rf /home/clfs; \\ 1069 1069 fi; 1070 1070 rm -rf \$(MOUNT_PT)/tools … … 1072 1072 rm -rf \$(MOUNT_PT)/cross-tools 1073 1073 rm -f /cross-tools 1074 rm -f envars user- lfs-exist1074 rm -f envars user-clfs-exist 1075 1075 rm -f 02* logs/02*.log 1076 1076 1077 1077 clean-chapter3: 1078 1078 rm -rf \$(MOUNT_PT)/tools/* 1079 rm -f $cross_tools restore- lfs-env sources-dir1079 rm -f $cross_tools restore-clfs-env sources-dir 1080 1080 cd logs && rm -f $cross_tools && cd .. 1081 1081 … … 1091 1091 1092 1092 1093 restore- lfs-env:1093 restore-clfs-env: 1094 1094 @\$(call echo_message, Building) 1095 @if [ -f /home/ lfs/.bashrc.XXX ]; then \\1096 mv -f /home/ lfs/.bashrc.XXX /home/lfs/.bashrc; \\1095 @if [ -f /home/clfs/.bashrc.XXX ]; then \\ 1096 mv -f /home/clfs/.bashrc.XXX /home/clfs/.bashrc; \\ 1097 1097 fi; 1098 @if [ -f /home/ lfs/.bash_profile.XXX ]; then \\1099 mv /home/ lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\1098 @if [ -f /home/clfs/.bash_profile.XXX ]; then \\ 1099 mv /home/clfs/.bash_profile.XXX /home/clfs/.bash_profile; \\ 1100 1100 fi; 1101 @chown lfs:lfs /home/lfs/.bash* && \\1101 @chown clfs:clfs /home/clfs/.bash* && \\ 1102 1102 touch \$@ && \\ 1103 1103 echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\ … … 1110 1110 @-umount \$(MOUNT_PT)/sys 1111 1111 @-umount \$(MOUNT_PT)/proc 1112 @-if [ ! -f user- lfs-exist ]; then \\1113 userdel lfs; \\1114 rm -rf /home/ lfs; \\1112 @-if [ ! -f user-clfs-exist ]; then \\ 1113 userdel clfs; \\ 1114 rm -rf /home/clfs; \\ 1115 1115 fi; 1116 1116 … … 1146 1146 1147 1147 clean-jhalfs: 1148 -if [ ! -f user- lfs-exist ]; then \\1149 userdel lfs; \\1150 rm -rf /home/ lfs; \\1148 -if [ ! -f user-clfs-exist ]; then \\ 1149 userdel clfs; \\ 1150 rm -rf /home/clfs; \\ 1151 1151 fi; 1152 1152 rm -rf \$(MOUNT_PT)/tools … … 1154 1154 rm -rf \$(MOUNT_PT)/cross-tools 1155 1155 rm -f /cross-tools 1156 rm -f envars user- lfs-exist1156 rm -f envars user-clfs-exist 1157 1157 rm -f 02* logs/02*.log 1158 1158 … … 1160 1160 rm -rf /tools/* 1161 1161 rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools 1162 rm -f restore- lfs-env sources-dir1162 rm -f restore-clfs-env sources-dir 1163 1163 cd logs && rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools && cd .. 1164 1164 … … 1176 1176 1177 1177 1178 restore- lfs-env:1178 restore-clfs-env: 1179 1179 @\$(call echo_message, Building) 1180 @if [ -f /home/ lfs/.bashrc.XXX ]; then \\1181 mv -fv /home/ lfs/.bashrc.XXX /home/lfs/.bashrc; \\1180 @if [ -f /home/clfs/.bashrc.XXX ]; then \\ 1181 mv -fv /home/clfs/.bashrc.XXX /home/clfs/.bashrc; \\ 1182 1182 fi; 1183 @if [ -f /home/ lfs/.bash_profile.XXX ]; then \\1184 mv -v /home/ lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\1183 @if [ -f /home/clfs/.bash_profile.XXX ]; then \\ 1184 mv -v /home/clfs/.bash_profile.XXX /home/clfs/.bash_profile; \\ 1185 1185 fi; 1186 @chown lfs:lfs /home/lfs/.bash* && \\1186 @chown clfs:clfs /home/clfs/.bash* && \\ 1187 1187 touch \$@ && \\ 1188 1188 echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
Note:
See TracChangeset
for help on using the changeset viewer.