PERFORCE change 139670 for review
Sam Leffler
sam at FreeBSD.org
Wed Apr 9 18:12:53 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=139670
Change 139670 by sam at sam_ebb on 2008/04/09 18:12:14
IFC @ 139669
Affected files ...
.. //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#6 integrate
.. //depot/projects/vap/sys/compat/linux/linux_file.c#9 integrate
.. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#2 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/Makefile#5 integrate
Differences ...
==== //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#6 (text+ko) ====
@@ -12,7 +12,7 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.16 2008/03/06 21:43:56 jhb Exp $
+ * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.17 2008/04/09 17:59:17 jhb Exp $
*/
/*
@@ -117,13 +117,11 @@
#ifdef PROBE_KEYBOARD
/*
* Look at the BIOS data area to see if we have an enhanced keyboard. If not,
- * set the RBX_SERIAL bit in the howto byte to prefer the serial console to
- * the video console.
+ * set the RBX_DUAL and RBX_SERIAL bits in the howto byte.
*/
- orl $RB_MULTIPLE, (%bx) # enable multiple consoles
testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present?
jnz keyb # yes, so skip
- orl $RB_SERIAL, (%bx) # prefer serial console
+ orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console
keyb:
#endif
/*
==== //depot/projects/vap/sys/compat/linux/linux_file.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.111 2008/04/08 09:45:47 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.112 2008/04/09 16:42:50 rdivacky Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -131,10 +131,8 @@
bsd_flags |= O_NOFOLLOW;
/* XXX LINUX_O_NOATIME: unable to be easily implemented. */
- if (dirfd != -1)
- error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode);
- else
- error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode);
+ error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode);
+
if (!error) {
fd = td->td_retval[0];
/*
@@ -215,7 +213,7 @@
path, args->flags, args->mode);
#endif
- return (linux_common_open(td, -1, path, args->flags, args->mode));
+ return (linux_common_open(td, AT_FDCWD, path, args->flags, args->mode));
}
int
==== //depot/projects/vap/sys/nlm/nlm_prot_impl.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.3 2008/03/28 09:50:32 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.4 2008/04/09 15:43:19 dfr Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -1075,7 +1075,7 @@
{
struct thread *td = curthread;
int error;
- SVCPOOL *pool;
+ SVCPOOL *pool = NULL;
struct sockopt opt;
int portlow;
#ifdef INET6
@@ -1137,7 +1137,7 @@
#endif
memset(&sin, 0, sizeof(sin));
sin.sin_len = sizeof(sin);
- sin.sin_family = AF_INET6;
+ sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
nlm_nsm = nlm_get_rpc((struct sockaddr *) &sin, SM_PROG,
SM_VERS);
@@ -1147,7 +1147,8 @@
if (!nlm_nsm) {
printf("Can't start NLM - unable to contact NSM\n");
- return (EINVAL);
+ error = EINVAL;
+ goto out;
}
pool = svcpool_create();
==== //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#2 (text+ko) ====
@@ -47,10 +47,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.2 2008/02/24 03:01:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.3 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/ieeefp.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#2 (text+ko) ====
@@ -48,10 +48,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_compare.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_compare.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/reg.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#2 (text+ko) ====
@@ -45,10 +45,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_div.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_div.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/reg.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#2 (text+ko) ====
@@ -46,10 +46,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_explode.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_explode.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/ieee.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#2 (text+ko) ====
@@ -46,10 +46,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_implode.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_implode.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/ieee.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#2 (text+ko) ====
@@ -45,10 +45,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_mul.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_mul.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/reg.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#2 (text+ko) ====
@@ -45,10 +45,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_sqrt.c,v 1.1 2008/02/23 20:05:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_sqrt.c,v 1.2 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/reg.h>
==== //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#2 (text+ko) ====
@@ -45,10 +45,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.2 2008/02/24 03:01:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.3 2008/04/09 08:50:37 grehan Exp $");
+#include <sys/types.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/fpu.h>
#include <machine/reg.h>
==== //depot/projects/vap/usr.sbin/pkg_install/Makefile#5 (text+ko) ====
@@ -1,7 +1,23 @@
-# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.21 2008/03/31 12:45:17 flz Exp $
+# $FreeBSD: src/usr.sbin/pkg_install/Makefile,v 1.22 2008/04/09 15:08:31 flz Exp $
.include <bsd.own.mk>
SUBDIR= lib add create delete info updating version
.include <bsd.subdir.mk>
+
+CP= /bin/cp
+RM= /bin/rm
+TAR= /usr/bin/tar
+
+DATE!= date +%Y%m%d
+
+distfile: clean
+ @(cd ${.CURDIR}/..; \
+ ${CP} -r pkg_install pkg_install-${DATE}; \
+ ${TAR} -czf pkg_install/pkg_install-${DATE}.tar.gz \
+ --exclude .#* --exclude *~ --exclude CVS \
+ --exclude pkg_install-*.tar.gz pkg_install-${DATE}; \
+ ${RM} -rf pkg_install-${DATE})
+
+
More information about the p4-projects
mailing list