svn commit: r208534 - in head/sys/boot/uboot: common lib
Author: raj
Date: Tue May 25 09:59:53 2010
New Revision: 208534
URL: http://svn.freebsd.org/changeset/base/208534
Log:
Use loader devices only when they initialized properly.
Modified:
head/sys/boot/uboot/common/main.c
head/sys/boot/uboot/lib/disk.c
Modified: head/sys/boot/uboot/common/main.c
==
--- head/sys/boot/uboot/common/main.c Tue May 25 05:45:16 2010
(r208533)
+++ head/sys/boot/uboot/common/main.c Tue May 25 09:59:53 2010
(r208534)
@@ -157,20 +157,22 @@ main(void)
panic(no U-Boot devices found);
printf(Number of U-Boot devices: %d\n, devs_no);
- /*
-* March through the device switch probing for things.
-*/
- for (i = 0; devsw[i] != NULL; i++)
- if (devsw[i]-dv_init != NULL)
- (devsw[i]-dv_init)();
-
printf(\n);
printf(%s, Revision %s\n, bootprog_name, bootprog_rev);
printf((%s, %s)\n, bootprog_maker, bootprog_date);
meminfo();
+ /*
+* March through the device switch probing for things.
+*/
for (i = 0; devsw[i] != NULL; i++) {
- printf(\nDevice %d: %s\n, i, devsw[i]-dv_name);
+
+ if (devsw[i]-dv_init == NULL)
+ continue;
+ if ((devsw[i]-dv_init)() != 0)
+ continue;
+
+ printf(\nDevice: %s\n, devsw[i]-dv_name);
currdev.d_dev = devsw[i];
currdev.d_type = currdev.d_dev-dv_type;
Modified: head/sys/boot/uboot/lib/disk.c
==
--- head/sys/boot/uboot/lib/disk.c Tue May 25 05:45:16 2010
(r208533)
+++ head/sys/boot/uboot/lib/disk.c Tue May 25 09:59:53 2010
(r208534)
@@ -157,7 +157,7 @@ stor_init(void)
}
if (!found) {
- printf(No storage devices\n);
+ debugf(No storage devices\n);
return (-1);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208535 - head/sys/boot/uboot/lib
Author: raj Date: Tue May 25 10:15:30 2010 New Revision: 208535 URL: http://svn.freebsd.org/changeset/base/208535 Log: Mostly revert r200691. U-Boot syscall() entry point returns 1 on success. Modified: head/sys/boot/uboot/lib/glue.c Modified: head/sys/boot/uboot/lib/glue.c == --- head/sys/boot/uboot/lib/glue.c Tue May 25 09:59:53 2010 (r208534) +++ head/sys/boot/uboot/lib/glue.c Tue May 25 10:15:30 2010 (r208535) @@ -574,7 +574,7 @@ ub_env_enum(const char *last) * internally, which handles such case */ env = NULL; - if (syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)env) != 0) + if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)env)) return (NULL); if (env == NULL) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208536 - head/gnu/usr.bin/dtc
Author: raj
Date: Tue May 25 13:27:55 2010
New Revision: 208536
URL: http://svn.freebsd.org/changeset/base/208536
Log:
Correct dtc version header autogen location.
While there unify brackets usage.
Modified:
head/gnu/usr.bin/dtc/Makefile
Modified: head/gnu/usr.bin/dtc/Makefile
==
--- head/gnu/usr.bin/dtc/Makefile Tue May 25 10:15:30 2010
(r208535)
+++ head/gnu/usr.bin/dtc/Makefile Tue May 25 13:27:55 2010
(r208536)
@@ -11,18 +11,18 @@ PROG= dtc
SRCS= dtc.c checks.c fstree.c livetree.c treesource.c data.c \
flattree.c srcpos.c util.c \
fdt.c fdt_ro.c fdt_rw.c fdt_strerror.c \
- fdt_sw.c fdt_wip.c $(DTCDIR)/version_gen.h
+ fdt_sw.c fdt_wip.c ${DTCVERSIONFILE}
CFLAGS = -Wall -g -Os -fPIC -Wpointer-arith -Wcast-qual
CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR}
-VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile
-VERSIONEXTRA!= $(DTCDIR)/scripts/setlocalversion
+VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
+VERSIONEXTRA=
DTCVERSION:= ${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA}
-DTCVERSIONFILE:= $(DTCDIR)/version_gen.h
+DTCVERSIONFILE:= version_gen.h
MAN=
@@ -34,18 +34,18 @@ OBJS+= dtc-parser.tab.o dtc-lexer.lex.o
CLEANFILES+= dtc-parser.tab.o dtc-lexer.lex.o dtc-parser.tab.c \
dtc-parser.tab.h dtc-lexer.lex.c ${DTCVERSIONFILE}
-$(DTCVERSIONFILE):
+${DTCVERSIONFILE}:
@echo '#define DTC_VERSION DTC ${DTCVERSION}' ${DTCVERSIONFILE}
dtc-parser.tab.o: dtc-parser.tab.c dtc-parser.tab.h
dtc-lexer.lex.o: dtc-lexer.lex.c dtc-parser.tab.h
dtc-parser.tab.c: dtc-parser.y
- $(BISON) -o$@ -d $(DTCDIR)/dtc-parser.y
+ ${BISON} -o$@ -d ${DTCDIR}/dtc-parser.y
dtc-parser.tab.h: dtc-parser.tab.c
dtc-lexer.lex.c: dtc-lexer.l
- $(LEX) -o$@ $(DTCDIR)/dtc-lexer.l
+ ${LEX} -o$@ ${DTCDIR}/dtc-lexer.l
.include bsd.prog.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208537 - in head: share/mk tools/build/options
Author: raj
Date: Tue May 25 15:12:21 2010
New Revision: 208537
URL: http://svn.freebsd.org/changeset/base/208537
Log:
Introduce a new build knob for Flattened Device Tree support.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Added:
head/tools/build/options/WITH_FDT (contents, props changed)
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue May 25 13:27:55 2010(r208536)
+++ head/share/mk/bsd.own.mkTue May 25 15:12:21 2010(r208537)
@@ -278,6 +278,16 @@ WITH_HESIOD=
WITH_IDEA=
.endif
+# Enable FDT by default for selected platforms.
+.if defined(TARGET_ARCH) \
+ (${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc)
+# XXX this is temporarily disabled until all FDT support code is in place.
+#_fdt= FDT
+_no_fdt= FDT
+.else
+_no_fdt= FDT
+.endif
+
#
# MK_* options which default to yes.
#
@@ -313,6 +323,7 @@ WITH_IDEA=
DICT \
DYNAMICROOT \
EXAMPLES \
+${_fdt} \
FLOPPY \
FORTH \
FP_LIBC \
@@ -407,6 +418,7 @@ MK_${var}:= yes
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+${_no_fdt} \
HESIOD \
IDEA
.if defined(WITH_${var}) defined(WITHOUT_${var})
Added: head/tools/build/options/WITH_FDT
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_FDT Tue May 25 15:12:21 2010
(r208537)
@@ -0,0 +1,3 @@
+.\ $FreeBSD$
+Set to build Flattened Device Tree support as part of the base system. This
+includes the device tree compiler (dtc) and libfdt support library.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208538 - in head/sys: arm/include boot/arm/uboot boot/fdt boot/powerpc/uboot boot/uboot/common boot/uboot/lib powerpc/include
Author: raj
Date: Tue May 25 15:21:39 2010
New Revision: 208538
URL: http://svn.freebsd.org/changeset/base/208538
Log:
Initial loader(8) support for Flattened Device Tree.
o This is disabled by default for now, and can be enabled using WITH_FDT at
build time.
o Tested with ARM and PowerPC.
Reviewed by: imp
Sponsored by: The FreeBSD Foundation
Added:
head/sys/boot/fdt/
head/sys/boot/fdt/Makefile (contents, props changed)
head/sys/boot/fdt/fdt_loader_cmd.c (contents, props changed)
Modified:
head/sys/arm/include/metadata.h
head/sys/boot/arm/uboot/Makefile
head/sys/boot/arm/uboot/version
head/sys/boot/powerpc/uboot/Makefile
head/sys/boot/powerpc/uboot/version
head/sys/boot/uboot/common/main.c
head/sys/boot/uboot/common/metadata.c
head/sys/boot/uboot/lib/Makefile
head/sys/powerpc/include/metadata.h
Modified: head/sys/arm/include/metadata.h
==
--- head/sys/arm/include/metadata.h Tue May 25 15:12:21 2010
(r208537)
+++ head/sys/arm/include/metadata.h Tue May 25 15:21:39 2010
(r208538)
@@ -30,5 +30,6 @@
#define_MACHINE_METADATA_H_
#defineMODINFOMD_BOOTINFO 0x1001
+#defineMODINFOMD_DTBP 0x1002
#endif /* !_MACHINE_METADATA_H_ */
Modified: head/sys/boot/arm/uboot/Makefile
==
--- head/sys/boot/arm/uboot/MakefileTue May 25 15:12:21 2010
(r208537)
+++ head/sys/boot/arm/uboot/MakefileTue May 25 15:21:39 2010
(r208538)
@@ -18,6 +18,11 @@ LOADER_NFS_SUPPORT?= yes
LOADER_TFTP_SUPPORT?= no
LOADER_GZIP_SUPPORT?= no
LOADER_BZIP2_SUPPORT?= no
+.if defined(WITH_FDT)
+LOADER_FDT_SUPPORT=yes
+.else
+LOADER_FDT_SUPPORT=no
+.endif
.if ${LOADER_DISK_SUPPORT} == yes
CFLAGS+= -DLOADER_DISK_SUPPORT
@@ -46,6 +51,12 @@ CFLAGS+= -DLOADER_NFS_SUPPORT
.if ${LOADER_TFTP_SUPPORT} == yes
CFLAGS+= -DLOADER_TFTP_SUPPORT
.endif
+.if ${LOADER_FDT_SUPPORT} == yes
+CFLAGS+= -I${.CURDIR}/../../fdt
+CFLAGS+= -I${.OBJDIR}/../../fdt
+CFLAGS+= -DLOADER_FDT_SUPPORT
+LIBFDT=${.OBJDIR}/../../fdt/libfdt.a
+.endif
.if !defined(NO_FORTH)
# Enable BootForth
@@ -79,8 +90,8 @@ CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} -lstand
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
vers.c:${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: head/sys/boot/arm/uboot/version
==
--- head/sys/boot/arm/uboot/version Tue May 25 15:12:21 2010
(r208537)
+++ head/sys/boot/arm/uboot/version Tue May 25 15:21:39 2010
(r208538)
@@ -3,5 +3,6 @@ $FreeBSD$
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important. Make sure the current version number is on line 6.
+1.1: Flattened Device Tree blob support.
1.0: Added storage support. Booting from HDD, USB, etc. is now possible.
0.5: Initial U-Boot/arm version (netbooting only).
Added: head/sys/boot/fdt/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/fdt/Makefile Tue May 25 15:21:39 2010(r208538)
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../contrib/libfdt/
+
+LIB= fdt
+INTERNALLIB=
+
+# Vendor sources of libfdt.
+SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
+
+# Loader's fdt commands extension sources.
+SRCS+= fdt_loader_cmd.c
+
+CFLAGS+= -I${.CURDIR}/../../contrib/libfdt/ -I${.CURDIR}/../common/ \
+ -I${.CURDIR}/../uboot/lib
+
+CFLAGS+= -ffreestanding
+
+.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == arm
+CFLAGS+= -msoft-float
+.endif
+
+CFLAGS+= -Wformat -Wall
+
+.include bsd.lib.mk
Added: head/sys/boot/fdt/fdt_loader_cmd.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/fdt/fdt_loader_cmd.c Tue May 25 15:21:39 2010
(r208538)
@@ -0,0 +1,1290 @@
+/*-
+ * Copyright (c) 2009-2010 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Semihalf under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must
svn commit: r208539 - head/sys/boot
Author: raj
Date: Tue May 25 15:32:07 2010
New Revision: 208539
URL: http://svn.freebsd.org/changeset/base/208539
Log:
Bring a missing FDT piece (omitted in the previous commit).
Modified:
head/sys/boot/Makefile
Modified: head/sys/boot/Makefile
==
--- head/sys/boot/Makefile Tue May 25 15:21:39 2010(r208538)
+++ head/sys/boot/Makefile Tue May 25 15:32:07 2010(r208539)
@@ -26,6 +26,10 @@ SUBDIR+= uboot
SUBDIR+= zfs
.endif
+.if ${MK_FDT} != no
+SUBDIR+= fdt
+.endif
+
# Pick the machine-dependent subdir based on the target architecture.
ADIR= ${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}
.if exists(${.CURDIR}/${ADIR}/.)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208540 - stable/7/tools/build/options
Author: jkim Date: Tue May 25 15:51:36 2010 New Revision: 208540 URL: http://svn.freebsd.org/changeset/base/208540 Log: MFC: r183305, r183306 Add mission options. Added: stable/7/tools/build/options/WITHOUT_BSNMP - copied unchanged from r183306, head/tools/build/options/WITHOUT_BSNMP stable/7/tools/build/options/WITHOUT_FLOPPY - copied unchanged from r183306, head/tools/build/options/WITHOUT_FLOPPY stable/7/tools/build/options/WITHOUT_NETGRAPH_SUPPORT - copied unchanged from r183305, head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT stable/7/tools/build/options/WITHOUT_WIRELESS_SUPPORT - copied unchanged from r183305, head/tools/build/options/WITHOUT_WIRELESS_SUPPORT Modified: Directory Properties: stable/7/tools/build/options/ (props changed) Copied: stable/7/tools/build/options/WITHOUT_BSNMP (from r183306, head/tools/build/options/WITHOUT_BSNMP) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/build/options/WITHOUT_BSNMP Tue May 25 15:51:36 2010 (r208540, copy of r183306, head/tools/build/options/WITHOUT_BSNMP) @@ -0,0 +1,4 @@ +.\ $FreeBSD$ +Set to not build or install +.Xr bsnmpd 1 +and related libraries and data files. Copied: stable/7/tools/build/options/WITHOUT_FLOPPY (from r183306, head/tools/build/options/WITHOUT_FLOPPY) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/build/options/WITHOUT_FLOPPY Tue May 25 15:51:36 2010 (r208540, copy of r183306, head/tools/build/options/WITHOUT_FLOPPY) @@ -0,0 +1,3 @@ +.\ $FreeBSD$ +Set to not build or install programs +for operating floppy disk driver. Copied: stable/7/tools/build/options/WITHOUT_NETGRAPH_SUPPORT (from r183305, head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/build/options/WITHOUT_NETGRAPH_SUPPORT Tue May 25 15:51:36 2010(r208540, copy of r183305, head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT) @@ -0,0 +1,2 @@ +.\ $FreeBSD$ +Set to build libraries, programs, and kernel modules without netgraph support. Copied: stable/7/tools/build/options/WITHOUT_WIRELESS_SUPPORT (from r183305, head/tools/build/options/WITHOUT_WIRELESS_SUPPORT) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/build/options/WITHOUT_WIRELESS_SUPPORT Tue May 25 15:51:36 2010(r208540, copy of r183305, head/tools/build/options/WITHOUT_WIRELESS_SUPPORT) @@ -0,0 +1,3 @@ +.\ $FreeBSD$ +Set to build libraries, programs, and kernel modules without +802.11 wireless support. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208541 - stable/7/share/man/man5
Author: jkim Date: Tue May 25 15:58:31 2010 New Revision: 208541 URL: http://svn.freebsd.org/changeset/base/208541 Log: Regen for r208540. Modified: stable/7/share/man/man5/src.conf.5 Modified: stable/7/share/man/man5/src.conf.5 == --- stable/7/share/man/man5/src.conf.5 Tue May 25 15:51:36 2010 (r208540) +++ stable/7/share/man/man5/src.conf.5 Tue May 25 15:58:31 2010 (r208541) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. -.\ from FreeBSD: src/tools/build/options/makeman,v 1.6.2.2 2008/01/28 08:42:15 dougb Exp +.\ from FreeBSD: stable/7/tools/build/options/makeman 175743 2008-01-28 08:42:15Z dougb .\ $FreeBSD$ -.Dd January 30, 2008 +.Dd May 25, 2010 .Dt SRC.CONF 5 .Os .Sh NAME @@ -77,30 +77,52 @@ it to be honoured by The following list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent +.It Va WITHOUT_ACCT +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_ACCT 187106 2009-01-12 17:19:17Z sam +Set to not build process accounting tools such as +.Xr ac 8 +and +.Xr accton 8 . .It Va WITHOUT_ACPI -.\ from FreeBSD: src/tools/build/options/WITHOUT_ACPI,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru Set to not build .Xr acpiconf 8 , .Xr acpidump 8 and related programs. +.It Va WITHOUT_AMD +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_AMD 187106 2009-01-12 17:19:17Z sam +Set to not build +.Xr amd 8 , +and related programs. +.It Va WITHOUT_APM +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_APM 187106 2009-01-12 17:19:17Z sam +Set to not build +.Xr apm 8 , +.Xr apmd 8 +and related programs. .It Va WITHOUT_ASSERT_DEBUG -.\ from FreeBSD: src/tools/build/options/WITHOUT_ASSERT_DEBUG,v 1.1 2006/09/11 13:55:27 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the .Xr assert 3 checks. +.It Va WITHOUT_AT +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_AT 187106 2009-01-12 17:19:17Z sam +Set to not build +.Xr at 1 +and related utilities. .It Va WITHOUT_ATM -.\ from FreeBSD: src/tools/build/options/WITHOUT_ATM,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to ATM networking. .It Va WITHOUT_AUDIT -.\ from FreeBSD: src/tools/build/options/WITHOUT_AUDIT,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_AUDIT 156932 2006-03-21 07:50:50Z ru Set to not build audit support into system programs. .It Va WITHOUT_AUTHPF -.\ from FreeBSD: src/tools/build/options/WITHOUT_AUTHPF,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru Set to not build .Xr authpf 8 . .It Va WITHOUT_BIND -.\ from FreeBSD: src/tools/build/options/WITHOUT_BIND,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_BIND 156932 2006-03-21 07:50:50Z ru Setting this variable will prevent any part of BIND from being built. When set, it also enforces the following options: .Pp @@ -119,24 +141,24 @@ When set, it also enforces the following .Va WITHOUT_BIND_UTILS .El .It Va WITHOUT_BIND_DNSSEC -.\ from FreeBSD: src/tools/build/options/WITHOUT_BIND_DNSSEC,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_BIND_DNSSEC 156932 2006-03-21 07:50:50Z ru Set to avoid building or installing the DNSSEC related binaries, .Xr dnssec-keygen 8 and .Xr dnssec-signzone 8 . .It Va WITHOUT_BIND_ETC -.\ from FreeBSD: src/tools/build/options/WITHOUT_BIND_ETC,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_BIND_ETC 156932 2006-03-21 07:50:50Z ru Set to avoid installing the default files to .Pa /var/named/etc/namedb . .It Va WITH_BIND_LIBS -.\ from FreeBSD: src/tools/build/options/WITH_BIND_LIBS,v 1.1 2006/03/21 07:50:50 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITH_BIND_LIBS 156932 2006-03-21 07:50:50Z ru Set to install BIND libraries and include files. .It Va WITHOUT_BIND_LIBS_LWRES -.\ from FreeBSD: src/tools/build/options/WITHOUT_BIND_LIBS_LWRES,v 1.1 2006/03/21 07:50:49 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_BIND_LIBS_LWRES 156932 2006-03-21 07:50:50Z ru Set to avoid installing the lightweight resolver library in .Pa /usr/lib . .It Va WITHOUT_BIND_MTREE -.\ from FreeBSD: src/tools/build/options/WITHOUT_BIND_MTREE,v 1.3 2006/04/13 10:37:29 ru Exp +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_BIND_MTREE 157717 2006-04-13 10:37:29Z ru Set to avoid running .Xr mtree 8 to create the chroot directory structure under @@ -151,7 +173,7 @@ When set, it
Re: svn commit: r208540 - stable/7/tools/build/options
On Tuesday 25 May 2010 11:51 am, Jung-uk Kim wrote: Author: jkim Date: Tue May 25 15:51:36 2010 New Revision: 208540 URL: http://svn.freebsd.org/changeset/base/208540 Log: MFC:r183305, r183306 Add mission options. ^^^ missing Oops, sorry for the typo. It doesn't look too bad, though. ;-) Jung-uk Kim ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208540 - stable/7/tools/build/options
On Tue, May 25, 2010 at 12:04:58PM -0400, Jung-uk Kim wrote: On Tuesday 25 May 2010 11:51 am, Jung-uk Kim wrote: Author: jkim Date: Tue May 25 15:51:36 2010 New Revision: 208540 URL: http://svn.freebsd.org/changeset/base/208540 Log: MFC: r183305, r183306 Add mission options. ^^^ missing Oops, sorry for the typo. It doesn't look too bad, though. ;-) Hahaha, totally! :-) ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208537 - in head: share/mk tools/build/options
In message: 201005251512.o4pfclwl058...@svn.freebsd.org
Rafal Jaworowski r...@freebsd.org writes:
: +# Enable FDT by default for selected platforms.
: +.if defined(TARGET_ARCH) \
: + (${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc)
: +# XXX this is temporarily disabled until all FDT support code is in place.
: +#_fdt= FDT
: +_no_fdt= FDT
: +.else
: +_no_fdt= FDT
: +.endif
The tests here should be:
.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == powerpc
Never test against TARGET_* in our Makefile system (except that
binutils, gcc and gdb all use this for piecewise compile)...
Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208542 - head/sys/dev/isp
Author: mjacob
Date: Tue May 25 16:46:29 2010
New Revision: 208542
URL: http://svn.freebsd.org/changeset/base/208542
Log:
Treat PRLI the same as PLOGI and make a database entry for it (target mode).
Obtained from:Ken Merry
MFC after:One Month
Modified:
head/sys/dev/isp/isp_freebsd.c
Modified: head/sys/dev/isp/isp_freebsd.c
==
--- head/sys/dev/isp/isp_freebsd.c Tue May 25 15:58:31 2010
(r208541)
+++ head/sys/dev/isp/isp_freebsd.c Tue May 25 16:46:29 2010
(r208542)
@@ -2609,7 +2609,14 @@ isp_handle_platform_notify_24xx(ispsoftc
msg = PRLO;
break;
case PLOGI:
- msg = PLOGI;
+ case PRLI:
+ /*
+* Treat PRLI the same as PLOGI and make a database
entry for it.
+*/
+ if (inot-in_status_subcode == PLOGI)
+ msg = PLOGI;
+ else
+ msg = PRLI;
if (ISP_FW_NEWER_THAN(isp, 4, 0, 25)) {
ptr = (uint8_t *)inot; /* point to unswizzled
entry! */
wwn = (((uint64_t)
ptr[IN24XX_PLOGI_WWPN_OFF])56) |
@@ -2625,8 +2632,6 @@ isp_handle_platform_notify_24xx(ispsoftc
}
isp_add_wwn_entry(isp, chan, wwn, nphdl, portid);
break;
- case PRLI:
- msg = PRLI;
break;
case PDISC:
msg = PDISC;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208543 - head/sys/dev/isp
Author: mjacob Date: Tue May 25 16:50:35 2010 New Revision: 208543 URL: http://svn.freebsd.org/changeset/base/208543 Log: Remove extra break left by hand editing. X-MFC: 208542 MFC after:One Month Modified: head/sys/dev/isp/isp_freebsd.c Modified: head/sys/dev/isp/isp_freebsd.c == --- head/sys/dev/isp/isp_freebsd.c Tue May 25 16:46:29 2010 (r208542) +++ head/sys/dev/isp/isp_freebsd.c Tue May 25 16:50:35 2010 (r208543) @@ -2632,7 +2632,6 @@ isp_handle_platform_notify_24xx(ispsoftc } isp_add_wwn_entry(isp, chan, wwn, nphdl, portid); break; - break; case PDISC: msg = PDISC; break; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208544 - head/release/doc/en_US.ISO8859-1/relnotes
Author: delphij Date: Tue May 25 17:43:23 2010 New Revision: 208544 URL: http://svn.freebsd.org/changeset/base/208544 Log: Document bc/dc and nc updates. Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Tue May 25 16:50:35 2010(r208543) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Tue May 25 17:43:23 2010(r208544) @@ -30,6 +30,7 @@ year2007/year year2008/year year2009/year +year2010/year holder role=mailto:d...@freebsd.org;The os; Documentation Project/holder /copyright @@ -326,6 +327,9 @@ based on filenamelibarchive/filename, have replaced the GNU Binutils versions of these utilities./para +paraBSD-licensed version of man.bc.1; and man.dc.1; has + replaced their GNU counterparts./para + para role=mergedman.chflags.1; now supports a option-v/option flag for verbose output and a option-f/option flag to ignore errors with the same semantics as (for example) @@ -373,6 +377,9 @@ paraman.nc.1; now supports a option-O/option switch to disable the use of TCP options./para +paraman.nc.1;'s option-o/option switch has been deprecated. + It will be removed in future release./para + paraThe man.ping6.8; utility now returns literal2/literal when the packet transmission was successful but no responses were received (this is the same behavior as man.ping.8;). ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf Modified: head/release/amd64/boot_crunch.conf == --- head/release/amd64/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/amd64/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Modified: head/release/i386/boot_crunch.conf == --- head/release/i386/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/i386/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Modified: head/release/ia64/boot_crunch.conf == --- head/release/ia64/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/ia64/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -44,6 +44,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo -libs -lgeom -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Modified: head/release/pc98/boot_crunch.conf == --- head/release/pc98/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/pc98/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -38,6 +38,6 @@ progs arp progs ppp progs sysinstall -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -ljail +libs -larchive -lbz2 -llzma -ljail Modified: head/release/powerpc/boot_crunch.conf == --- head/release/powerpc/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/powerpc/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -44,6 +44,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -libs -lgeom -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Modified: head/release/sparc64/boot_crunch.conf == --- head/release/sparc64/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/sparc64/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb -ljail +libs -larchive -lbz2 -llzma -lusb -ljail Modified: head/release/sun4v/boot_crunch.conf == --- head/release/sun4v/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/sun4v/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb -ljail +libs -larchive -lbz2 -llzma -lusb -ljail ___
Re: svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
On Tuesday 25 May 2010 01:48 pm, Xin LI wrote: Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf misc/146904? Jung-uk Kim ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
On Tue, May 25, 2010 at 11:10 AM, Jung-uk Kim j...@freebsd.org wrote: On Tuesday 25 May 2010 01:48 pm, Xin LI wrote: Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf misc/146904? joerg brought up an interesting item on #bsddev: @joerg seeing Xin Li's last commit: does libmd contain SHA256 and SHA512? lzma doesn't use SHA512, but it does use SHA256. So does it actually need libcrypto now that libmd is included, or was it a bad analysis by your's truly? Thanks, -Garrett ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
On Tue, May 25, 2010 at 05:48:18PM +, Xin LI wrote: Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf Modified: head/release/amd64/boot_crunch.conf == --- head/release/amd64/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/amd64/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Hrm, wasn't the idea to keep libcrypto and crypto in general out of the install image (see the RELEASE_CRUNCH bits in various Makefiles) in order to be able use them regardless of crypto export/import restrictions? Marius ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 2010/05/25 11:35, Marius Strobl wrote: On Tue, May 25, 2010 at 05:48:18PM +, Xin LI wrote: Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf Modified: head/release/amd64/boot_crunch.conf == --- head/release/amd64/boot_crunch.conf Tue May 25 17:43:23 2010 (r208544) +++ head/release/amd64/boot_crunch.conf Tue May 25 17:48:17 2010 (r208545) @@ -39,6 +39,6 @@ progs ppp progs sysinstall progs usbconfig -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb -ljail +libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail Hrm, wasn't the idea to keep libcrypto and crypto in general out of the install image (see the RELEASE_CRUNCH bits in various Makefiles) in order to be able use them regardless of crypto export/import restrictions? Ah... I'm not sure about the crypto export/import restrictions :-/ However, in 2004, there was a discussion [1] about making crypto integrated part of the base system (the 'crypto' distribution was removed in Aug 2004). Could someone familiar with US laws chime in this? [1] http://docs.freebsd.org/cgi/mid.cgi?6.1.0.6.1.20040427094029.03d3d218 Cheers, - -- Xin LI delp...@delphij.nethttp://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBCAAGBQJL/CQeAAoJEATO+BI/yjfBe9AH/jrTPHw84gWwPHMb25tHM4BC PIr4DP3CB8nzr3DDaJXMF172eoctDO7+C4xMr0OjU/rfq+xVtwEZ5Pig8ZN7Yg5Z NfCxQpKc0v7wZe5ljQwx7mhovZKKPK1c+Jj/P5X1Jg90n5KbPHL64nzEASojfTR1 mREIiRwG2DzDIOLRC2wYD+JJPFJFLurRUDhjqbeDNxUYKnDq8dUFFx0Hb/ibQ66C Tdb2mdZGOTgqCrmG3/ibS3m+/Xl9JUWWV7VZhPbf5aCiinbPiajVlkYnv7cNv2ZB OtY+7JxjRJB9X9ebwH7CaiGdjDfQAcdbnR7g0sUgT9iNPwHux2qXIkEMToNQkiw= =uMvC -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r208545 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 2010/05/25 11:34, Garrett Cooper wrote: On Tue, May 25, 2010 at 11:10 AM, Jung-uk Kim j...@freebsd.org wrote: On Tuesday 25 May 2010 01:48 pm, Xin LI wrote: Author: delphij Date: Tue May 25 17:48:17 2010 New Revision: 208545 URL: http://svn.freebsd.org/changeset/base/208545 Log: libarchive now needs libcrypto and liblzma. Modified: head/release/amd64/boot_crunch.conf head/release/i386/boot_crunch.conf head/release/ia64/boot_crunch.conf head/release/pc98/boot_crunch.conf head/release/powerpc/boot_crunch.conf head/release/sparc64/boot_crunch.conf head/release/sun4v/boot_crunch.conf misc/146904? joerg brought up an interesting item on #bsddev: @joerg seeing Xin Li's last commit: does libmd contain SHA256 and SHA512? lzma doesn't use SHA512, but it does use SHA256. So does it actually need libcrypto now that libmd is included, or was it a bad analysis by your's truly? No, it's not about lzma but because libarchive's mtree support. For some reason our config_freebsd.h designates the OpenSSL symbols rather than libmd implementation of MD5, etc., which are used in libarchive's mtree. I'm not going to touch libarchive yet since I'm not familiar with the code enough to under the consequences if we switch over to libmd's implementation. Cheers, - -- Xin LI delp...@delphij.nethttp://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBCAAGBQJL/C25AAoJEATO+BI/yjfBShAH/0gc/KjjVZCMgM+7LHYt9PYN W3fEqGPA2D78rM9ypWG24Je2jno6belyXAmN9ljgEQwYYwk5LWaxL53hLFFl5oMb I8sQrGQoQME2fPIh/9vX2Uooud448iqnWCLiB3uiFgQV4Kq/P0F26AZdR1o5jayk kdPYsPDI5tgpVk1EsudS8iAdTdCFZJpRGJ1ZDeJEg5zgYjIEsMvVuxydaU9OB6/8 dbD4OuVNo+o6LidXUim2aWzEZ5s+bWLSzWN+XVKjJhTxqbVOvF+I79j6VbD4BOYn 2jQFnW1uVlQA9tzONRw8KvN1TzZiC/o4UGX3S5ZLiSY43wBDilvYKa5BfoinYLc= =KTmH -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208546 - in stable/8: etc etc/periodic/weekly gnu/usr.bin share/man share/mk usr.bin usr.sbin usr.sbin/dumpcis usr.sbin/makefs usr.sbin/makefs/ffs usr.sbin/mfiutil
Author: jkim Date: Tue May 25 20:16:36 2010 New Revision: 208546 URL: http://svn.freebsd.org/changeset/base/208546 Log: MFC: r208320 Add a new build option, MAN_UTILS. This option lets you control building utilities and related support files for manual pages, which were previously controlled by MAN. For POLA, the default depends on MAN, i.e., WITHOUT_MAN implies WITHOUT_MAN_UTILS and WITH_MAN implies WITH_MAN_UTILS. Note this patch implicitly fixes a documentation bug of src.conf(5), which says WITHOUT_MAN may be used to not build manual pages while it was also disabling some utilities for manual pages. Approved by: re (kib) Modified: stable/8/etc/Makefile stable/8/etc/periodic/weekly/Makefile stable/8/gnu/usr.bin/Makefile (contents, props changed) stable/8/share/man/Makefile stable/8/share/mk/bsd.own.mk stable/8/usr.bin/Makefile stable/8/usr.sbin/Makefile (contents, props changed) Directory Properties: stable/8/etc/ (props changed) stable/8/gnu/usr.bin/ (props changed) stable/8/gnu/usr.bin/gdb/kgdb/ (props changed) stable/8/gnu/usr.bin/groff/ (props changed) stable/8/gnu/usr.bin/patch/ (props changed) stable/8/share/man/ (props changed) stable/8/share/man/man1/ (props changed) stable/8/share/man/man3/ (props changed) stable/8/share/man/man4/ (props changed) stable/8/share/man/man5/ (props changed) stable/8/share/man/man7/ (props changed) stable/8/share/man/man8/ (props changed) stable/8/share/man/man9/ (props changed) stable/8/share/mk/ (props changed) stable/8/usr.bin/ (props changed) stable/8/usr.bin/awk/ (props changed) stable/8/usr.bin/biff/ (props changed) stable/8/usr.bin/calendar/ (props changed) stable/8/usr.bin/catman/ (props changed) stable/8/usr.bin/comm/ (props changed) stable/8/usr.bin/cpio/ (props changed) stable/8/usr.bin/csup/ (props changed) stable/8/usr.bin/fetch/ (props changed) stable/8/usr.bin/find/ (props changed) stable/8/usr.bin/finger/ (props changed) stable/8/usr.bin/fstat/ (props changed) stable/8/usr.bin/gcore/ (props changed) stable/8/usr.bin/gzip/ (props changed) stable/8/usr.bin/hexdump/ (props changed) stable/8/usr.bin/indent/ (props changed) stable/8/usr.bin/kdump/ (props changed) stable/8/usr.bin/locale/ (props changed) stable/8/usr.bin/look/ (props changed) stable/8/usr.bin/makewhatis/ (props changed) stable/8/usr.bin/minigzip/ (props changed) stable/8/usr.bin/netstat/ (props changed) stable/8/usr.bin/pathchk/ (props changed) stable/8/usr.bin/perror/ (props changed) stable/8/usr.bin/procstat/ (props changed) stable/8/usr.bin/rpcgen/ (props changed) stable/8/usr.bin/script/ (props changed) stable/8/usr.bin/sed/ (props changed) stable/8/usr.bin/sockstat/ (props changed) stable/8/usr.bin/stat/ (props changed) stable/8/usr.bin/systat/ (props changed) stable/8/usr.bin/tftp/ (props changed) stable/8/usr.bin/touch/ (props changed) stable/8/usr.bin/truss/ (props changed) stable/8/usr.bin/unifdef/ (props changed) stable/8/usr.bin/uniq/ (props changed) stable/8/usr.bin/unzip/ (props changed) stable/8/usr.bin/vmstat/ (props changed) stable/8/usr.bin/w/ (props changed) stable/8/usr.bin/whois/ (props changed) stable/8/usr.bin/xlint/ (props changed) stable/8/usr.sbin/ (props changed) stable/8/usr.sbin/acpi/ (props changed) stable/8/usr.sbin/arp/ (props changed) stable/8/usr.sbin/bluetooth/ (props changed) stable/8/usr.sbin/bsnmpd/ (props changed) stable/8/usr.sbin/burncd/ (props changed) stable/8/usr.sbin/cdcontrol/ (props changed) stable/8/usr.sbin/chown/ (props changed) stable/8/usr.sbin/config/ (props changed) stable/8/usr.sbin/cpucontrol/ (props changed) stable/8/usr.sbin/crashinfo/ (props changed) stable/8/usr.sbin/cron/ (props changed) stable/8/usr.sbin/crunch/examples/ (props changed) stable/8/usr.sbin/cxgbtool/ (props changed) stable/8/usr.sbin/diskinfo/ (props changed) stable/8/usr.sbin/dumpcis/cardinfo.h (props changed) stable/8/usr.sbin/dumpcis/cis.h (props changed) stable/8/usr.sbin/faithd/ (props changed) stable/8/usr.sbin/fifolog/ (props changed) stable/8/usr.sbin/freebsd-update/ (props changed) stable/8/usr.sbin/inetd/ (props changed) stable/8/usr.sbin/iostat/ (props changed) stable/8/usr.sbin/jail/ (props changed) stable/8/usr.sbin/jls/ (props changed) stable/8/usr.sbin/lpr/ (props changed) stable/8/usr.sbin/mailwrapper/ (props changed) stable/8/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) stable/8/usr.sbin/makefs/ffs/ffs_subr.c (props changed) stable/8/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) stable/8/usr.sbin/makefs/getid.c (props changed) stable/8/usr.sbin/mergemaster/ (props changed) stable/8/usr.sbin/mfiutil/mfiutil.8 (props changed) stable/8/usr.sbin/mountd/
svn commit: r208547 - stable/8/tools/build/options
Author: jkim Date: Tue May 25 20:19:31 2010 New Revision: 208547 URL: http://svn.freebsd.org/changeset/base/208547 Log: MFC: r208322 Add an option file for WITHOUT_MAN_UTILS to regenerate src.conf(5). Approved by: re (kib) Added: stable/8/tools/build/options/WITHOUT_MAN_UTILS - copied unchanged from r208322, head/tools/build/options/WITHOUT_MAN_UTILS Modified: Directory Properties: stable/8/tools/build/options/ (props changed) Copied: stable/8/tools/build/options/WITHOUT_MAN_UTILS (from r208322, head/tools/build/options/WITHOUT_MAN_UTILS) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_MAN_UTILS Tue May 25 20:19:31 2010(r208547, copy of r208322, head/tools/build/options/WITHOUT_MAN_UTILS) @@ -0,0 +1,9 @@ +.\ $FreeBSD$ +Set to not build utilities for manual pages, +.Xr apropos 1 , +.Xr catman 1 , +.Xr makewhatis 1 , +.Xr man 1 , +.Xr whatis 1 , +.Xr manctl 8 , +and related support files. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208548 - head/sys/dev/isp
Author: mjacob Date: Tue May 25 20:19:45 2010 New Revision: 208548 URL: http://svn.freebsd.org/changeset/base/208548 Log: Don't leak CCBs for every ABORT. Submitted by: Ken Merry MFC after:One week Modified: head/sys/dev/isp/isp_freebsd.c Modified: head/sys/dev/isp/isp_freebsd.c == --- head/sys/dev/isp/isp_freebsd.c Tue May 25 20:19:31 2010 (r208547) +++ head/sys/dev/isp/isp_freebsd.c Tue May 25 20:19:45 2010 (r208548) @@ -4421,7 +4421,10 @@ isp_action(struct cam_sim *sim, union cc ccb-ccb_h.status = CAM_REQ_INVALID; break; } - xpt_done(ccb); + /* +* This is not a queued CCB, so the caller expects it to be +* complete when control is returned. +*/ break; } #defineIS_CURRENT_SETTINGS(c) (c-type == CTS_TYPE_CURRENT_SETTINGS) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208549 - stable/8/share/man/man5
Author: jkim Date: Tue May 25 20:21:46 2010 New Revision: 208549 URL: http://svn.freebsd.org/changeset/base/208549 Log: Regen for r208547. Approved by: re (kib) Modified: stable/8/share/man/man5/src.conf.5 Modified: stable/8/share/man/man5/src.conf.5 == --- stable/8/share/man/man5/src.conf.5 Tue May 25 20:19:45 2010 (r208548) +++ stable/8/share/man/man5/src.conf.5 Tue May 25 20:21:46 2010 (r208549) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: stable/8/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm .\ $FreeBSD$ -.Dd March 29, 2010 +.Dd May 25, 2010 .Dt SRC.CONF 5 .Os .Sh NAME @@ -556,6 +556,24 @@ and related support files. .It Va WITHOUT_MAN .\ from FreeBSD: stable/8/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_MAN_UTILS +(can be overridden with +.Va WITH_MAN_UTILS ) +.El +.It Va WITHOUT_MAN_UTILS +.\ from FreeBSD: stable/8/tools/build/options/WITHOUT_MAN_UTILS 208547 2010-05-25 20:19:31Z jkim +Set to not build utilities for manual pages, +.Xr apropos 1 , +.Xr catman 1 , +.Xr makewhatis 1 , +.Xr man 1 , +.Xr whatis 1 , +.Xr manctl 8 , +and related support files. .It Va WITHOUT_NCP .\ from FreeBSD: stable/8/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208550 - in stable/7: etc etc/periodic/weekly gnu/usr.bin gnu/usr.bin/groff/tmac share/man share/mk usr.bin usr.sbin usr.sbin/makefs usr.sbin/makefs/ffs usr.sbin/mfiutil
Author: jkim Date: Tue May 25 20:32:30 2010 New Revision: 208550 URL: http://svn.freebsd.org/changeset/base/208550 Log: MFC: r208320 Add a new build option, MAN_UTILS. This option lets you control building utilities and related support files for manual pages, which were previously controlled by MAN. For POLA, the default depends on MAN, i.e., WITHOUT_MAN implies WITHOUT_MAN_UTILS and WITH_MAN implies WITH_MAN_UTILS. Note this patch implicitly fixes a documentation bug of src.conf(5), which says WITHOUT_MAN may be used to not build manual pages while it was also disabling some utilities for manual pages. Modified: stable/7/etc/Makefile stable/7/etc/periodic/weekly/Makefile stable/7/gnu/usr.bin/Makefile stable/7/share/man/Makefile stable/7/share/mk/bsd.own.mk stable/7/usr.bin/Makefile stable/7/usr.sbin/Makefile (contents, props changed) Directory Properties: stable/7/etc/ (props changed) stable/7/gnu/usr.bin/ (props changed) stable/7/gnu/usr.bin/cc/ (props changed) stable/7/gnu/usr.bin/cpio/ (props changed) stable/7/gnu/usr.bin/cvs/ (props changed) stable/7/gnu/usr.bin/gdb/ (props changed) stable/7/gnu/usr.bin/gdb/kgdb/ (props changed) stable/7/gnu/usr.bin/grep/ (props changed) stable/7/gnu/usr.bin/groff/ (props changed) stable/7/gnu/usr.bin/groff/tmac/mdoc.local (props changed) stable/7/gnu/usr.bin/man/ (props changed) stable/7/gnu/usr.bin/sort/ (props changed) stable/7/share/man/ (props changed) stable/7/share/man/man1/ (props changed) stable/7/share/man/man3/ (props changed) stable/7/share/man/man4/ (props changed) stable/7/share/man/man5/ (props changed) stable/7/share/man/man7/ (props changed) stable/7/share/man/man8/ (props changed) stable/7/share/man/man9/ (props changed) stable/7/share/mk/ (props changed) stable/7/usr.bin/ (props changed) stable/7/usr.bin/basename/ (props changed) stable/7/usr.bin/bluetooth/rfcomm_sppd/ (props changed) stable/7/usr.bin/calendar/ (props changed) stable/7/usr.bin/catman/ (props changed) stable/7/usr.bin/cksum/ (props changed) stable/7/usr.bin/comm/ (props changed) stable/7/usr.bin/cpuset/ (props changed) stable/7/usr.bin/csup/ (props changed) stable/7/usr.bin/dirname/ (props changed) stable/7/usr.bin/du/ (props changed) stable/7/usr.bin/fetch/ (props changed) stable/7/usr.bin/file/ (props changed) stable/7/usr.bin/find/ (props changed) stable/7/usr.bin/finger/ (props changed) stable/7/usr.bin/fstat/ (props changed) stable/7/usr.bin/gcore/ (props changed) stable/7/usr.bin/gprof/ (props changed) stable/7/usr.bin/gzip/ (props changed) stable/7/usr.bin/hexdump/ (props changed) stable/7/usr.bin/id/ (props changed) stable/7/usr.bin/indent/ (props changed) stable/7/usr.bin/ipcrm/ (props changed) stable/7/usr.bin/ipcs/ (props changed) stable/7/usr.bin/jot/ (props changed) stable/7/usr.bin/kdump/ (props changed) stable/7/usr.bin/ktrace/ (props changed) stable/7/usr.bin/ldd/ (props changed) stable/7/usr.bin/less/ (props changed) stable/7/usr.bin/locate/ (props changed) stable/7/usr.bin/lockf/ (props changed) stable/7/usr.bin/logger/ (props changed) stable/7/usr.bin/make/ (props changed) stable/7/usr.bin/ncal/ (props changed) stable/7/usr.bin/netstat/ (props changed) stable/7/usr.bin/newgrp/ (props changed) stable/7/usr.bin/nsupdate/ (props changed) stable/7/usr.bin/pkill/ (props changed) stable/7/usr.bin/procstat/ (props changed) stable/7/usr.bin/quota/ (props changed) stable/7/usr.bin/rpcgen/ (props changed) stable/7/usr.bin/sed/ (props changed) stable/7/usr.bin/shar/ (props changed) stable/7/usr.bin/sockstat/ (props changed) stable/7/usr.bin/stat/ (props changed) stable/7/usr.bin/su/ (props changed) stable/7/usr.bin/systat/ (props changed) stable/7/usr.bin/tail/ (props changed) stable/7/usr.bin/tar/ (props changed) stable/7/usr.bin/tftp/ (props changed) stable/7/usr.bin/tip/ (props changed) stable/7/usr.bin/top/ (props changed) stable/7/usr.bin/truncate/ (props changed) stable/7/usr.bin/truss/ (props changed) stable/7/usr.bin/unifdef/ (props changed) stable/7/usr.bin/units/ (props changed) stable/7/usr.bin/vmstat/ (props changed) stable/7/usr.bin/w/ (props changed) stable/7/usr.bin/wc/ (props changed) stable/7/usr.bin/whereis/ (props changed) stable/7/usr.bin/whois/ (props changed) stable/7/usr.bin/window/ (props changed) stable/7/usr.bin/xargs/ (props changed) stable/7/usr.bin/ypcat/ (props changed) stable/7/usr.bin/ypmatch/ (props changed) stable/7/usr.bin/ypwhich/ (props changed) stable/7/usr.sbin/ (props changed) stable/7/usr.sbin/acpi/ (props changed) stable/7/usr.sbin/adduser/ (props changed) stable/7/usr.sbin/arp/ (props changed) stable/7/usr.sbin/bluetooth/ (props
svn commit: r208551 - stable/7/tools/build/options
Author: jkim Date: Tue May 25 20:33:49 2010 New Revision: 208551 URL: http://svn.freebsd.org/changeset/base/208551 Log: MFC: r208322 Add an option file for WITHOUT_MAN_UTILS to regenerate src.conf(5). Added: stable/7/tools/build/options/WITHOUT_MAN_UTILS - copied unchanged from r208322, head/tools/build/options/WITHOUT_MAN_UTILS Modified: Directory Properties: stable/7/tools/build/options/ (props changed) Copied: stable/7/tools/build/options/WITHOUT_MAN_UTILS (from r208322, head/tools/build/options/WITHOUT_MAN_UTILS) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/tools/build/options/WITHOUT_MAN_UTILS Tue May 25 20:33:49 2010(r208551, copy of r208322, head/tools/build/options/WITHOUT_MAN_UTILS) @@ -0,0 +1,9 @@ +.\ $FreeBSD$ +Set to not build utilities for manual pages, +.Xr apropos 1 , +.Xr catman 1 , +.Xr makewhatis 1 , +.Xr man 1 , +.Xr whatis 1 , +.Xr manctl 8 , +and related support files. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208552 - stable/7/share/man/man5
Author: jkim Date: Tue May 25 20:35:39 2010 New Revision: 208552 URL: http://svn.freebsd.org/changeset/base/208552 Log: Regen for r208551. Modified: stable/7/share/man/man5/src.conf.5 Modified: stable/7/share/man/man5/src.conf.5 == --- stable/7/share/man/man5/src.conf.5 Tue May 25 20:33:49 2010 (r208551) +++ stable/7/share/man/man5/src.conf.5 Tue May 25 20:35:39 2010 (r208552) @@ -531,6 +531,24 @@ and related support files. .It Va WITHOUT_MAN .\ from FreeBSD: stable/7/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_MAN_UTILS +(can be overridden with +.Va WITH_MAN_UTILS ) +.El +.It Va WITHOUT_MAN_UTILS +.\ from FreeBSD: stable/7/tools/build/options/WITHOUT_MAN_UTILS 208551 2010-05-25 20:33:49Z jkim +Set to not build utilities for manual pages, +.Xr apropos 1 , +.Xr catman 1 , +.Xr makewhatis 1 , +.Xr man 1 , +.Xr whatis 1 , +.Xr manctl 8 , +and related support files. .It Va WITHOUT_NCP .\ from FreeBSD: stable/7/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208553 - in head/sys: net netinet
Author: qingli
Date: Tue May 25 20:42:35 2010
New Revision: 208553
URL: http://svn.freebsd.org/changeset/base/208553
Log:
This patch fixes the problem where proxy ARP entries cannot be added
over the if_ng interface.
MFC after:3 days
Modified:
head/sys/net/if.c
head/sys/net/if_var.h
head/sys/net/route.c
head/sys/net/rtsock.c
head/sys/netinet/in.c
head/sys/netinet/in_pcb.c
head/sys/netinet/ip_options.c
head/sys/netinet/ip_output.c
Modified: head/sys/net/if.c
==
--- head/sys/net/if.c Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/if.c Tue May 25 20:42:35 2010(r208553)
@@ -1607,7 +1607,7 @@ done:
* is most specific found.
*/
struct ifaddr *
-ifa_ifwithnet(struct sockaddr *addr)
+ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp)
{
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1639,7 +1639,8 @@ ifa_ifwithnet(struct sockaddr *addr)
if (ifa-ifa_addr-sa_family != af)
next: continue;
- if (af == AF_INET ifp-if_flags IFF_POINTOPOINT) {
+ if (af == AF_INET
+ ifp-if_flags IFF_POINTOPOINT !ignore_ptp) {
/*
* This is a bit broken as it doesn't
* take into account that the remote end may
Modified: head/sys/net/if_var.h
==
--- head/sys/net/if_var.h Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/if_var.h Tue May 25 20:42:35 2010(r208553)
@@ -873,7 +873,7 @@ struct ifaddr *ifa_ifwithaddr(struct soc
intifa_ifwithaddr_check(struct sockaddr *);
struct ifaddr *ifa_ifwithbroadaddr(struct sockaddr *);
struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct ifaddr *ifa_ifwithnet(struct sockaddr *);
+struct ifaddr *ifa_ifwithnet(struct sockaddr *, int);
struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
struct ifaddr *ifa_ifwithroute_fib(int, struct sockaddr *, struct sockaddr *,
u_int);
Modified: head/sys/net/route.c
==
--- head/sys/net/route.cTue May 25 20:35:39 2010(r208552)
+++ head/sys/net/route.cTue May 25 20:42:35 2010(r208553)
@@ -519,7 +519,7 @@ rtredirect_fib(struct sockaddr *dst,
}
/* verify the gateway is directly reachable */
- if ((ifa = ifa_ifwithnet(gateway)) == NULL) {
+ if ((ifa = ifa_ifwithnet(gateway, 0)) == NULL) {
error = ENETUNREACH;
goto out;
}
@@ -686,7 +686,7 @@ ifa_ifwithroute_fib(int flags, struct so
ifa = ifa_ifwithdstaddr(gateway);
}
if (ifa == NULL)
- ifa = ifa_ifwithnet(gateway);
+ ifa = ifa_ifwithnet(gateway, 0);
if (ifa == NULL) {
struct rtentry *rt = rtalloc1_fib(gateway, 0, RTF_RNH_LOCKED,
fibnum);
if (rt == NULL)
@@ -797,7 +797,7 @@ rt_getifa_fib(struct rt_addrinfo *info,
*/
if (info-rti_ifp == NULL ifpaddr != NULL
ifpaddr-sa_family == AF_LINK
- (ifa = ifa_ifwithnet(ifpaddr)) != NULL) {
+ (ifa = ifa_ifwithnet(ifpaddr, 0)) != NULL) {
info-rti_ifp = ifa-ifa_ifp;
ifa_free(ifa);
}
Modified: head/sys/net/rtsock.c
==
--- head/sys/net/rtsock.c Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/rtsock.c Tue May 25 20:42:35 2010(r208553)
@@ -55,6 +55,7 @@
#include net/if.h
#include net/if_dl.h
#include net/if_llatbl.h
+#include net/if_types.h
#include net/netisr.h
#include net/raw_cb.h
#include net/route.h
@@ -673,12 +674,22 @@ route_output(struct mbuf *m, struct sock
* another search to retrieve the prefix route of
* the local end point of the PPP link.
*/
- if ((rtm-rtm_flags RTF_ANNOUNCE)
- (rt-rt_ifp-if_flags IFF_POINTOPOINT)) {
+ if (rtm-rtm_flags RTF_ANNOUNCE) {
struct sockaddr laddr;
- rt_maskedcopy(rt-rt_ifa-ifa_addr,
- laddr,
- rt-rt_ifa-ifa_netmask);
+
+ if (rt-rt_ifp != NULL
+ rt-rt_ifp-if_type == IFT_PROPVIRTUAL) {
+ struct ifaddr *ifa;
+
+ ifa = ifa_ifwithnet(info.rti_info[RTAX_DST], 1);
+ if (ifa != NULL)
+ rt_maskedcopy(ifa-ifa_addr,
+
svn commit: r208554 - in head: share/man/man4 sys/conf sys/dev/usb sys/dev/usb/input sys/modules/usb/uep
Author: glebius Date: Tue May 25 21:20:56 2010 New Revision: 208554 URL: http://svn.freebsd.org/changeset/base/208554 Log: Add uep(4), driver for USB onscreen touch panel from eGalax. The driver is stub. It just creates device entry and feeds reassembled packets from hardware into it. If in future we would port wsmouse(4) from NetBSD, or make sysmouse(4) to support absolute motion events, then the driver can be extended to act as system mouse. Meanwhile, it just presents a /dev/uep0, that can be utilized by X driver, that I am going to commit to ports tree soon. The name for the driver is chosen to be the same as in NetBSD, however, due to different USB stacks this driver isn't a port. Added: head/share/man/man4/uep.4 (contents, props changed) head/sys/dev/usb/input/uep.c (contents, props changed) head/sys/modules/usb/uep/ head/sys/modules/usb/uep/Makefile (contents, props changed) Modified: head/share/man/man4/Makefile head/sys/conf/NOTES head/sys/conf/files head/sys/dev/usb/usbdevs Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileTue May 25 20:42:35 2010 (r208553) +++ head/share/man/man4/MakefileTue May 25 21:20:56 2010 (r208554) @@ -435,6 +435,7 @@ MAN=aac.4 \ udav.4 \ udbp.4 \ udp.4 \ + uep.4 \ ufm.4 \ ufoma.4 \ uftdi.4 \ Added: head/share/man/man4/uep.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/uep.4 Tue May 25 21:20:56 2010(r208554) @@ -0,0 +1,79 @@ +.\ Copyright (c) 2010 Gleb Smirnoff gleb...@freebsd.org +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ $FreeBSD$ +.\ +.Dd May 25, 2010 +.Dt UEP 4 +.Os +.Sh NAME +.Nm uep +.Nd eGalax touchscreen driver +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines into +your kernel configuration file: +.Bd -ragged -offset indent +.Cd device uep +.Cd device usb +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +uep_load=YES +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the eGalax onscreen touch panels. +.Pp +The driver is stub. +It just probes and attaches to USB device, creates device entry +and feeds reassambled packets from the hardware to it. +.Pp +To get mouse working in +.Xr X 7 , +one needs to install +.Pa ports/x11-drivers/xf86-input-egalax . +.Sh BUGS +.Nm +can't act like +.Xr sysmouse 4 , +since the latter does not support absolute motion events. +.Sh FILES +.Nm +creates a blocking pseudo\-device file, +.Pa /dev/uep0 . +.Sh SEE ALSO +.Xr usb 4 , +.Xr loader.conf 5 , +.Xr xorg.conf 5 Pq Pa ports/x11/xorg , +.Xr egalax 4 Pq Pa ports/x11-drivers/xf86-input-egalax . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Gleb Smirnoff Aq gleb...@freebsd.org Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Tue May 25 20:42:35 2010(r208553) +++ head/sys/conf/NOTES Tue May 25 21:20:56 2010(r208554) @@ -2627,6 +2627,8 @@ deviceumct device umodem # USB mouse device ums +# eGalax USB touch screen +device uep # Diamond Rio 500 MP3 player device urio # Modified: head/sys/conf/files == --- head/sys/conf/files Tue May 25 20:42:35 2010
svn commit: r208555 - head/sys/kern
Author: jhb
Date: Tue May 25 21:32:37 2010
New Revision: 208555
URL: http://svn.freebsd.org/changeset/base/208555
Log:
Ignore the 'addr' argument passed to PT_STEP (it is required to be '1'
for PT_STEP which means ignore) and PT_DETACH.
PR: kern/146167
MFC after:1 week
Modified:
head/sys/kern/sys_process.c
Modified: head/sys/kern/sys_process.c
==
--- head/sys/kern/sys_process.c Tue May 25 21:20:56 2010(r208554)
+++ head/sys/kern/sys_process.c Tue May 25 21:32:37 2010(r208555)
@@ -899,24 +899,29 @@ kern_ptrace(struct thread *td, int req,
if (error)
goto out;
break;
+ case PT_CONTINUE:
case PT_TO_SCE:
- p-p_stops |= S_PT_SCE;
- break;
case PT_TO_SCX:
- p-p_stops |= S_PT_SCX;
- break;
case PT_SYSCALL:
- p-p_stops |= S_PT_SCE | S_PT_SCX;
- break;
- }
-
- if (addr != (void *)1) {
- error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr);
- if (error)
+ if (addr != (void *)1) {
+ error = ptrace_set_pc(td2,
+ (u_long)(uintfptr_t)addr);
+ if (error)
+ goto out;
+ }
+ switch (req) {
+ case PT_TO_SCE:
+ p-p_stops |= S_PT_SCE;
break;
- }
-
- if (req == PT_DETACH) {
+ case PT_TO_SCX:
+ p-p_stops |= S_PT_SCX;
+ break;
+ case PT_SYSCALL:
+ p-p_stops |= S_PT_SCE | S_PT_SCX;
+ break;
+ }
+ break;
+ case PT_DETACH:
/* reset process parent */
if (p-p_oppid != p-p_pptr-p_pid) {
struct proc *pp;
@@ -941,6 +946,7 @@ kern_ptrace(struct thread *td, int req,
/* should we send SIGCHLD? */
/* childproc_continued(p); */
+ break;
}
sendsig:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r208556 - head/sys/i386/i386
Author: jhb
Date: Tue May 25 21:39:30 2010
New Revision: 208556
URL: http://svn.freebsd.org/changeset/base/208556
Log:
Only enable CMCI on i386 if 'device apic' is enabled in the kernel since
it requires the local APIC to work.
Modified:
head/sys/i386/i386/mca.c
Modified: head/sys/i386/i386/mca.c
==
--- head/sys/i386/i386/mca.cTue May 25 21:32:37 2010(r208555)
+++ head/sys/i386/i386/mca.cTue May 25 21:39:30 2010(r208556)
@@ -32,6 +32,8 @@
#include sys/cdefs.h
__FBSDID($FreeBSD$);
+#include opt_apic.h
+
#include sys/param.h
#include sys/bus.h
#include sys/interrupt.h
@@ -59,6 +61,7 @@ enum scan_mode {
CMCI,
};
+#ifdef DEV_APIC
/*
* State maintained for each monitored MCx bank to control the
* corrected machine check interrupt threshold.
@@ -67,6 +70,7 @@ struct cmc_state {
int max_threshold;
int last_intr;
};
+#endif
struct mca_internal {
struct mca_record rec;
@@ -99,9 +103,12 @@ static struct callout mca_timer;
static int mca_ticks = 3600; /* Check hourly by default. */
static struct task mca_task;
static struct mtx mca_lock;
+
+#ifdef DEV_APIC
static struct cmc_state **cmc_state; /* Indexed by cpuid, bank */
static int cmc_banks;
static int cmc_throttle = 60; /* Time in seconds to throttle CMCI. */
+#endif
static int
sysctl_positive_int(SYSCTL_HANDLER_ARGS)
@@ -423,6 +430,7 @@ mca_record_entry(const struct mca_record
mtx_unlock_spin(mca_lock);
}
+#ifdef DEV_APIC
/*
* Update the interrupt threshold for a CMCI. The strategy is to use
* a low trigger that interrupts as soon as the first event occurs.
@@ -494,6 +502,7 @@ cmci_update(enum scan_mode mode, int ban
wrmsr(MSR_MC_CTL2(bank), limit);
}
}
+#endif
/*
* This scans all the machine check banks of the current CPU to see if
@@ -521,12 +530,14 @@ mca_scan(enum scan_mode mode)
ucmask |= MC_STATUS_OVER;
mcg_cap = rdmsr(MSR_MCG_CAP);
for (i = 0; i (mcg_cap MCG_CAP_COUNT); i++) {
+#ifdef DEV_APIC
/*
* For a CMCI, only check banks this CPU is
* responsible for.
*/
if (mode == CMCI !(PCPU_GET(cmci_mask) 1 i))
continue;
+#endif
valid = mca_check_status(i, rec);
if (valid) {
@@ -538,12 +549,14 @@ mca_scan(enum scan_mode mode)
mca_record_entry(rec);
}
+#ifdef DEV_APIC
/*
* If this is a bank this CPU monitors via CMCI,
* update the threshold.
*/
if (PCPU_GET(cmci_mask) (1 i))
cmci_update(mode, i, valid, rec);
+#endif
}
return (mode == MCE ? recoverable : count);
}
@@ -621,6 +634,7 @@ mca_startup(void *dummy)
}
SYSINIT(mca_startup, SI_SUB_SMP, SI_ORDER_ANY, mca_startup, NULL);
+#ifdef DEV_APIC
static void
cmci_setup(uint64_t mcg_cap)
{
@@ -637,6 +651,7 @@ cmci_setup(uint64_t mcg_cap)
cmc_throttle, 0, sysctl_positive_int, I,
Interval in seconds to throttle corrected MC interrupts);
}
+#endif
static void
mca_setup(uint64_t mcg_cap)
@@ -657,10 +672,13 @@ mca_setup(uint64_t mcg_cap)
SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
force_scan, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0,
sysctl_mca_scan, I, Force an immediate scan for machine checks);
+#ifdef DEV_APIC
if (mcg_cap MCG_CAP_CMCI_P)
cmci_setup(mcg_cap);
+#endif
}
+#ifdef DEV_APIC
/*
* See if we should monitor CMCI for this bank. If CMCI_EN is already
* set in MC_CTL2, then another CPU is responsible for this bank, so
@@ -707,6 +725,7 @@ cmci_monitor(int i)
/* Mark this bank as monitored. */
PCPU_SET(cmci_mask, PCPU_GET(cmci_mask) | 1 i);
}
+#endif
/* Must be executed on each CPU. */
void
@@ -775,15 +794,19 @@ mca_init(void)
if (!skip)
wrmsr(MSR_MC_CTL(i), ctl);
+#ifdef DEV_APIC
if (mcg_cap MCG_CAP_CMCI_P)
cmci_monitor(i);
+#endif
/* Clear all errors. */
wrmsr(MSR_MC_STATUS(i), 0);
}
+#ifdef DEV_APIC
if (PCPU_GET(cmci_mask) != 0)
lapic_enable_cmc();
+#endif
}
load_cr4(rcr4() | CR4_MCE);
@@ -817,6 +840,7 @@ mca_intr(void)
return (recoverable);
}
+#ifdef DEV_APIC
/* Called for a CMCI (correctable machine check interrupt). */
void
cmc_intr(void)
@@ -844,3 +868,4 @@ cmc_intr(void)
mtx_unlock_spin(mca_lock);
}
}
+#endif
___
svn-src-all@freebsd.org mailing list
Re: svn commit: r208553 - in head/sys: net netinet
On Tue, 25 May 2010, Qing Li wrote:
Author: qingli
Date: Tue May 25 20:42:35 2010
New Revision: 208553
URL: http://svn.freebsd.org/changeset/base/208553
Log:
This patch fixes the problem where proxy ARP entries cannot be added
over the if_ng interface.
Hi Qing--
It may be worth checking network-related kernel modules in the ports tree to
make sure none reference this symbol (i.e., the virtualbox network device
parts). If they do, you may need to add a new symbol in the MFC so that
existing modules continue to function, and existing kernel module code
continues to compile. If not, shouldn't be an issue (none of the base system
modules seem to use it, but we may care about external modules that do in
-STABLE).
Robert
MFC after: 3 days
Modified:
head/sys/net/if.c
head/sys/net/if_var.h
head/sys/net/route.c
head/sys/net/rtsock.c
head/sys/netinet/in.c
head/sys/netinet/in_pcb.c
head/sys/netinet/ip_options.c
head/sys/netinet/ip_output.c
Modified: head/sys/net/if.c
==
--- head/sys/net/if.c Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/if.c Tue May 25 20:42:35 2010(r208553)
@@ -1607,7 +1607,7 @@ done:
* is most specific found.
*/
struct ifaddr *
-ifa_ifwithnet(struct sockaddr *addr)
+ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp)
{
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1639,7 +1639,8 @@ ifa_ifwithnet(struct sockaddr *addr)
if (ifa-ifa_addr-sa_family != af)
next: continue;
- if (af == AF_INET ifp-if_flags IFF_POINTOPOINT) {
+ if (af == AF_INET
+ ifp-if_flags IFF_POINTOPOINT !ignore_ptp) {
/*
* This is a bit broken as it doesn't
* take into account that the remote end may
Modified: head/sys/net/if_var.h
==
--- head/sys/net/if_var.h Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/if_var.h Tue May 25 20:42:35 2010(r208553)
@@ -873,7 +873,7 @@ struct ifaddr *ifa_ifwithaddr(struct soc
int ifa_ifwithaddr_check(struct sockaddr *);
struct ifaddr *ifa_ifwithbroadaddr(struct sockaddr *);
struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct ifaddr *ifa_ifwithnet(struct sockaddr *);
+struct ifaddr *ifa_ifwithnet(struct sockaddr *, int);
struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
struct ifaddr *ifa_ifwithroute_fib(int, struct sockaddr *, struct sockaddr *,
u_int);
Modified: head/sys/net/route.c
==
--- head/sys/net/route.cTue May 25 20:35:39 2010(r208552)
+++ head/sys/net/route.cTue May 25 20:42:35 2010(r208553)
@@ -519,7 +519,7 @@ rtredirect_fib(struct sockaddr *dst,
}
/* verify the gateway is directly reachable */
- if ((ifa = ifa_ifwithnet(gateway)) == NULL) {
+ if ((ifa = ifa_ifwithnet(gateway, 0)) == NULL) {
error = ENETUNREACH;
goto out;
}
@@ -686,7 +686,7 @@ ifa_ifwithroute_fib(int flags, struct so
ifa = ifa_ifwithdstaddr(gateway);
}
if (ifa == NULL)
- ifa = ifa_ifwithnet(gateway);
+ ifa = ifa_ifwithnet(gateway, 0);
if (ifa == NULL) {
struct rtentry *rt = rtalloc1_fib(gateway, 0, RTF_RNH_LOCKED,
fibnum);
if (rt == NULL)
@@ -797,7 +797,7 @@ rt_getifa_fib(struct rt_addrinfo *info,
*/
if (info-rti_ifp == NULL ifpaddr != NULL
ifpaddr-sa_family == AF_LINK
- (ifa = ifa_ifwithnet(ifpaddr)) != NULL) {
+ (ifa = ifa_ifwithnet(ifpaddr, 0)) != NULL) {
info-rti_ifp = ifa-ifa_ifp;
ifa_free(ifa);
}
Modified: head/sys/net/rtsock.c
==
--- head/sys/net/rtsock.c Tue May 25 20:35:39 2010(r208552)
+++ head/sys/net/rtsock.c Tue May 25 20:42:35 2010(r208553)
@@ -55,6 +55,7 @@
#include net/if.h
#include net/if_dl.h
#include net/if_llatbl.h
+#include net/if_types.h
#include net/netisr.h
#include net/raw_cb.h
#include net/route.h
@@ -673,12 +674,22 @@ route_output(struct mbuf *m, struct sock
* another search to retrieve the prefix route of
* the local end point of the PPP link.
*/
- if ((rtm-rtm_flags RTF_ANNOUNCE)
- (rt-rt_ifp-if_flags IFF_POINTOPOINT)) {
+ if (rtm-rtm_flags RTF_ANNOUNCE) {
struct sockaddr laddr;
- rt_maskedcopy(rt-rt_ifa-ifa_addr,
-
svn commit: r208557 - head/release/doc/en_US.ISO8859-1/relnotes
Author: delphij Date: Tue May 25 22:19:51 2010 New Revision: 208557 URL: http://svn.freebsd.org/changeset/base/208557 Log: Grammar nits. Submitted by: b. f. bf1783 googlemail com Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.sgml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Tue May 25 21:39:30 2010(r208556) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.sgml Tue May 25 22:19:51 2010(r208557) @@ -327,7 +327,7 @@ based on filenamelibarchive/filename, have replaced the GNU Binutils versions of these utilities./para -paraBSD-licensed version of man.bc.1; and man.dc.1; has +paraBSD-licensed versions of man.bc.1; and man.dc.1; have replaced their GNU counterparts./para para role=mergedman.chflags.1; now supports a option-v/option flag for @@ -378,7 +378,7 @@ disable the use of TCP options./para paraman.nc.1;'s option-o/option switch has been deprecated. - It will be removed in future release./para + It will be removed in a future release./para paraThe man.ping6.8; utility now returns literal2/literal when the packet transmission was successful but no responses ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
