PERFORCE change 40250 for review
Robert Watson
rwatson at FreeBSD.org
Thu Oct 23 02:45:05 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=40250
Change 40250 by rwatson at rwatson_paprika on 2003/10/22 19:44:14
Update top level bits for trustedbsd_mac at 39070: largely
dynamic root and make bits.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/Makefile.inc1#4 integrate
.. //depot/projects/trustedbsd/sebsd/UPDATING#4 integrate
Differences ...
==== //depot/projects/trustedbsd/sebsd/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.287 2003/08/06 11:06:38 ru Exp $
+# $FreeBSD: src/Makefile,v 1.289 2003/08/30 13:33:41 ru Exp $
#
# The user-driven targets are:
#
@@ -69,6 +69,7 @@
BITGTS= files includes
BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
+TGTS+= ${BITGTS}
.ORDER: buildworld installworld
.ORDER: buildworld distributeworld
@@ -87,9 +88,22 @@
_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1
#
+# Make sure we have an up-to-date make(1). Only world and buildworld
+# should do this as those are the initial targets used for upgrades.
+# The user can define ALWAYS_CHECK_MAKE to have this check performed
+# for all targets.
+#
+.if defined(ALWAYS_CHECK_MAKE)
+${TGTS}: upgrade_checks
+.else
+buildworld: upgrade_checks
+.endif
+
+#
# Handle the user-driven targets, using the source relative mk files.
#
-${TGTS} ${BITGTS}: upgrade_checks
+
+${TGTS}:
@cd ${.CURDIR}; \
${_MAKE} ${.TARGET}
==== //depot/projects/trustedbsd/sebsd/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.392 2003/09/16 12:53:18 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -51,6 +51,17 @@
SUBDIR+= lib
.endif
+# When upgrading to a dynamically linked root, install the runtime
+# linker early into its new location before make(1) has a chance
+# to run the dynamically linked /bin/sh.
+.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \
+ (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
+ !defined(DISTDIR) && \
+ (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \
+ !exists(/libexec/ld-elf.so.1)
+SUBDIR+= libexec/rtld-elf
+.endif
+
.if exists(${.CURDIR}/bin)
SUBDIR+= bin
.endif
@@ -123,9 +134,13 @@
MAKEOBJDIRPREFIX?= /usr/obj
.if !defined(OSRELDATE)
+.if exists(/usr/include/osreldate.h)
OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
/usr/include/osreldate.h
+.else
+OSRELDATE= 0
.endif
+.endif
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
@@ -223,6 +238,7 @@
# world stage
WMAKEENV= ${CROSSENV} \
DESTDIR=${WORLDTMP} \
+ _SHLIBDIRPREFIX=${WORLDTMP} \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
@@ -283,7 +299,7 @@
mkdir -p ${WORLDTMP}/legacy/${_dir}
.endfor
.for _dir in \
- usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
+ lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
usr/libexec usr/share/misc
mkdir -p ${WORLDTMP}/${_dir}
.endfor
@@ -293,33 +309,33 @@
_legacy:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 1: legacy release compatibility shims"
+ @echo ">>> stage 1.1: legacy release compatibility shims"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} legacy
_bootstrap-tools:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 1: bootstrap tools"
+ @echo ">>> stage 1.2: bootstrap tools"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} bootstrap-tools
_cleanobj:
.if !defined(NOCLEAN)
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 2: cleaning up the object tree"
+ @echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
.endif
_obj:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 2: rebuilding the object tree"
+ @echo ">>> stage 2.2: rebuilding the object tree"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} par-obj
_build-tools:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 2: build tools"
+ @echo ">>> stage 2.3: build tools"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${TMAKE} build-tools
_cross-tools:
@@ -331,26 +347,26 @@
_includes:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 4: populating ${WORLDTMP}/usr/include"
+ @echo ">>> stage 4.1: populating ${WORLDTMP}/usr/include"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes
_libraries:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 4: building libraries"
+ @echo ">>> stage 4.2: building libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \
libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 4: make dependencies"
+ @echo ">>> stage 4.3: make dependencies"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} par-depend
everything:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 4: building everything.."
+ @echo ">>> stage 4.4: building everything.."
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} par-all
@@ -384,13 +400,6 @@
false; \
fi
.endif
-.if ${TARGET_ARCH} == ${MACHINE_ARCH} && !defined(DISTDIR) && \
- (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/")
- @echo "Checking to see if your booted kernel is fresh enough.."
- ${.OBJDIR}/bin/sh/sh -c \
- 'echo "Testing installed kernel for new sigaction(2) syscall"'
- @echo "Seems ok.."
-.endif
#
# distributeworld
@@ -761,7 +770,7 @@
.if (!defined(NO_RESCUE) || \
defined(RELEASEDIR)) && \
- ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
+ (${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101)
_crunchide= usr.sbin/crunch/crunchide
.endif
@@ -816,8 +825,6 @@
# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
# shared libraries for ELF.
#
-# lib/libc (libc_pic.a) must be built before lib/libpthread.
-#
_startup_libs= gnu/lib/csu gnu/lib/libgcc
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
_startup_libs+= lib/csu/${MACHINE_ARCH}-elf
@@ -826,6 +833,7 @@
.endif
_prebuild_libs=
+
_generic_libs= gnu/lib
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
@@ -837,9 +845,6 @@
_generic_libs+= kerberos5/lib
.endif
-.if !defined(NOLIBPTHREAD)
-_prebuild_libs+= lib/libc
-.endif
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
lib/libkvm lib/libmd \
lib/libncurses lib/libopie lib/libpam lib/libradius \
==== //depot/projects/trustedbsd/sebsd/UPDATING#4 (text+ko) ====
@@ -17,6 +17,57 @@
developers choose to disable these features on build machines
to maximize performance.
+20030928:
+ Changes to the cdevsw default functions have been made to remove
+ the need to specify nullopen() and nullclose() explicitly.
+ __FreeBSD_version bumpted to 501110.
+
+20030926:
+ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and
+ mount_cd9660(8) need to be in sync with kernel.
+
+20030925:
+ Configuring a system to use IPFILTER now requires that PFIL_HOOKS
+ also be explicitly configured. Previously this dependency was
+ magically handled through some cruft in net/pfil.h; but that has
+ been removed. Building a kernel with IPFILTER but not PFIL_HOOKS
+ will fail with obtuse errors in ip_fil.c.
+
+20030923:
+ Fix a bug in arplookup(), whereby a hostile party on a locally
+ attached network could exhaust kernel memory, and cause a system
+ panic, by sending a flood of spoofed ARP requests. See
+ FreeBSD-SA-03:14.arp.
+
+20030915:
+ A change to /etc/defaults/rc.conf now causes inetd to be started
+ with `-C 60' if it is not overridden in /etc/rc.conf. This
+ causes inetd to stop accepting connections from an IP address
+ that exceeds the rate of 60 connections per minute.
+
+20030829:
+ The following rc.d scripts have been removed and should be
+ deleted from your installation: atm2.sh atm3.sh devdb
+ localdaemons network1 network2 network3. Depending on when
+ you last updated world and used mergemaster(8) you may or
+ may not have problems during the rc boot sequence. The simplest
+ solution is an 'rm -rf /etc/rc.d/*' and then 'mergemaster -i'.
+ The atm2.sh atm3.sh and devdb scripts were removed some time
+ ago, so depending on when you installed -CURRENT these scripts
+ may or may not exist on your system.
+
+20030824:
+ ATAng has been committed. You need to build world as sys/ata.h
+ has changed, and userland atacontrol depends on it.
+ If you use ATA SW raids you need "device ataraid" in your
+ kernel config file, as it is no longer pulled in automatically.
+
+20030819:
+ The OFW_NEWPCI option has been turned on in the Sparc64 GENERIC kernel.
+ Among other things, this changes the device enumeration to be
+ closer to Solaris. Be aware that, this can even cause the machine
+ to not boot without manual intervention before the fstab is adjusted.
+
20030728:
All current USB and Firewire quirks in da(4) have been deprecated
and will be removed for 5.2. If this causes failure for your
@@ -1333,4 +1384,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.260 2003/07/29 04:40:33 njl Exp $
+$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list