|
Lines 265-271
Link Here
|
| 265 |
while getopts ":ascrvhipCPm:t:du:w:D:A:U" COMMAND_LINE_ARGUMENT ; do |
265 |
while getopts ":ascrvhipCPm:t:du:w:D:A:U" COMMAND_LINE_ARGUMENT ; do |
| 266 |
case "${COMMAND_LINE_ARGUMENT}" in |
266 |
case "${COMMAND_LINE_ARGUMENT}" in |
| 267 |
A) |
267 |
A) |
| 268 |
ARCHSTRING='MACHINE_ARCH='${OPTARG} |
268 |
ARCHSTRING='TARGET_ARCH='${OPTARG} |
| 269 |
;; |
269 |
;; |
| 270 |
U) |
270 |
U) |
| 271 |
AUTO_UPGRADE=yes |
271 |
AUTO_UPGRADE=yes |
|
Lines 412-418
Link Here
|
| 412 |
|
412 |
|
| 413 |
# Assign the source directory |
413 |
# Assign the source directory |
| 414 |
# |
414 |
# |
| 415 |
SOURCEDIR=${SOURCEDIR:-/usr/src/etc} |
415 |
SOURCEDIR=${SOURCEDIR:-/usr/src} |
|
|
416 |
if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ |
| 417 |
-f ${SOURCEDIR}/../Makefile.inc1 ]; then |
| 418 |
echo " *** The source directory you specified (${SOURCEDIR})" |
| 419 |
echo " will be reset to ${SOURCEDIR}/.." |
| 420 |
echo '' |
| 421 |
sleep 3 |
| 422 |
SOURCEDIR=${SOURCEDIR}/.. |
| 423 |
fi |
| 416 |
|
424 |
|
| 417 |
# Check DESTDIR against the mergemaster mtree database to see what |
425 |
# Check DESTDIR against the mergemaster mtree database to see what |
| 418 |
# files the user changed from the reference files. |
426 |
# files the user changed from the reference files. |
|
Lines 556-563
Link Here
|
| 556 |
;; |
564 |
;; |
| 557 |
esac |
565 |
esac |
| 558 |
make DESTDIR=${TEMPROOT} ${ARCHSTRING} distrib-dirs && |
566 |
make DESTDIR=${TEMPROOT} ${ARCHSTRING} distrib-dirs && |
| 559 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} obj && |
567 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} obj SUBDIR_OVERRIDE=etc && |
| 560 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} all && |
568 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} all SUBDIR_OVERRIDE=etc && |
| 561 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} \ |
569 |
MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} \ |
| 562 |
DESTDIR=${TEMPROOT} distribution;} || |
570 |
DESTDIR=${TEMPROOT} distribution;} || |
| 563 |
{ echo ''; |
571 |
{ echo ''; |
|
Lines 569-576
Link Here
|
| 569 |
*) |
577 |
*) |
| 570 |
# Only set up files that are crucial to {build|install}world |
578 |
# Only set up files that are crucial to {build|install}world |
| 571 |
{ mkdir -p ${TEMPROOT}/etc && |
579 |
{ mkdir -p ${TEMPROOT}/etc && |
| 572 |
cp -p ${SOURCEDIR}/master.passwd ${TEMPROOT}/etc && |
580 |
cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && |
| 573 |
cp -p ${SOURCEDIR}/group ${TEMPROOT}/etc;} || |
581 |
cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} || |
| 574 |
{ echo ''; |
582 |
{ echo ''; |
| 575 |
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; |
583 |
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; |
| 576 |
echo ''; |
584 |
echo ''; |
|
Lines 647-653
Link Here
|
| 647 |
echo '' |
655 |
echo '' |
| 648 |
echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" |
656 |
echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script" |
| 649 |
echo " installs all files with the same user, group and modes that" |
657 |
echo " installs all files with the same user, group and modes that" |
| 650 |
echo " they are created with by ${SOURCEDIR}/Makefile, compared to" |
658 |
echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to" |
| 651 |
echo " a umask of 022. This umask allows world read permission when" |
659 |
echo " a umask of 022. This umask allows world read permission when" |
| 652 |
echo " the file's default permissions have it." |
660 |
echo " the file's default permissions have it." |
| 653 |
echo '' |
661 |
echo '' |
|
Lines 897-903
Link Here
|
| 897 |
fi |
905 |
fi |
| 898 |
|
906 |
|
| 899 |
# Using -size +0 avoids uselessly checking the empty log files created |
907 |
# Using -size +0 avoids uselessly checking the empty log files created |
| 900 |
# by ${SOURCEDIR}/Makefile and the device entries in ./dev, but does |
908 |
# by ${SOURCEDIR}/etc/Makefile and the device entries in ./dev, but does |
| 901 |
# check the scripts in ./dev, as we'd like (assuming no devfs of course). |
909 |
# check the scripts in ./dev, as we'd like (assuming no devfs of course). |
| 902 |
# |
910 |
# |
| 903 |
for COMPFILE in `find . -type f -size +0`; do |
911 |
for COMPFILE in `find . -type f -size +0`; do |
|
Lines 1180-1186
Link Here
|
| 1180 |
case "${PRE_WORLD}" in |
1188 |
case "${PRE_WORLD}" in |
| 1181 |
'') ;; |
1189 |
'') ;; |
| 1182 |
*) |
1190 |
*) |
| 1183 |
MAKE_CONF="${SOURCEDIR%etc}share/examples/etc/make.conf" |
1191 |
MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf" |
| 1184 |
|
1192 |
|
| 1185 |
(echo '' |
1193 |
(echo '' |
| 1186 |
echo '*** Comparing make variables' |
1194 |
echo '*** Comparing make variables' |