|
|
http://perforce.freebsd.org/chv.cgi?CH=87115
Change 87115 by soc-andrew@soc-andrew_serv on 2005/11/23 06:19:51
IFC
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#4 integrate
..
//depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#5
integrate
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.514 2005/11/03 08:56:39 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.522 2005/11/22 20:47:43 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -237,7 +237,7 @@
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
-LIB32IMAKE= ${LIB32MAKE:NINSTALL=*}
+LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS
.endif
# install stage
@@ -252,6 +252,7 @@
# kernel stage
KMAKEENV= ${WMAKEENV}
+KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME}
#
# buildworld
@@ -476,14 +477,28 @@
kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
#
-# Use this to add checks to installworld/installkernel targets.
+# installcheck
+#
+# Checks to be sure system is ready for installworld/installkernel.
#
-SPECIAL_INSTALLCHECKS=
+installcheck:
#
-# installcheck
+# Require DESTDIR to be set if installing for a different architecture.
+#
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
+.if !make(distributeworld)
+installcheck: installcheck_DESTDIR
+installcheck_DESTDIR:
+.if !defined(DESTDIR) || empty(DESTDIR)
+ @echo "ERROR: Please set DESTDIR!"; \
+ false
+.endif
+.endif
+.endif
+
#
-# Checks to be sure system is ready for installworld
+# Check for missing UIDs/GIDs.
#
CHECK_UIDS=
CHECK_GIDS=
@@ -495,7 +510,8 @@
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
-installcheck: ${SPECIAL_INSTALLCHECKS}
+installcheck: installcheck_UGID
+installcheck_UGID:
.for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} >/dev/null 2>&1`; then \
echo "ERROR: Required ${uid} user is missing, see
/usr/src/UPDATING."; \
@@ -536,7 +552,7 @@
# and do a 'make reinstall' on the *client* to install new binaries from the
# most recent server build.
#
-reinstall: ${SPECIAL_INSTALLCHECKS}
+reinstall:
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
@@ -638,15 +654,13 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR}
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.2: rebuilding the object tree"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.3: build tools"
@@ -667,15 +681,13 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 3.1: making dependencies"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 3.2: building everything"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
@echo "--------------------------------------------------------------"
@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@@ -687,7 +699,7 @@
# Install the kernel defined by INSTALLKERNEL
#
installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
+reinstallkernel reinstallkernel.debug: installcheck
.if empty(INSTALLKERNEL)
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
false
@@ -965,8 +977,8 @@
_generic_libs+= kerberos5/lib
.endif
-_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
- lib/libkvm lib/libmd \
+_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+ lib/libipx lib/libkiconv lib/libkvm lib/libmd \
lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
lib/libradius \
lib/libsbuf lib/libtacplus lib/libutil \
@@ -979,8 +991,7 @@
.if !defined(NO_CRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
-lib/libradius__L: secure/lib/libssl__L
-secure/lib/libssl__L: secure/lib/libcrypto__L
+lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
.if !defined(NO_OPENSSH)
_prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
@@ -1083,15 +1094,14 @@
&& rm ${RM_I} "${DESTDIR}/${file}"))
.endfor
# Remove catpages without corresponding manpages.
- @for dir in ${DESTDIR}/usr/share/man/cat*; do \
- for catpage in $${dir}/*; do \
- manpage=$$(echo $${catpage} \
- | sed
's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:') \
- check_empty=$$(echo $${catpage} \
- | sed 's:.*\*:empty:'); \
- [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \
- && rm ${RM_I} $${catpage} || true; \
- done; \
+ @3<&0; \
+ find ${DESTDIR}/usr/share/man/cat* ! -type d | \
+ sed -ep
-e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
+ while read catpage; do \
+ read manpage; \
+ if [ ! -e "$${manpage}" ]; then \
+ rm ${RM_I} $${catpage} <&3 ; \
+ fi; \
done
@echo ">>> Old files removed"
@@ -1101,15 +1111,13 @@
@[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}"
.endfor
# Check for catpages without corresponding manpages.
- @for dir in ${DESTDIR}/usr/share/man/cat*; do \
- for catpage in $${dir}/*; do \
- manpage=$$(echo $${catpage} \
- | sed
's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:'); \
- check_empty=$$(echo $${catpage} \
- | sed 's:.*\*:empty:'); \
- [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \
- && echo $${catpage} || true; \
- done; \
+ @find ${DESTDIR}/usr/share/man/cat* ! -type d | \
+ sed -ep
-e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
+ while read catpage; do \
+ read manpage; \
+ if [ ! -e "$${manpage}" ]; then \
+ echo $${catpage} ; \
+ fi; \
done
delete-old-libs:
====
//depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#5
(text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.70 2005/10/25
04:32:42 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.71 2005/11/09
22:05:41 brueffer Exp $
#
#
@@ -64,7 +64,6 @@
de i386,pc98,alpha,ia64,amd64
dpt i386,ia64,amd64
ed i386,pc98
-em i386,pc98,alpha,ia64,amd64
ep i386,pc98,amd64
esp sparc64
ex i386,amd64
_______________________________________________
p4-projects@xxxxxxxxxxx mailing list
http://lists.freebsd.org/mailman/listinfo/p4-projects
To unsubscribe, send any mail to "p4-projects-unsubscribe@xxxxxxxxxxx"
|
|