svn commit: r206515 - user/imp/tbemd

Warner Losh imp at FreeBSD.org
Mon Apr 12 23:03:25 UTC 2010


Author: imp
Date: Mon Apr 12 23:03:24 2010
New Revision: 206515
URL: http://svn.freebsd.org/changeset/base/206515

Log:
  Merge from head (part 1 of many)

Modified:
  user/imp/tbemd/MAINTAINERS
  user/imp/tbemd/Makefile
  user/imp/tbemd/Makefile.inc1
  user/imp/tbemd/ObsoleteFiles.inc
  user/imp/tbemd/UPDATING

Modified: user/imp/tbemd/MAINTAINERS
==============================================================================
--- user/imp/tbemd/MAINTAINERS	Mon Apr 12 21:42:01 2010	(r206514)
+++ user/imp/tbemd/MAINTAINERS	Mon Apr 12 23:03:24 2010	(r206515)
@@ -36,8 +36,6 @@ pci bus		imp,jhb	Pre-commit review reque
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.
 witness		jhb	Pre-commit review requested.
-twe		aradford at amcc.com	Pre-commit review requested
-twa		aradford at amcc.com	Pre-commit review requested
 CAM		gibbs,
 		ken	Pre-commit review requested. send to scsi at freebsd.org
 devstat(9)	ken	Pre-commit review requested.
@@ -59,15 +57,12 @@ libfetch	des	Advance notification reques
 fetch		des	Advance notification requested.
 libpam		des	Pre-commit review requested.
 openssh		des	Pre-commit review requested.
-pseudofs	des	Advance notification requested.
-procfs		des	Advance notification requested.
-linprocfs	des	Advance notification requested.
+pseudofs	des	Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
-pkill		gad	Heads-up appreciated.
-ps		gad	I am working on a number of changes to this.  Would
-			like advance notice of major changes planned to it.
 cvs		peter	Heads-up appreciated, try not to break it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
@@ -76,9 +71,6 @@ share/mk	ru	This is a vital component of
 			offer a pre-commit review for anything non-trivial.
 ipfw		ipfw	Pre-commit review preferred. send to ipfw at freebsd.org
 drm		rnoland	Just keep me informed of changes, try not to break it.
-libufs		jmallett	Willing to handle problems, help with work.
-fdc(4)		joerg	Just keep me informed of changes, try not to break it.
-sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 unifdef(1)	fanf	Pre-commit review requested.
 ntp         	roberto	Pre-commit review requested.
 inetd		dwmalone	Recommends pre-commit review.
@@ -131,6 +123,9 @@ usr.sbin/zic		edwin   Heads-up appreciat
 				maintained by a third party source.
 lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
 				is maintained by a third party source.
+sysinstall	randi	Please contact about any major changes so that
+			they can be co-ordinated.
+sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 
 Following are the entries from the Makefiles, and a few other sources.
 Please remove stale entries from both their origin, and this file.
@@ -144,4 +139,3 @@ $ cd /usr/src; find */* -type f|xargs eg
 sys/modules/3dfx/Makefile:MAINTAINER=	cokane at FreeBSD.org
 sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi at ca2.so-net.ne.jp>
 tools/tools/sysdoc/Makefile:MAINTAINER=	trhodes at FreeBSD.org
-usr.sbin/zic/Makefile:MAINTAINER=	wollman at FreeBSD.org

Modified: user/imp/tbemd/Makefile
==============================================================================
--- user/imp/tbemd/Makefile	Mon Apr 12 21:42:01 2010	(r206514)
+++ user/imp/tbemd/Makefile	Mon Apr 12 23:03:24 2010	(r206515)
@@ -311,6 +311,7 @@ universe_${target}:
 	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
+.if !defined(MAKE_JUST_WORLDS)
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
 	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -319,6 +320,7 @@ universe_${target}:
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
+.endif
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe_kernels: universe_kernconfs

Modified: user/imp/tbemd/Makefile.inc1
==============================================================================
--- user/imp/tbemd/Makefile.inc1	Mon Apr 12 21:42:01 2010	(r206514)
+++ user/imp/tbemd/Makefile.inc1	Mon Apr 12 23:03:24 2010	(r206515)
@@ -281,6 +281,7 @@ LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTRE
 		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		CC="${CC} ${LIB32FLAGS}" \
@@ -1257,7 +1258,7 @@ delete-old-files:
 	@echo ">>> Removing old files (only deletes safe to delete libs)"
 # Ask for every old file if the user really wants to remove it.
 # It's annoying, but better safe than sorry.
-	@for file in ${OLD_FILES}; do \
+	@for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}"; \
@@ -1277,7 +1278,7 @@ delete-old-files:
 
 check-old-files:
 	@echo ">>> Checking for old files"
-	@for file in ${OLD_FILES}; do \
+	@for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 		 	echo "${DESTDIR}/$${file}"; \
 		fi; \

Modified: user/imp/tbemd/ObsoleteFiles.inc
==============================================================================
--- user/imp/tbemd/ObsoleteFiles.inc	Mon Apr 12 21:42:01 2010	(r206514)
+++ user/imp/tbemd/ObsoleteFiles.inc	Mon Apr 12 23:03:24 2010	(r206515)
@@ -14,6 +14,23 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100326: [ia64] removed <machine/nexusvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
+# 20100314: removal of regexp.h
+OLD_FILES+=usr/include/regexp.h
+OLD_FILES+=usr/share/man/man3/regexp.3.gz
+OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h>

Modified: user/imp/tbemd/UPDATING
==============================================================================
--- user/imp/tbemd/UPDATING	Mon Apr 12 21:42:01 2010	(r206514)
+++ user/imp/tbemd/UPDATING	Mon Apr 12 23:03:24 2010	(r206515)
@@ -22,6 +22,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20100402:
+	WITH_CTF can now be specified in src.conf (not recommended, there
+	are some problems with static executables), make.conf (would also
+	affect ports which do not use GNU make and do not override the
+	compile targets) or in the kernel config (via "makeoptions
+	WITH_CTF=yes").
+	When WITH_CTF was specified there before this was silently ignored,
+	so make sure that WITH_CTF is not used in places which could lead
+	to unwanted behavior.
+
+20100311:
+	The kernel option COMPAT_IA32 has been replaced with COMPAT_FREEBSD32
+	to allow 32-bit compatibility on non-x86 platforms. All kernel
+	configurations on amd64 and ia64 platforms using these options must
+	be modified accordingly.
+
 20100113:
 	The utmp user accounting database has been replaced with utmpx,
 	the user accounting interface standardized by POSIX.
@@ -497,7 +513,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 
 20090313:
 	The k8temp(4) driver has been renamed to amdtemp(4) since
-	support for K10 and K11 CPU families was added.
+	support for Family 10 and Family 11 CPU families was added.
 
 20090309:
 	IGMPv3 and Source-Specific Multicast (SSM) have been merged
@@ -983,7 +999,7 @@ COMMON ITEMS:
 	mergemaster -p					[5]
 	make installworld
 	make delete-old
-	mergemaster					[4]
+	mergemaster -i					[4]
 	<reboot>
 
 
@@ -1054,7 +1070,8 @@ COMMON ITEMS:
 	system.  Attempting to do it by hand is not recommended and those
 	that pursue this avenue should read this file carefully, as well
 	as the archives of freebsd-current and freebsd-hackers mailing lists
-	for potential gotchas.
+	for potential gotchas.  The -U option is also useful to consider.
+	See mergemaster(8) for more information.
 
 	[5] Usually this step is a noop.  However, from time to time
 	you may need to do this if you get unknown user in the following


More information about the svn-src-user mailing list