- Timestamp:
- 09/13/2006 08:04:46 PM (18 years ago)
- Branches:
- experimental
- Children:
- 496f8f3
- Parents:
- 786e86c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/master.sh
r786e86c r7d4cc81 172 172 @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\ 173 173 touch envars && \\ 174 chmod -R a+wt \$(MOUNT_PT) && \\ 174 175 chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\ 175 176 touch \$@ && \\ … … 320 321 # the names of the targets in the Makefile 321 322 case "${this_script}" in 322 *util-linux) :;;323 *kernfs) orphan_scripts="${orphan_scripts} ${this_script}" ;;324 *) chroottools="$chroottools $this_script";;323 *util-linux) orphan_scripts="${orphan_scripts} ${this_script}" ;; 324 *kernfs) orphan_scripts="${orphan_scripts} ${this_script}" ;; 325 *) chroottools="$chroottools $this_script" ;; 325 326 esac 326 327 … … 1182 1183 cat << EOF 1183 1184 1184 all: mk_SETUP mk_CROSS mk_TEMP restore_luser_env mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE do-housekeeping 1185 all: ck_UID mk_SETUP mk_CROSS mk_TEMP mk_SUDO mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE 1186 @sudo make do-housekeeping 1185 1187 @\$(call echo_finished,$VERSION) 1188 1189 ck_UID: 1190 @if [ \`id -u\` = "0" ]; then \\ 1191 echo "--------------------------------------------------"; \\ 1192 echo "You cannot run this makefile from the root account"; \\ 1193 echo "--------------------------------------------------"; \\ 1194 exit 1; \\ 1195 fi 1186 1196 1187 1197 #---------------AS ROOT … … 1194 1204 mk_CROSS: mk_SETUP 1195 1205 @\$(call echo_PHASE,Cross Tool) 1196 @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" )1206 @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" ) 1197 1207 @touch \$@ 1198 1208 1199 1209 mk_TEMP: mk_CROSS 1200 1210 @\$(call echo_PHASE,Temporary Tools) 1201 @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" ) 1202 @touch \$@ 1203 1211 @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" ) 1212 @sudo make restore-luser-env 1213 @touch \$@ 1214 1215 mk_SUDO: mk_TEMP 1216 @sudo make SUDO 1217 @touch \$@ 1204 1218 # 1205 1219 # The convoluted piece of code below is necessary to provide 'make' with a valid shell in the … … 1210 1224 1211 1225 #---------------CHROOT JAIL 1212 mk_SYSTOOLS: mk_ TEMP $orphan_scripts1226 mk_SYSTOOLS: mk_SUDO 1213 1227 @mkdir \$(MOUNT_PT)/bin && \\ 1214 1228 cd \$(MOUNT_PT)/bin && \\ … … 1246 1260 cat << EOF 1247 1261 1248 all: mk_SETUP mk_CROSS mk_TEMP mk_SYSTOOLS $orphan_scripts restore-luser-env 1262 all: ck_UID mk_SETUP mk_CROSS mk_TEMP mk_SYSTOOLS mk_SUDO 1263 @sudo make restore-luser-env 1249 1264 @\$(call echo_boot_finished,$VERSION) 1250 1265 1251 1266 makesys: mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE 1252 1267 @\$(call echo_finished,$VERSION) 1268 1269 1270 ck_UID: 1271 @if [ \`id -u\` = "0" ]; then \\ 1272 echo "--------------------------------------------------"; \\ 1273 echo "You cannot run this makefile from the root account"; \\ 1274 echo "--------------------------------------------------"; \\ 1275 exit 1; \\ 1276 fi 1253 1277 1254 1278 #---------------AS ROOT … … 1263 1287 mk_CROSS: mk_SETUP 1264 1288 @\$(call echo_PHASE,Cross Tool) 1265 @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" )1289 @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" ) 1266 1290 @touch \$@ 1267 1291 1268 1292 mk_TEMP: mk_CROSS 1269 1293 @\$(call echo_PHASE,Temporary Tools) 1270 @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" )1294 @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" ) 1271 1295 @touch \$@ 1272 1296 1273 1297 mk_SYSTOOLS: mk_TEMP 1274 1298 @\$(call echo_PHASE,Minimal Boot system) 1275 @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SYSTOOLS" ) 1299 @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SYSTOOLS" ) 1300 @touch \$@ 1301 1302 mk_SUDO: mk_SYSTOOLS 1303 @sudo make SUDO 1276 1304 @touch \$@ 1277 1305 … … 1303 1331 CROSS: $cross_tools 1304 1332 TEMP: $temptools 1333 SUDO: $orphan_scripts 1305 1334 SYSTOOLS: ${chroottools}${boottools} 1306 1335 FINAL: $testsuitetools $basicsystem
Note:
See TracChangeset
for help on using the changeset viewer.