Re: svn commit: r252375 - head/lib/libfetch
Tim Kientzle writes: > Log: > Fix -Wunsequenced warning. > > Submitted by: d...@gmx.com Neither approved by nor even discussed with the author and maintainer. (not saying it's wrong, but...) DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252779 - head/sys/netinet
Author: tuexen
Date: Fri Jul 5 10:08:49 2013
New Revision: 252779
URL: http://svnweb.freebsd.org/changeset/base/252779
Log:
Fix a bug were only 2048 streams where usable even though more than
2048 streams were negotiated on the wire. While there, remove the
hard coded limit of 2048 streams.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_constants.h
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_sysctl.c
head/sys/netinet/sctp_sysctl.h
Modified: head/sys/netinet/sctp_constants.h
==
--- head/sys/netinet/sctp_constants.h Fri Jul 5 09:36:09 2013
(r252778)
+++ head/sys/netinet/sctp_constants.h Fri Jul 5 10:08:49 2013
(r252779)
@@ -521,9 +521,6 @@ __FBSDID("$FreeBSD$");
/* How long a cookie lives in milli-seconds */
#define SCTP_DEFAULT_COOKIE_LIFE 6
-/* resource limit of streams */
-#define MAX_SCTP_STREAMS 2048
-
/* Maximum the mapping array will grow to (TSN mapping array) */
#define SCTP_MAPPING_ARRAY 512
@@ -658,6 +655,7 @@ __FBSDID("$FreeBSD$");
/* How many streams I request initally by default */
#define SCTP_OSTREAM_INITIAL 10
+#define SCTP_ISTREAM_INITIAL 2048
/*
* How many smallest_mtu's need to increase before a window update sack is
Modified: head/sys/netinet/sctp_input.c
==
--- head/sys/netinet/sctp_input.c Fri Jul 5 09:36:09 2013
(r252778)
+++ head/sys/netinet/sctp_input.c Fri Jul 5 10:08:49 2013
(r252779)
@@ -389,9 +389,10 @@ sctp_process_init(struct sctp_init_chunk
}
SCTP_FREE(asoc->strmin, SCTP_M_STRMI);
}
- asoc->streamincnt = ntohs(init->num_outbound_streams);
- if (asoc->streamincnt > MAX_SCTP_STREAMS) {
- asoc->streamincnt = MAX_SCTP_STREAMS;
+ if (asoc->max_inbound_streams > ntohs(init->num_outbound_streams)) {
+ asoc->streamincnt = ntohs(init->num_outbound_streams);
+ } else {
+ asoc->streamincnt = asoc->max_inbound_streams;
}
SCTP_MALLOC(asoc->strmin, struct sctp_stream_in *, asoc->streamincnt *
sizeof(struct sctp_stream_in), SCTP_M_STRMI);
@@ -403,11 +404,6 @@ sctp_process_init(struct sctp_init_chunk
for (i = 0; i < asoc->streamincnt; i++) {
asoc->strmin[i].stream_no = i;
asoc->strmin[i].last_sequence_delivered = 0x;
- /*
-* U-stream ranges will be set when the cookie is unpacked.
-* Or for the INIT sender they are un set (if pr-sctp not
-* supported) when the INIT-ACK arrives.
-*/
TAILQ_INIT(&asoc->strmin[i].inqueue);
asoc->strmin[i].delivery_started = 0;
}
Modified: head/sys/netinet/sctp_pcb.c
==
--- head/sys/netinet/sctp_pcb.c Fri Jul 5 09:36:09 2013(r252778)
+++ head/sys/netinet/sctp_pcb.c Fri Jul 5 10:08:49 2013(r252779)
@@ -2503,9 +2503,6 @@ sctp_inpcb_alloc(struct socket *so, uint
m->initial_rto = SCTP_BASE_SYSCTL(sctp_rto_initial_default);
m->initial_init_rto_max = SCTP_BASE_SYSCTL(sctp_init_rto_max_default);
m->sctp_sack_freq = SCTP_BASE_SYSCTL(sctp_sack_freq_default);
-
- m->max_open_streams_intome = MAX_SCTP_STREAMS;
-
m->max_init_times = SCTP_BASE_SYSCTL(sctp_init_rtx_max_default);
m->max_send_times = SCTP_BASE_SYSCTL(sctp_assoc_rtx_max_default);
m->def_net_failure = SCTP_BASE_SYSCTL(sctp_path_rtx_max_default);
@@ -2517,6 +2514,7 @@ sctp_inpcb_alloc(struct socket *so, uint
m->sctp_default_cc_module = SCTP_BASE_SYSCTL(sctp_default_cc_module);
m->sctp_default_ss_module = SCTP_BASE_SYSCTL(sctp_default_ss_module);
+ m->max_open_streams_intome =
SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default);
/* number of streams to pre-open on a association */
m->pre_open_stream_count =
SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default);
Modified: head/sys/netinet/sctp_sysctl.c
==
--- head/sys/netinet/sctp_sysctl.c Fri Jul 5 09:36:09 2013
(r252778)
+++ head/sys/netinet/sctp_sysctl.c Fri Jul 5 10:08:49 2013
(r252779)
@@ -81,6 +81,7 @@ sctp_init_sysctls()
SCTP_BASE_SYSCTL(sctp_path_rtx_max_default) =
SCTPCTL_PATH_RTX_MAX_DEFAULT;
SCTP_BASE_SYSCTL(sctp_path_pf_threshold) =
SCTPCTL_PATH_PF_THRESHOLD_DEFAULT;
SCTP_BASE_SYSCTL(sctp_add_more_threshold) =
SCTPCTL_ADD_MORE_ON_OUTPUT_DEFAULT;
+ SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default) =
SCTPCTL_INCOMING_STREAMS_DEFAULT;
SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default) =
SCTPCTL_OUTGOING_STREAMS_DEFAULT;
SCTP_BA
svn commit: r252780 - head/sys/arm/arm
Author: ray
Date: Fri Jul 5 13:37:57 2013
New Revision: 252780
URL: http://svnweb.freebsd.org/changeset/base/252780
Log:
o Make fields names short.
o Slim down reg fields comments.
Modified:
head/sys/arm/arm/generic_timer.c
Modified: head/sys/arm/arm/generic_timer.c
==
--- head/sys/arm/arm/generic_timer.cFri Jul 5 10:08:49 2013
(r252779)
+++ head/sys/arm/arm/generic_timer.cFri Jul 5 13:37:57 2013
(r252780)
@@ -60,28 +60,21 @@ __FBSDID("$FreeBSD$");
#include
#include
-#defineGENERIC_TIMER_CTRL_ENABLE (1 << 0)
-#defineGENERIC_TIMER_CTRL_INT_MASK (1 << 1)
-#defineGENERIC_TIMER_CTRL_INT_STAT (1 << 2)
-#defineGENERIC_TIMER_REG_CTRL 0
-#defineGENERIC_TIMER_REG_TVAL 1
-
-#defineGENERIC_TIMER_CNTKCTL_PL0PTEN (1 << 9) /* Physical timer
registers
- access from PL0 */
-#defineGENERIC_TIMER_CNTKCTL_PL0VTEN (1 << 8) /* Virtual timer
registers
- access from PL0 */
-#defineGENERIC_TIMER_CNTKCTL_EVNTI (1 << 4) /* Virtual counter
- event bits */
-#defineGENERIC_TIMER_CNTKCTL_EVNTDIR (1 << 3) /* Virtual counter
- event transition */
-#defineGENERIC_TIMER_CNTKCTL_EVNTEN(1 << 2) /* Enables events from
- the virtual counter */
-#defineGENERIC_TIMER_CNTKCTL_PL0VCTEN (1 << 1) /* CNTVCT and CNTFRQ
- access from PL0 */
-#defineGENERIC_TIMER_CNTKCTL_PL0PCTEN (1 << 0) /* CNTPCT and CNTFRQ
- access from PL0 */
+#defineGT_CTRL_ENABLE (1 << 0)
+#defineGT_CTRL_INT_MASK(1 << 1)
+#defineGT_CTRL_INT_STAT(1 << 2)
+#defineGT_REG_CTRL 0
+#defineGT_REG_TVAL 1
+
+#defineGT_CNTKCTL_PL0PTEN (1 << 9) /* PL0 Physical timer reg
access */
+#defineGT_CNTKCTL_PL0VTEN (1 << 8) /* PL0 Virtual timer reg
access */
+#defineGT_CNTKCTL_EVNTI(1 << 4) /* Virtual counter event bits
*/
+#defineGT_CNTKCTL_EVNTDIR (1 << 3) /* Virtual counter event
transition */
+#defineGT_CNTKCTL_EVNTEN (1 << 2) /* Enables virtual counter
events */
+#defineGT_CNTKCTL_PL0VCTEN (1 << 1) /* PL0 CNTVCT and CNTFRQ
access */
+#defineGT_CNTKCTL_PL0PCTEN (1 << 0) /* PL0 CNTPCT and CNTFRQ
access */
-#defineGENERIC_TIMER_CNTPSIRQ 29
+#defineGT_CNTPSIRQ 29
struct arm_tmr_softc {
struct resource *irq_res;
@@ -182,11 +175,8 @@ disable_user_access(void)
uint32_t cntkctl;
__asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl));
- cntkctl &= ~(GENERIC_TIMER_CNTKCTL_PL0PTEN |
- GENERIC_TIMER_CNTKCTL_PL0VTEN |
- GENERIC_TIMER_CNTKCTL_EVNTEN |
- GENERIC_TIMER_CNTKCTL_PL0VCTEN |
- GENERIC_TIMER_CNTKCTL_PL0PCTEN);
+ cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN |
+ GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0VCTEN | GT_CNTKCTL_PL0PCTEN);
__asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
isb();
}
@@ -209,8 +199,8 @@ arm_tmr_start(struct eventtimer *et, sbi
if (first != 0) {
counts = ((uint32_t)et->et_frequency * first) >> 32;
ctrl = get_ctrl();
- ctrl &= ~GENERIC_TIMER_CTRL_INT_MASK;
- ctrl |= GENERIC_TIMER_CTRL_ENABLE;
+ ctrl &= ~GT_CTRL_INT_MASK;
+ ctrl |= GT_CTRL_ENABLE;
set_tval(counts);
set_ctrl(ctrl);
return (0);
@@ -226,7 +216,7 @@ arm_tmr_stop(struct eventtimer *et)
int ctrl;
ctrl = get_ctrl();
- ctrl &= GENERIC_TIMER_CTRL_ENABLE;
+ ctrl &= GT_CTRL_ENABLE;
set_ctrl(ctrl);
return (0);
@@ -240,8 +230,8 @@ arm_tmr_intr(void *arg)
sc = (struct arm_tmr_softc *)arg;
ctrl = get_ctrl();
- if (ctrl & GENERIC_TIMER_CTRL_INT_STAT) {
- ctrl |= GENERIC_TIMER_CTRL_INT_MASK;
+ if (ctrl & GT_CTRL_INT_STAT) {
+ ctrl |= GT_CTRL_INT_MASK;
set_ctrl(ctrl);
}
@@ -289,7 +279,7 @@ arm_tmr_attach(device_t dev)
rid = 0;
sc->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
- GENERIC_TIMER_CNTPSIRQ, GENERIC_TIMER_CNTPSIRQ,
+ GT_CNTPSIRQ, GT_CNTPSIRQ,
1, RF_SHAREABLE | RF_ACTIVE);
arm_tmr_sc = sc;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-hea
svn commit: r252784 - head/include
Author: jilles Date: Fri Jul 5 14:16:04 2013 New Revision: 252784 URL: http://svnweb.freebsd.org/changeset/base/252784 Log: stdlib.h: Add correct POSIX version for POSIX extensions to C. Modified: head/include/stdlib.h Modified: head/include/stdlib.h == --- head/include/stdlib.h Fri Jul 5 14:12:26 2013(r252783) +++ head/include/stdlib.h Fri Jul 5 14:16:04 2013(r252784) @@ -161,14 +161,16 @@ _Noreturn void quick_exit(int); #endif /* __ISO_C_VISIBLE >= 2011 */ /* - * Extensions made by POSIX relative to C. We don't know yet which edition - * of POSIX made these extensions, so assume they've always been there until - * research can be done. + * Extensions made by POSIX relative to C. */ -#if __POSIX_VISIBLE /* >= ??? */ -int posix_memalign(void **, size_t, size_t); /* (ADV) */ -int rand_r(unsigned *);/* (TSF) */ +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE char *realpath(const char * __restrict, char * __restrict); +#endif +#if __POSIX_VISIBLE >= 199506 +int rand_r(unsigned *);/* (TSF) */ +#endif +#if __POSIX_VISIBLE >= 200112 +int posix_memalign(void **, size_t, size_t); /* (ADV) */ int setenv(const char *, const char *, int); int unsetenv(const char *); #endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r252375 - head/lib/libfetch
On Jul 5, 2013, at 10:59, Dag-Erling Smørgrav wrote: > Tim Kientzle writes: >> Log: >> Fix -Wunsequenced warning. >> >> Submitted by: d...@gmx.com > > Neither approved by nor even discussed with the author and maintainer. > > (not saying it's wrong, but...) Actually the warning (from clang trunk) was technically wrong, as a function call is a sequence point. I reported that upstream, and it got fixed in the mean time. That said, the construction still looked a little dodgy, and if the function call ever gets changed into a macro invocation, there could be trouble. :-) -Dimitry ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252795 - in head/usr.sbin/bsdconfig: networking/share password password/share share share/media startup/share usermgmt usermgmt/share
Author: dteske Date: Fri Jul 5 16:00:01 2013 New Revision: 252795 URL: http://svnweb.freebsd.org/changeset/base/252795 Log: Use f_show_msg() instead of f_dialog_msgbox() where appropriate. The main difference between these two functions: Usage: f_show_msg() $format_string [ $format_args ... ] Usage: f_dialog_msgbox() $text [ $hline ] The former lends itself well to displaying the $msg_* i18n text, prompts, etc. While the latter is better for text you do not control (error strings captured as a response from external commands) -- or if you have to control the hline. Modified: head/usr.sbin/bsdconfig/networking/share/device.subr head/usr.sbin/bsdconfig/networking/share/resolv.subr head/usr.sbin/bsdconfig/password/password head/usr.sbin/bsdconfig/password/share/password.subr head/usr.sbin/bsdconfig/share/media/cdrom.subr head/usr.sbin/bsdconfig/share/media/dos.subr head/usr.sbin/bsdconfig/share/media/floppy.subr head/usr.sbin/bsdconfig/share/media/ftp.subr head/usr.sbin/bsdconfig/share/media/network.subr head/usr.sbin/bsdconfig/share/media/nfs.subr head/usr.sbin/bsdconfig/share/media/tcpip.subr head/usr.sbin/bsdconfig/share/media/usb.subr head/usr.sbin/bsdconfig/share/mustberoot.subr head/usr.sbin/bsdconfig/startup/share/rcconf.subr head/usr.sbin/bsdconfig/usermgmt/groupinput head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr head/usr.sbin/bsdconfig/usermgmt/userinput Modified: head/usr.sbin/bsdconfig/networking/share/device.subr == --- head/usr.sbin/bsdconfig/networking/share/device.subrFri Jul 5 15:57:36 2013(r252794) +++ head/usr.sbin/bsdconfig/networking/share/device.subrFri Jul 5 16:00:01 2013(r252795) @@ -124,7 +124,7 @@ f_dialog_menu_netdev() done ) if [ ! "$interfaces" ]; then - f_dialog_msgbox "$msg_no_network_interfaces" + f_show_msg "$msg_no_network_interfaces" return $FAILURE fi Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr == --- head/usr.sbin/bsdconfig/networking/share/resolv.subrFri Jul 5 15:57:36 2013(r252794) +++ head/usr.sbin/bsdconfig/networking/share/resolv.subrFri Jul 5 16:00:01 2013(r252795) @@ -371,9 +371,9 @@ f_dialog_input_nameserver() local retval=$? case $retval in 1) f_die 1 "$msg_internal_error_nsindex_value" "$nsindex" ;; - 2) f_dialog_msgbox "$msg_resolv_conf_changed_while_editing" + 2) f_show_msg "$msg_resolv_conf_changed_while_editing" return $retval ;; - 3) f_dialog_msgbox "$msg_resolv_conf_entry_no_longer_exists" + 3) f_show_msg "$msg_resolv_conf_entry_no_longer_exists" return $retval ;; esac Modified: head/usr.sbin/bsdconfig/password/password == --- head/usr.sbin/bsdconfig/password/password Fri Jul 5 15:57:36 2013 (r252794) +++ head/usr.sbin/bsdconfig/password/password Fri Jul 5 16:00:01 2013 (r252795) @@ -75,7 +75,7 @@ f_mustberoot_init if f_dialog_input_password; then err=$( echo "$pw_password" | pw usermod $USER_ROOT -h 0 2>&1 ) || f_die $? "%s" "$err" - f_dialog_msgbox "$msg_password_changed" + f_show_msg "$msg_password_changed" fi return $SUCCESS Modified: head/usr.sbin/bsdconfig/password/share/password.subr == --- head/usr.sbin/bsdconfig/password/share/password.subrFri Jul 5 15:57:36 2013(r252794) +++ head/usr.sbin/bsdconfig/password/share/password.subrFri Jul 5 16:00:01 2013(r252795) @@ -100,13 +100,13 @@ f_dialog_input_password() # Check for NULL entry if ! [ "$_password1" -o "$_password2" ]; then - f_dialog_msgbox "$msg_password_is_empty" + f_show_msg "$msg_password_is_empty" continue fi # Check for password mismatch if [ "$_password1" != "$_password2" ]; then - f_dialog_msgbox "$msg_passwords_do_not_match" + f_show_msg "$msg_passwords_do_not_match" continue fi Modified: head/usr.sbin/bsdconfig/share/media/cdrom.subr == --- head/usr.sbin/bsdconfig/share/media/cdrom.subr Fri Jul 5 15:57:36 2013(r252794) +++ head/usr.sbin/bsdconfig/share/media/cdrom.subr Fri Jul 5 16:00:01 2013
Re: svn commit: r251422 - in head: contrib/bmake usr.bin/bmake
On 2013-06-24 20:57, Tijl Coosemans wrote:
> On 2013-06-05 18:12, Simon J. Gerraty wrote:
>> Author: sjg
>> Date: Wed Jun 5 16:12:50 2013
>> New Revision: 251422
>> URL: http://svnweb.freebsd.org/changeset/base/251422
>>
>> Log:
>> Update to bmake-20130604 to fix file descriptor leak.
>>
>> Modified: head/contrib/bmake/job.c
>> ==
>> --- head/contrib/bmake/job.c Wed Jun 5 15:52:24 2013(r251421)
>> +++ head/contrib/bmake/job.c Wed Jun 5 16:12:50 2013(r251422)
>> @@ -1,4 +1,4 @@
>> -/* $NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $ */
>> +/* $NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $*/
>>
>> /*
>> * Copyright (c) 1988, 1989, 1990 The Regents of the University of
>> California.
>> @@ -70,14 +70,14 @@
>> */
>>
>> #ifndef MAKE_NATIVE
>> -static char rcsid[] = "$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos
>> Exp $";
>> +static char rcsid[] = "$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp
>> $";
>> #else
>> #include
>> #ifndef lint
>> #if 0
>> static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
>> #else
>> -__RCSID("$NetBSD: job.c,v 1.172 2013/03/05 22:01:43 christos Exp $");
>> +__RCSID("$NetBSD: job.c,v 1.173 2013/06/05 03:59:43 sjg Exp $");
>> #endif
>> #endif /* not lint */
>> #endif
>> @@ -414,6 +414,15 @@ JobCreatePipe(Job *job, int minfd)
>> if (pipe(job->jobPipe) == -1)
>> Punt("Cannot create pipe: %s", strerror(errno));
>>
>> +for (i = 0; i < 2; i++) {
>> + /* Avoid using low numbered fds */
>> + fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
>> + if (fd != -1) {
>> + close(job->jobPipe[i]);
>> + job->jobPipe[i] = fd;
>> + }
>> +}
>> +
>> /* Set close-on-exec flag for both */
>> (void)fcntl(job->jobPipe[0], F_SETFD, 1);
>> (void)fcntl(job->jobPipe[1], F_SETFD, 1);
>
> I've been noticing that bmake doesn't run parallel jobs as like fmake.
> I've attached a Makefile that I think shows what's going wrong.
>
> If you run "make -j4" it outputs the following:
>
> ===
> --- all ---
> -j 4 -i -J 15,16
> 4
> -j 4 -i
> 4
> --- sub_2 ---
> -j 4 -i -J 15,16
> 4
> -j 4 -i
> 4
> ===
>
> Bmake outputs the target name in -j mode (e.g. "--- all ---"), but
> there's no "--- sub_1 ---" and "--- sub_3 ---" which suggests -j isn't
> working there. The -J flag also doesn't appear in .MAKEFLAGS in those
> targets.
>
> I suspect the descriptors for the job server have to remain open so
> submakes can pick them up. At least, when I comment out the two fcntl
> calls above (and two more below), I do get the output I expect:
>
> ===
> --- all ---
> -j 4 -J 15,16
> 4
> --- sub_1 ---
> -j 4 -J 15,16
> 4
> --- sub_2 ---
> -j 4 -J 15,16
> 4
> --- sub_3 ---
> -j 4 -J 15,16
> 4
> ===
>
>> @@ -426,15 +435,6 @@ JobCreatePipe(Job *job, int minfd)
>> */
>> fcntl(job->jobPipe[0], F_SETFL,
>> fcntl(job->jobPipe[0], F_GETFL, 0) | O_NONBLOCK);
>> -
>> -for (i = 0; i < 2; i++) {
>> - /* Avoid using low numbered fds */
>> - fd = fcntl(job->jobPipe[i], F_DUPFD, minfd);
>> - if (fd != -1) {
>> - close(job->jobPipe[i]);
>> - job->jobPipe[i] = fd;
>> - }
>> -}
>> }
>>
>> /*-
>> @@ -2828,6 +2828,8 @@ Job_ServerStart(int max_tokens, int jp_0
>> /* Pipe passed in from parent */
>> tokenWaitJob.inPipe = jp_0;
>> tokenWaitJob.outPipe = jp_1;
>> +(void)fcntl(jp_0, F_SETFD, 1);
>> +(void)fcntl(jp_1, F_SETFD, 1);
>
> These two fcntl calls have to be commented out too.
When those four lines are commented out buildworld with four jobs
runs 10% faster.
Now that I've taken a closer look at the code it seems bmake requires
targets that run make to be marked with .MAKE. Several targets in
Makefile and Makefile.inc1 already have this, but some don't, such as
bootstrap-tools. Can this be added there?
signature.asc
Description: OpenPGP digital signature
svn commit: r252797 - head/usr.sbin/sysrc
Author: dteske
Date: Fri Jul 5 16:21:44 2013
New Revision: 252797
URL: http://svnweb.freebsd.org/changeset/base/252797
Log:
Do not inherit $SYSRC_VERBOSE from operating environment. The concern is
that when a user (such as myself) which has SYSRC_VERBOSE=1 in his/her
~/.bash_profile or such that when they are told to execute a command like:
hostname `sysrc -n hostname`
NOTE: To activate a recently configured hostname.
If $SYSRC_VERBOSE is set, then POLA is violated because the output of sysrc
is indirectly influenced (making for an inconsistent experience).
Modified:
head/usr.sbin/sysrc/sysrc
Modified: head/usr.sbin/sysrc/sysrc
==
--- head/usr.sbin/sysrc/sysrc Fri Jul 5 16:03:19 2013(r252796)
+++ head/usr.sbin/sysrc/sysrc Fri Jul 5 16:21:44 2013(r252797)
@@ -1,6 +1,6 @@
#!/bin/sh
#-
-# Copyright (c) 2010-2012 Devin Teske
+# Copyright (c) 2010-2013 Devin Teske
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,13 +32,6 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
[ "$_COMMON_SUBR" ] || . $BSDCFG_SHARE/common.subr || exit 1
[ "$_SYSRC_SUBR" ] || f_include $BSDCFG_SHARE/sysrc.subr
- CONFIGURATION
-
-#
-# Default verbosity.
-#
-: ${SYSRC_VERBOSE:=}
-
GLOBALS
#
@@ -55,6 +48,7 @@ SHOW_EQUALS=
SHOW_FILE=
SHOW_NAME=1
SHOW_VALUE=1
+SYSRC_VERBOSE=
FUNCTIONS
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252798 - head/usr.sbin/sysrc
Author: dteske Date: Fri Jul 5 16:45:25 2013 New Revision: 252798 URL: http://svnweb.freebsd.org/changeset/base/252798 Log: Update sysrc(8) manual to coincide with r252797: Do not inherit $SYSRC_VERBOSE from operating environment. The concern is that when a user (such as myself) which has SYSRC_VERBOSE=1 in his/her ~/.bash_profile or such that when they are told to execute a command like: hostname `sysrc -n hostname` NOTE: To activate a recently configured hostname. If $SYSRC_VERBOSE is set, then POLA is violated because the output of sysrc is indirectly influenced (making for an inconsistent experience). Modified: head/usr.sbin/sysrc/sysrc.8 Modified: head/usr.sbin/sysrc/sysrc.8 == --- head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:21:44 2013(r252797) +++ head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:45:25 2013(r252798) @@ -99,10 +99,9 @@ Show only variable values, not their nam Show only variable names, not their values. .It Fl q Quiet. -Ignore previous +Ignore previous occurrences of .Fl v -and/or -.Ev SYSRC_VERBOSE . +flag. .It Fl R Ar dir Operate within the root directory .Pq Sq Ar dir @@ -175,7 +174,7 @@ be called repeatedly). .Sh ENVIRONMENT The following environment variables are referenced by .Nm : -.Bl -tag -width ".Ev SYSRC_VERBOSE" +.Bl -tag -width ".Ev RC_DEFAULTS" .It Ev RC_CONFS Override default .Ql rc_conf_files @@ -184,9 +183,6 @@ Override default Location of .Ql /etc/defaults/rc.conf file. -.It Ev SYSRC_VERBOSE -Default verbosity. -Set to non-NULL to enable. .El .Sh DEPENDENCIES The following standard commands are required by ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252799 - head/usr.sbin/sysrc
Author: dteske Date: Fri Jul 5 16:47:30 2013 New Revision: 252799 URL: http://svnweb.freebsd.org/changeset/base/252799 Log: Update copyright/date on the back of r252798. Modified: head/usr.sbin/sysrc/sysrc.8 Modified: head/usr.sbin/sysrc/sysrc.8 == --- head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:45:25 2013(r252798) +++ head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:47:30 2013(r252799) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011-2012 Devin Teske +.\" Copyright (c) 2011-2013 Devin Teske .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Aug 24, 2012 +.Dd Jul 5, 2013 .Dt SYSRC 8 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252800 - head/usr.sbin/sysrc
Author: dteske Date: Fri Jul 5 16:49:06 2013 New Revision: 252800 URL: http://svnweb.freebsd.org/changeset/base/252800 Log: Update release info. Modified: head/usr.sbin/sysrc/sysrc.8 Modified: head/usr.sbin/sysrc/sysrc.8 == --- head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:47:30 2013(r252799) +++ head/usr.sbin/sysrc/sysrc.8 Fri Jul 5 16:49:06 2013(r252800) @@ -288,7 +288,7 @@ This will be corrected by a future enhan A .Nm utility first appeared in -.Fx 10.0 . +.Fx 9.2 . .Sh AUTHORS .An Devin Teske Aq dte...@freebsd.org .Sh THANKS TO ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252801 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:21:40 2013 New Revision: 252801 URL: http://svnweb.freebsd.org/changeset/base/252801 Log: Whitespace. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 16:49:06 2013 (r252800) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:21:40 2013 (r252801) @@ -56,7 +56,7 @@ .\"security .\"ttys .\"[dot] -.\" +.\" .\" $FreeBSD$ .\" .Dd Jan 5, 2013 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252802 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:22:10 2013 New Revision: 252802 URL: http://svnweb.freebsd.org/changeset/base/252802 Log: Fix a typo. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:21:40 2013 (r252801) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:22:10 2013 (r252802) @@ -141,7 +141,7 @@ language file .Pq printed on stdout visualizing the .Nm -menu, include, and shortcut structure and relationships. See +menu, include, and shortcut structure relationships. See .Dq bsdconfig dot -h for more details. .It Cm groupadd ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252803 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:23:00 2013 New Revision: 252803 URL: http://svnweb.freebsd.org/changeset/base/252803 Log: Update date on the back of r252802. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:22:10 2013 (r252802) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:23:00 2013 (r252803) @@ -59,7 +59,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 5, 2013 +.Dd Jun 5, 2013 .Dt BSDCONFIG 8 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252804 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:27:55 2013 New Revision: 252804 URL: http://svnweb.freebsd.org/changeset/base/252804 Log: mdoc: begin sentences on a new line. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:23:00 2013 (r252803) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:27:55 2013 (r252804) @@ -80,8 +80,9 @@ is used to set up many system configurat well as changing configuration settings of existing systems. .Pp .Nm -takes a command as an argument. If invoked with no arguments, it will bring up -a master menu listing the available commands. +takes a command as an argument. +If invoked with no arguments, it will bring up a master menu listing the +available commands. .Pp The following options are available: .Bl -tag -width indent+ @@ -115,8 +116,8 @@ The following commands .Pq sorted alphabetically are currently included in the base .Nm -program, with more to be added soon. Other commands can be added, as detailed -below in the +program, with more to be added soon. +Other commands can be added, as detailed below in the .Cm ADDING COMMANDS section, and once added, will appear in the master menu as well as in the .Cm -h @@ -127,7 +128,8 @@ Utilities to customize the behavior of t .It Cm defaultrouter Shortcut to the Default Router/Gateway menu under networking. .It Cm diskmgmt -Manage disk partitions and/or labels. Executes +Manage disk partitions and/or labels. +Executes .Xr sade 8 . .It Cm docsinstall Executes the @@ -141,7 +143,8 @@ language file .Pq printed on stdout visualizing the .Nm -menu, include, and shortcut structure relationships. See +menu, include, and shortcut structure relationships. +See .Dq bsdconfig dot -h for more details. .It Cm groupadd @@ -210,8 +213,8 @@ In the absence of language-specific tran .Pq en_US.ISO8859-1 files will be used. .Sh ADDING COMMANDS -To be documented later. Document menu_selection="command|*" syntax of INDEX -files. +To be documented later. +Document menu_selection="command|*" syntax of INDEX files. .Sh ENVIRONMENT VARIABLES The following environment variables affect the execution of .Nm : @@ -219,7 +222,8 @@ The following environment variables affe .It Ev LANG If LANG is set, messages and index information will be read from files named messages.$LANG and INDEX.$LANG and fall back to files named messages and INDEX if -messages.$LANG and INDEX.$LANG do not exist. LANG takes precedence over LC_ALL. +messages.$LANG and INDEX.$LANG do not exist. +LANG takes precedence over LC_ALL. .It Ev LC_ALL If LC_ALL is set, messages and index information will be read from files named messages.$LC_ALL and INDEX.$LC_ALL and fall back to files named messages and INDEX if ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252805 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:31:05 2013 New Revision: 252805 URL: http://svnweb.freebsd.org/changeset/base/252805 Log: Don't refer to a port manual. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:27:55 2013 (r252804) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:31:05 2013 (r252805) @@ -235,7 +235,6 @@ customized as needed. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO -.Xr host-setup 8 , .Xr sade 8 .Sh HISTORY .Nm ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252806 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:35:13 2013 New Revision: 252806 URL: http://svnweb.freebsd.org/changeset/base/252806 Log: Since r251908, bsdconfig(8) has no direct ties to sade(8) (instead uses `bsdinstall partedit'). Update references (s/sade/bsdinstall/) and change the BUGS section to be based on reality. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:31:05 2013 (r252805) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:35:13 2013 (r252806) @@ -235,7 +235,7 @@ customized as needed. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO -.Xr sade 8 +.Xr bsdinstall 8 .Sh HISTORY .Nm first appeared in @@ -244,4 +244,6 @@ first appeared in .An Ron McDowell Aq r...@fuzzwad.org .An Devin Teske Aq devinte...@hotmail.com .Sh BUGS -Undoubtedly. +The docsinstall and diskmgmt modules call bsdinstall. +Bugs found in these modules should be considered those of bsdinstall, not +.Nm . ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252807 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:38:54 2013 New Revision: 252807 URL: http://svnweb.freebsd.org/changeset/base/252807 Log: Update e-mails. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:35:13 2013 (r252806) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:38:54 2013 (r252807) @@ -241,8 +241,8 @@ customized as needed. first appeared in .Fx 10.0 . .Sh AUTHORS -.An Ron McDowell Aq r...@fuzzwad.org -.An Devin Teske Aq devinte...@hotmail.com +.An Ron McDowell Aq r...@fuzzwad.org +.An Devin Teske Aq dte...@freebsd.org .Sh BUGS The docsinstall and diskmgmt modules call bsdinstall. Bugs found in these modules should be considered those of bsdinstall, not ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252808 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:44:53 2013 New Revision: 252808 URL: http://svnweb.freebsd.org/changeset/base/252808 Log: Rest in peace Ron (Ron McDowell Jul.12, 1955 - Aug.26, 2012). I'll carry-on from here. Thank you so much for your hard work. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:38:54 2013 (r252807) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:44:53 2013 (r252808) @@ -241,7 +241,7 @@ customized as needed. first appeared in .Fx 10.0 . .Sh AUTHORS -.An Ron McDowell Aq r...@fuzzwad.org +.An Ron McDowell .An Devin Teske Aq dte...@freebsd.org .Sh BUGS The docsinstall and diskmgmt modules call bsdinstall. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252809 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 17:45:54 2013 New Revision: 252809 URL: http://svnweb.freebsd.org/changeset/base/252809 Log: Update HISTORY. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:44:53 2013 (r252808) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:45:54 2013 (r252809) @@ -239,7 +239,7 @@ customized as needed. .Sh HISTORY .Nm first appeared in -.Fx 10.0 . +.Fx 9.2 . .Sh AUTHORS .An Ron McDowell .An Devin Teske Aq dte...@freebsd.org ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252810 - head/usr.sbin/bsdconfig/examples
Author: dteske Date: Fri Jul 5 17:54:08 2013 New Revision: 252810 URL: http://svnweb.freebsd.org/changeset/base/252810 Log: Add example shell script for creating a local INDEX file that can be accessed quickly for browsing a list of available packages. Added: head/usr.sbin/bsdconfig/examples/browse_packages.sh (contents, props changed) Added: head/usr.sbin/bsdconfig/examples/browse_packages.sh == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/bsdconfig/examples/browse_packages.sh Fri Jul 5 17:54:08 2013(r252810) @@ -0,0 +1,25 @@ +#!/bin/sh +# $FreeBSD$ +# +# This sample downloads the package INDEX file from FTP to /tmp (if it doesn't +# already exist) and then displays the package configuration/management screen +# using the local INDEX file (results in faster browsing of packages from-start +# since the INDEX can be loaded from local media). +# +# NOTE: Packages cannot be installed unless staged to /tmp/packages/All +# +. /usr/share/bsdconfig/script.subr +nonInteractive=1 +TMPDIR=/tmp +if [ ! -e "$TMPDIR/packages/INDEX" ]; then + [ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1 + _ftpPath=ftp://ftp-archive.freebsd.org + mediaSetFTP + mediaOpen + f_show_info "Downloading packages/INDEX from %s" "$_ftpPath" + f_device_get media packages/INDEX > $TMPDIR/packages/INDEX + mediaClose +fi +_directoryPath=$TMPDIR +mediaSetDirectory +configPackages ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252811 - head/usr.sbin/bsdconfig/examples
Author: dteske Date: Fri Jul 5 17:56:15 2013 New Revision: 252811 URL: http://svnweb.freebsd.org/changeset/base/252811 Log: Change default FTP server (s/ftp-archive/ftp/). Modified: head/usr.sbin/bsdconfig/examples/browse_packages.sh Modified: head/usr.sbin/bsdconfig/examples/browse_packages.sh == --- head/usr.sbin/bsdconfig/examples/browse_packages.sh Fri Jul 5 17:54:08 2013(r252810) +++ head/usr.sbin/bsdconfig/examples/browse_packages.sh Fri Jul 5 17:56:15 2013(r252811) @@ -13,7 +13,8 @@ nonInteractive=1 TMPDIR=/tmp if [ ! -e "$TMPDIR/packages/INDEX" ]; then [ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1 - _ftpPath=ftp://ftp-archive.freebsd.org + _ftpPath=ftp://ftp.freebsd.org + # For older releases, use ftp://ftp-archive.freebsd.org mediaSetFTP mediaOpen f_show_info "Downloading packages/INDEX from %s" "$_ftpPath" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252813 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 18:03:00 2013 New Revision: 252813 URL: http://svnweb.freebsd.org/changeset/base/252813 Log: Document new `-d' and `-D file' debugging options. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 17:57:25 2013 (r252812) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:03:00 2013 (r252813) @@ -86,6 +86,12 @@ available commands. .Pp The following options are available: .Bl -tag -width indent+ +.It Fl d +Provide lots of debugging info on standard-out when running. +.It Fl D Ar file +Send debugging info to file. +If file begins with a plus-sign debug info is sent to both standard-out and +file (minus the leading plus). .It Fl f Ar file Load .Ar file ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252815 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 18:29:09 2013 New Revision: 252815 URL: http://svnweb.freebsd.org/changeset/base/252815 Log: Make a correction to the description of invocation with-versus-without arguments, making things a bit more clear [hopefully]. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:27:38 2013 (r252814) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:29:09 2013 (r252815) @@ -80,9 +80,9 @@ is used to set up many system configurat well as changing configuration settings of existing systems. .Pp .Nm -takes a command as an argument. -If invoked with no arguments, it will bring up a master menu listing the -available commands. +optionally takes a command as an argument. +If invoked with no arguments, it will bring up an interactive menu listing the +available modules. .Pp The following options are available: .Bl -tag -width indent+ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252816 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 18:30:43 2013 New Revision: 252816 URL: http://svnweb.freebsd.org/changeset/base/252816 Log: Document remaining undocumented modules (and remove my silly place-holder thing at the top, which I was using as a way to make sure I didn't forget to document any modules). Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:29:09 2013 (r252815) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:30:43 2013 (r252816) @@ -23,40 +23,6 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\"docsinstall -.\"password -.\"diskmgmt -.\"usermgmt -.\" useradd -.\" useredit -.\" userdel -.\"groupmgmt -.\" groupadd -.\" groupedit -.\" groupdel -.\"console -.\" syscons_font -.\" syscons_keymap -.\" syscons_repeat -.\" syscons_saver -.\" syscons_screenmap -.\" syscons_ttys -.\"timezone -.\"mouse -.\" mouse_enable -.\" mouse_type -.\" mouse_port -.\" mouse_flags -.\" mouse_disable -.\"networking -.\" defaultrouter -.\" hostname -.\" nameservers -.\" netdev -.\"security -.\"ttys -.\"[dot] -.\" .\" $FreeBSD$ .\" .Dd Jun 5, 2013 @@ -163,6 +129,8 @@ Shortcut to the Edit/View Groups menu un Utilities to Add/Change/View/Delete Group Accounts. .It Cm hostname Shortcut to the Hostname/Domain menu under networking. +.It Cm kern_securelevel +Shortcut to the kern.securelevel menu under security. .It Cm mouse Utilities for configuring, exploring, and enabling console mouse support. .It Cm mouse_disable @@ -182,12 +150,28 @@ Shortcut to the Network Interfaces menu .It Cm networking Utilities to set/change Hostname/Domain, Network Interfaces, Default Router/Gateway, and DNS Nameservers. +.It Cm packages +Browse, install, uninstall, or re-install packaged software. .It Cm password Set the system administrator .Pq root password. .It Cm security Configure various system security settings. +.It Cm startup +Configure various aspects of system startup. +.It Cm startup_misc +Shortcut to the Miscellaneous Startup Services menu under startup. +.It Cm startup_rcadd +Shortcut to the Add New menu under the View/Edit Startup Configuration menu +(startup_rcconf) of startup. +.It Cm startup_rcconf +Shortcut to the View/Edit Startup Configuration menu under startup. +.It Cm startup_rcdelete +Shortcut to the Delete menu under the View/Edit Startup Configuration menu +(startup_rcconf) of startup. +.It Cm startup_rcvar +Shortcut to the Toggle Startup Services menu under startup. .It Cm syscons_font Shortcut to the Font menu under console. .It Cm syscons_keymap @@ -202,6 +186,10 @@ Shortcut to the Screenmap menu under con Shortcut to the Ttys menu under console. .It Cm timezone Set the regional timezone of the local machine. +.It Cm ttys +Edit the +.Xr ttys 5 +database with your favorite editor. .It Cm useradd Shortcut to the Add Users menu under usermgmt. .It Cm userdel ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252817 - head/usr.sbin/bsdconfig
Author: dteske Date: Fri Jul 5 18:31:26 2013 New Revision: 252817 URL: http://svnweb.freebsd.org/changeset/base/252817 Log: Adhere to 80-column width. Modified: head/usr.sbin/bsdconfig/bsdconfig.8 Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:30:43 2013 (r252816) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Fri Jul 5 18:31:26 2013 (r252817) @@ -215,17 +215,17 @@ The following environment variables affe .Bl -tag -width ".Ev LC_ALL" .It Ev LANG If LANG is set, messages and index information will be read from files named -messages.$LANG and INDEX.$LANG and fall back to files named messages and INDEX if -messages.$LANG and INDEX.$LANG do not exist. +messages.$LANG and INDEX.$LANG and fall back to files named messages and INDEX +if messages.$LANG and INDEX.$LANG do not exist. LANG takes precedence over LC_ALL. .It Ev LC_ALL If LC_ALL is set, messages and index information will be read from files named -messages.$LC_ALL and INDEX.$LC_ALL and fall back to files named messages and INDEX if -messages.$LC_ALL and INDEX.$LC_ALL do not exist. +messages.$LC_ALL and INDEX.$LC_ALL and fall back to files named messages and +INDEX if messages.$LC_ALL and INDEX.$LC_ALL do not exist. .El .Sh FILES -/usr/share/examples/bsdconfig/bsdconfigrc can be copied to $HOME/.bsdconfigrc and -customized as needed. +/usr/share/examples/bsdconfig/bsdconfigrc can be copied to $HOME/.bsdconfigrc +and customized as needed. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252822 - head/usr.sbin/bsdconfig/examples
Author: dteske
Date: Fri Jul 5 18:50:17 2013
New Revision: 252822
URL: http://svnweb.freebsd.org/changeset/base/252822
Log:
Oops, r252810 forgot to hook the new example file (browse_packages.sh) into
the Makefile.
Modified:
head/usr.sbin/bsdconfig/examples/Makefile
Modified: head/usr.sbin/bsdconfig/examples/Makefile
==
--- head/usr.sbin/bsdconfig/examples/Makefile Fri Jul 5 18:47:25 2013
(r252821)
+++ head/usr.sbin/bsdconfig/examples/Makefile Fri Jul 5 18:50:17 2013
(r252822)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${SHAREDIR}/examples/bsdconfig
-FILES= bsdconfigrc
+FILES= browse_packages.sh bsdconfigrc
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252826 - head/usr.sbin/ppp
Author: rmh
Date: Fri Jul 5 19:26:01 2013
New Revision: 252826
URL: http://svnweb.freebsd.org/changeset/base/252826
Log:
Remove ancient code for FreeBSD 2.x compatibility.
Reviewed by: brian, freebsd-net
Modified:
head/usr.sbin/ppp/defs.c
head/usr.sbin/ppp/defs.h
Modified: head/usr.sbin/ppp/defs.c
==
--- head/usr.sbin/ppp/defs.cFri Jul 5 19:11:12 2013(r252825)
+++ head/usr.sbin/ppp/defs.cFri Jul 5 19:26:01 2013(r252826)
@@ -43,7 +43,7 @@
#include
#endif
#include
-#if !defined(__FreeBSD__) || __FreeBSD__ < 3
+#ifndef __FreeBSD__
#include
#endif
#include
@@ -56,20 +56,11 @@
#defineissep(c)((c) == '\t' || (c) == ' ')
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#ifdef __NetBSD__
void
randinit()
{
-#if defined(__FreeBSD__)
- static int initdone; /* srandomdev() call is only required once */
-
- if (!initdone) {
-initdone = 1;
-srandomdev();
- }
-#else
srandom((time(NULL)^getpid())+random());
-#endif
}
#endif
Modified: head/usr.sbin/ppp/defs.h
==
--- head/usr.sbin/ppp/defs.hFri Jul 5 19:11:12 2013(r252825)
+++ head/usr.sbin/ppp/defs.hFri Jul 5 19:26:01 2013(r252826)
@@ -117,7 +117,7 @@
#define ROUNDUP(x) ((x) ? (1 + (((x) - 1) | (sizeof(long) - 1))) :
sizeof(long))
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#ifdef __NetBSD__
extern void randinit(void);
#else
#define random arc4random
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252833 - in head/usr.sbin/bsdconfig: . share
Author: dteske
Date: Fri Jul 5 19:57:40 2013
New Revision: 252833
URL: http://svnweb.freebsd.org/changeset/base/252833
Log:
Don't calculate the tag until we know that we're going to make a new menu
item entry. Also join simple NULL assignments into a single line.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/share/common.subr
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 19:45:16 2013
(r252832)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 19:57:40 2013
(r252833)
@@ -170,11 +170,8 @@ dialog_menu_main()
local menuitem menu_title menu_help menu_selection index=2
for menuitem in $( cd $BSDCFG_LIBE && ls -d [0-9][0-9][0-9].* ); do
[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
- tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
- menu_program=
- menu_title=
- menu_help=
+ menu_program= menu_title= menu_help=
f_include_lang $BSDCFG_LIBE/$menuitem/INDEX
[ "$menu_program" ] || continue
@@ -183,9 +180,11 @@ dialog_menu_main()
*) menu_program="$menuitem/$menu_program"
esac
+ tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
+ setvar "menu_program$tag" "$menu_program"
+
f_shell_escape "$menu_title" menu_title
f_shell_escape "$menu_help" menu_help
- setvar "menu_program$tag" "$menu_program"
menu_list="$menu_list '$tag' '$menu_title' '$menu_help'"
index=$(( $index + 1 ))
Modified: head/usr.sbin/bsdconfig/share/common.subr
==
--- head/usr.sbin/bsdconfig/share/common.subr Fri Jul 5 19:45:16 2013
(r252832)
+++ head/usr.sbin/bsdconfig/share/common.subr Fri Jul 5 19:57:40 2013
(r252833)
@@ -531,12 +531,22 @@ f_index_file()
if [ "$lang" ]; then
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang &&
- return
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return
# No match, fall-thru to non-i18n sources
fi
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return
+
+ # No match? Fall-thru to `local' libexec sources (add-on modules)
+
+ [ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE
+ if [ "$lang" ]; then
+ awk -v keyword="$keyword" "$f_index_file_awk" \
+ $BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return
+ # No match, fall-thru to non-i18n sources
+ fi
+ awk -v keyword="$keyword" "$f_index_file_awk" \
+ $BSDCFG_LOCAL_LIBE/*/INDEX
}
# f_index_menusel_keyword $indexfile $pgm
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252834 - head/usr.sbin/bsdconfig/share
Author: dteske
Date: Fri Jul 5 20:01:07 2013
New Revision: 252834
URL: http://svnweb.freebsd.org/changeset/base/252834
Log:
Oops, r252833 was not supposed to touch this file. Back-out and recommit
this file with the rest of the files it was supposed to go with.
Modified:
head/usr.sbin/bsdconfig/share/common.subr
Modified: head/usr.sbin/bsdconfig/share/common.subr
==
--- head/usr.sbin/bsdconfig/share/common.subr Fri Jul 5 19:57:40 2013
(r252833)
+++ head/usr.sbin/bsdconfig/share/common.subr Fri Jul 5 20:01:07 2013
(r252834)
@@ -531,22 +531,12 @@ f_index_file()
if [ "$lang" ]; then
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang &&
+ return
# No match, fall-thru to non-i18n sources
fi
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return
-
- # No match? Fall-thru to `local' libexec sources (add-on modules)
-
- [ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE
- if [ "$lang" ]; then
- awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return
- # No match, fall-thru to non-i18n sources
- fi
- awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LOCAL_LIBE/*/INDEX
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX
}
# f_index_menusel_keyword $indexfile $pgm
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252836 - in head/usr.sbin/bsdconfig: . share
Author: dteske
Date: Fri Jul 5 20:13:00 2013
New Revision: 252836
URL: http://svnweb.freebsd.org/changeset/base/252836
Log:
Add support for processing add-on modules from /usr/local/libexec/bsdconfig
(this is designed to allow new modules to be installed via ports/packages).
To prevent conflict with itself (sysutils/bsdconfig) as a port (which
installs its base modules to the above directory, it was long-ago decided
that so-called `base' modules would look different than now-defined `add-on'
modules. The structure of the contents for each is the same, but the naming
convention for the module directory must be different.
Base modules are named `[0-9][0-9][0-9].*' to allow SysV-style organization
while add-on modules must avoid this naming style and are simply listed in
alphabetical order by their module directory.
For example, a hypothetical port named `bsdconfig-jails' could install
/usr/local/libexec/bsdconfig/jails and provide `bsdconfig jails' as well as
a new menu entry in the main-menu.
Add-on modules are listed in the main-menu (when bsdconfig is executed with-
out arguments) below a separator after the last base-module.
In `bsdconfig -h' output, add-on modules are listed right alongside base
modules (sorted alphabetically in columnar fashion; left-to-right).
If a base module declares a keyword used by an add-on module, the base
module will always win when given `bsdconfig keyword' syntax.
Add-on modules should avoid declaring any keyword found in `script.subr' as
a reserved-word (`Resword') since bsdconfig also supports `bsdconfig resword'
as a fall-back if no keyword is found to be declared by any module.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/share/common.subr
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 20:11:27 2013
(r252835)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 20:13:00 2013
(r252836)
@@ -57,6 +57,13 @@ f_include_lang $BSDCFG_LIBE/include/mess
BSDCONFIG_HELPFILE=$BSDCFG_LIBE/include/bsdconfig.hlp
USAGE_HELPFILE=$BSDCFG_LIBE/include/usage.hlp
+ CONFIGURATION
+
+#
+# Alternate `local' libexec directory for add-on modules (e.g., from ports)
+#
+BSDCFG_LOCAL_LIBE="/usr/local/libexec/bsdconfig"
+
FUNCTIONS
# usage
@@ -83,6 +90,27 @@ usage()
}' */$index | sort
)
+ local alt_cmd_list # Calculated below (if $BSDCFG_LOCAL_LIBE exists)
+ if f_quietly cd $BSDCFG_LOCAL_LIBE; then
+ # No need to preserve CWD (headed toward exit)
+
+ # Test for language-specific indices
+ f_quietly ls */"$index.${LANG:-$LC_ALL}" &&
+ index="$index.${LANG:-$LC_ALL}"
+
+ alt_cmd_list=$(
+ awk '/^menu_selection="/ {
+ sub(/\|.*/, "")
+ sub(/^menu_selection="/, "")
+ print
+ }' */$index 2> /dev/null | sort
+ )
+
+ # Conflate lists, removing duplicates
+ cmd_list=$( printf "%s\n%s\n" \
+ "$cmd_list" "$alt_cmd_list" | sort -u )
+ fi
+
#
# Determine the longest command-length (in characters)
#
@@ -167,6 +195,9 @@ dialog_menu_main()
local defaultitem= # Calculated below
local hline=
+ #
+ # Pick up the base modules (directories named `[0-9][0-9][0-9].*')
+ #
local menuitem menu_title menu_help menu_selection index=2
for menuitem in $( cd $BSDCFG_LIBE && ls -d [0-9][0-9][0-9].* ); do
[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
@@ -190,6 +221,49 @@ dialog_menu_main()
index=$(( $index + 1 ))
done
+ #
+ # Process the `local' libexec sources.
+ #
+ # Whereas modules in $BSDCFG_LIBE must be named [0-9][0-9][0-9].*
+ # modules in $BSDCFG_LOCAL_LIBE should NOT be named this way (making it
+ # more practical for port-maintainers).
+ #
+ # This also has the fortunate side-effect of making the de-duplication
+ # effort rather simple (because so-called `base' modules must be named
+ # differently than add-on modules).
+ #
+ local separator_added=
+ for menuitem in $( cd "$BSDCFG_LOCAL_LIBE" 2> /dev/null && ls -d * )
+ do
+ [ $index -lt ${#DIALOG_MENU_TAGS} ] || break
+
+ # Skip the module if it looks like a `base' module
+ case "$menuitem" in [0-9][0-9][0-9].*) continue;; esac
+
+ menu_program= menu_title= menu_help=
+ f_include_lang $BSDCFG_LOCAL_LIBE/$menuitem/INDEX |
svn commit: r252837 - head/sys/arm/arm
Author: andrew
Date: Fri Jul 5 20:21:59 2013
New Revision: 252837
URL: http://svnweb.freebsd.org/changeset/base/252837
Log:
Fix the build with gcc.
Gcc outputs pre-UAL asm and expects the ldcl instruction with a condition
in the form ldcl, where the code produces the instruction in the UAL
form ldcl. Work around this by checking if we are using clang or gcc and
adjusting the instruction.
While here correct the cmp instruction's value to include the # before the
immediate value.
Modified:
head/sys/arm/arm/vfp.c
Modified: head/sys/arm/arm/vfp.c
==
--- head/sys/arm/arm/vfp.c Fri Jul 5 20:13:00 2013(r252836)
+++ head/sys/arm/arm/vfp.c Fri Jul 5 20:21:59 2013(r252837)
@@ -195,10 +195,23 @@ vfp_restore(struct vfp_state *vfpsave)
{
u_int vfpscr = 0;
+ /*
+* Work around an issue with GCC where the asm it generates is
+* not unified syntax and fails to assemble because it expects
+* the ldcleq instruction in the form ldcl, not in the UAL
+* form ldcl, and similar for stcleq.
+*/
+#ifdef __clang__
+#defineldcleq "ldcleq"
+#definestcleq "stcleq"
+#else
+#defineldcleq "ldceql"
+#definestcleq "stceql"
+#endif
if (vfpsave) {
__asm __volatile("ldc p10, c0, [%0], #128\n" /* d0-d15 */
- "cmp%0, 0\n"/* -D16 or -D32? */
- "ldcleq p11, c0, [%0], #128\n" /* d16-d31 */
+ "cmp%0, #0\n" /* -D16 or -D32? */
+ ldcleq" p11, c0, [%0], #128\n" /* d16-d31 */
"addne %0, %0, #128\n" /* skip missing regs */
"ldr%1, [%0]\n" /* set old vfpscr */
"mcrp10, 7, %1, cr1, c0, 0\n"
@@ -225,13 +238,16 @@ vfp_store(struct vfp_state *vfpsave)
tmp = fmrx(VFPEXC); /* Is the vfp enabled? */
if (vfpsave && tmp & VFPEXC_EN) {
__asm __volatile("stc p11, c0, [%1], #128\n" /* d0-d15 */
- "cmp%0, 0\n"/* -D16 or -D32? */
- "stcleq p11, c0, [%1], #128\n" /* d16-d31 */
+ "cmp%0, #0\n" /* -D16 or -D32? */
+ stcleq" p11, c0, [%1], #128\n" /* d16-d31 */
"addne %1, %1, #128\n" /* skip missing regs */
"mrcp10, 7, %0, cr1, c0, 0\n" /* fmxr(VFPSCR) */
"str%0, [%1]\n" /* save vfpscr */
: "=&r" (vfpscr) : "r" (vfpsave), "r" (is_d32) : "cc");
}
+#undef ldcleq
+#undef stcleq
+
#ifndef SMP
/* eventually we will use this information for UP also */
PCPU_SET(vfpcthread, 0);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252838 - head/lib/libc/stdio
Author: jilles Date: Fri Jul 5 20:24:50 2013 New Revision: 252838 URL: http://svnweb.freebsd.org/changeset/base/252838 Log: mktemp(3): Add standards section. Prefer standard header. mktemp(), mkstemp() and mkdtemp() are available in standard and also in . Encourage use of the former by listing it in the synopsis. Modified: head/lib/libc/stdio/mktemp.3 Modified: head/lib/libc/stdio/mktemp.3 == --- head/lib/libc/stdio/mktemp.3Fri Jul 5 20:21:59 2013 (r252837) +++ head/lib/libc/stdio/mktemp.3Fri Jul 5 20:24:50 2013 (r252838) @@ -28,7 +28,7 @@ .\" @(#)mktemp.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 4, 2012 +.Dd July 5, 2013 .Dt MKTEMP 3 .Os .Sh NAME @@ -37,15 +37,16 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In unistd.h +.In stdlib.h .Ft char * .Fn mktemp "char *template" .Ft int .Fn mkstemp "char *template" -.Ft int -.Fn mkstemps "char *template" "int suffixlen" .Ft char * .Fn mkdtemp "char *template" +.In unistd.h +.Ft int +.Fn mkstemps "char *template" "int suffixlen" .Sh DESCRIPTION The .Fn mktemp @@ -180,12 +181,36 @@ with an argument of will result in a core dump due to .Fn mkstemp attempting to modify the string constant that was given. +.Pp +The +.Fn mkdtemp , +.Fn mkstemp +and +.Fn mktemp +function prototypes are also available from +.In unistd.h . .Sh SEE ALSO .Xr chmod 2 , .Xr getpid 2 , .Xr mkdir 2 , .Xr open 2 , .Xr stat 2 +.Sh STANDARDS +The +.Fn mkstemp +and +.Fn mkdtemp +functions are expected to conform to +.St -p1003.1-2008 . +The +.Fn mktemp +function is expected to conform to +.St -p1003.1-2001 +and is not specified by +.St -p1003.1-2008 . +The +.Fn mkstemps +function does not conform to any standard. .Sh HISTORY A .Fn mktemp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r252491 - head/sys/modules
This is a bit excessive. A better option would be to disconnect just the
firmware based on the SOURCELESS flag. cxgbe(4) can be built and will work
just fine without its firmware. The firmware is bundled with the driver
just in case the one already on the card (every card has a firmware on it)
is out of date.
Regards,
Navdeep
On Mon, Jul 1, 2013 at 3:21 PM, Robert Millan wrote:
> Author: rmh
> Date: Mon Jul 1 22:21:42 2013
> New Revision: 252491
> URL: http://svnweb.freebsd.org/changeset/base/252491
>
> Log:
> Wrap cxgbe declaration around MK_SOURCELESS_UCODE check
>
> Modified:
> head/sys/modules/Makefile
>
> Modified: head/sys/modules/Makefile
>
> ==
> --- head/sys/modules/Makefile Mon Jul 1 22:07:01 2013(r252490)
> +++ head/sys/modules/Makefile Mon Jul 1 22:21:42 2013(r252491)
> @@ -81,7 +81,7 @@ SUBDIR= \
> ${_ctau} \
> ctl \
> ${_cxgb} \
> - cxgbe \
> + ${_cxgbe} \
> ${_cyclic} \
> dc \
> dcons \
> @@ -386,6 +386,10 @@ _cxgb= cxgb
> .endif
> .endif
>
> +.if ${MK_SOURCELESS_UCODE} != "no"
> +_cxgbe=cxgbe
> +.endif
> +
> .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
> .if exists(${.CURDIR}/../opencrypto)
> _crypto= crypto
>
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r251422 - in head: contrib/bmake usr.bin/bmake
On Fri, 5 Jul 2013 18:06:37 +0200, Tijl Coosemans writes: >> I've been noticing that bmake doesn't run parallel jobs as like fmake. No it doesn't. fmake exports the name of a FIFO, which any submake can open. bmake passes open descriptors to a pipe, but only if the target is flagged .MAKE. .MAKE's other property is to run the target even when -n is given. This feature, while documented in fmake's man page doesn't work. >> I've attached a Makefile that I think shows what's going wrong. Hmm I can't see the makefile, but if you add .MAKE to the target which run's the sub-makes you will see things work as expected. >> Bmake outputs the target name in -j mode (e.g. "--- all ---"), but >> there's no "--- sub_1 ---" and "--- sub_3 ---" which suggests -j isn't Because the -J flag although passed, the descriptors were closed, this cause the sub-make to ignore -j and -J not to be added to .MAKEFLAGS >> I suspect the descriptors for the job server have to remain open so >> submakes can pick them up. At least, when I comment out the two fcntl Correct, and if the target is flagged .MAKE, the close-on-exec flag will be cleared in the child. >Now that I've taken a closer look at the code it seems bmake requires >targets that run make to be marked with .MAKE. Several targets in >Makefile and Makefile.inc1 already have this, but some don't, such as >bootstrap-tools. Can this be added there? I expect so. I was being somewhat cautious. As noted above .MAKE is also supposed to cause the target to run even when -n is given. I noted that some targets which might otherwise warrant .MAKE also did things which might not be a good idea with -n. FWIW make -N would supresses the behavior of .MAKE, but few are likely to have noted that. I don't see any reason to not add .MAKE to bootstrap-tools. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252840 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
Author: mm
Date: Fri Jul 5 21:29:59 2013
New Revision: 252840
URL: http://svnweb.freebsd.org/changeset/base/252840
Log:
MFV r252839:
Quoting illumos issue #3836:
Currently zio_free() always puts the zio on a list for subsequent
processing by zio_free_sync(). This is only necessary for frees that
might need to issue reads (gang and dedup blocks).
By processing the majority of the frees as we encounter them, we reduce
the amount of time that the spa_sync() thread spends burning CPU and
not doing any i/o, thus increasing the overall write throughput of the
system.
Illumos ZFS issues:
3836 zio_free() can be processed immediately in the common case
MFC after:1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h Fri Jul
5 20:37:09 2013(r252839)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h Fri Jul
5 21:29:59 2013(r252840)
@@ -24,7 +24,7 @@
*/
/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
*/
#ifndef _ZIO_IMPL_H
@@ -38,7 +38,7 @@ extern "C" {
#endif
/*
- * XXX -- Describe ZFS I/O pipleine here. Fill in as needed.
+ * XXX -- Describe ZFS I/O pipeline here. Fill in as needed.
*
* The ZFS I/O pipeline is comprised of various stages which are defined
* in the zio_stage enum below. The individual stages are used to construct
@@ -213,7 +213,6 @@ enum zio_stage {
#defineZIO_FREE_PIPELINE \
(ZIO_INTERLOCK_STAGES | \
ZIO_STAGE_FREE_BP_INIT |\
- ZIO_STAGE_ISSUE_ASYNC | \
ZIO_STAGE_DVA_FREE |\
ZIO_STAGE_VDEV_IO_START | \
ZIO_STAGE_VDEV_IO_ASSESS)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jul 5
20:37:09 2013(r252839)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jul 5
21:29:59 2013(r252840)
@@ -763,7 +763,21 @@ void
zio_free(spa_t *spa, uint64_t txg, const blkptr_t *bp)
{
metaslab_check_free(spa, bp);
- bplist_append(&spa->spa_free_bplist[txg & TXG_MASK], bp);
+
+ /*
+* Frees that are for the currently-syncing txg, are not going to be
+* deferred, and which will not need to do a read (i.e. not GANG or
+* DEDUP), can be processed immediately. Otherwise, put them on the
+* in-memory list for later processing.
+*/
+ if (BP_IS_GANG(bp) || BP_GET_DEDUP(bp) ||
+ txg != spa->spa_syncing_txg ||
+ spa_sync_pass(spa) >= zfs_sync_pass_deferred_free) {
+ bplist_append(&spa->spa_free_bplist[txg & TXG_MASK], bp);
+ } else {
+ VERIFY0(zio_wait(zio_free_sync(NULL, spa, txg, bp,
+ BP_GET_PSIZE(bp), 0)));
+ }
}
zio_t *
@@ -771,6 +785,7 @@ zio_free_sync(zio_t *pio, spa_t *spa, ui
uint64_t size, enum zio_flag flags)
{
zio_t *zio;
+ enum zio_stage stage = ZIO_FREE_PIPELINE;
dprintf_bp(bp, "freeing in txg %llu, pass %u",
(longlong_t)txg, spa->spa_sync_pass);
@@ -782,9 +797,17 @@ zio_free_sync(zio_t *pio, spa_t *spa, ui
metaslab_check_free(spa, bp);
arc_freed(spa, bp);
+ /*
+* GANG and DEDUP blocks can induce a read (for the gang block header,
+* or the DDT), so issue them asynchronously so that this thread is
+* not tied up.
+*/
+ if (BP_IS_GANG(bp) || BP_GET_DEDUP(bp))
+ stage |= ZIO_STAGE_ISSUE_ASYNC;
+
zio = zio_create(pio, spa, txg, bp, NULL, size,
NULL, NULL, ZIO_TYPE_FREE, ZIO_PRIORITY_FREE, flags,
- NULL, 0, NULL, ZIO_STAGE_OPEN, ZIO_FREE_PIPELINE);
+ NULL, 0, NULL, ZIO_STAGE_OPEN, stage);
return (zio);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252841 - in head/sys: dev/mem kern sys
Author: jamie
Date: Fri Jul 5 21:31:16 2013
New Revision: 252841
URL: http://svnweb.freebsd.org/changeset/base/252841
Log:
Add new privileges, PRIV_KMEM_READ and PRIV_KMEM_WRITE, used in opening
/dev/kmem and /dev/mem (in addition to traditional file permission checks).
PRIV_KMEM_READ is different from other PRIV_* checks in that it's allowed
by default.
Reviewed by: kib, mckusick
Modified:
head/sys/dev/mem/memdev.c
head/sys/kern/kern_priv.c
head/sys/sys/priv.h
Modified: head/sys/dev/mem/memdev.c
==
--- head/sys/dev/mem/memdev.c Fri Jul 5 21:29:59 2013(r252840)
+++ head/sys/dev/mem/memdev.c Fri Jul 5 21:31:16 2013(r252841)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -67,8 +68,14 @@ memopen(struct cdev *dev __unused, int f
{
int error = 0;
- if (flags & FWRITE)
- error = securelevel_gt(td->td_ucred, 0);
+ if (flags & FREAD)
+ error = priv_check(td, PRIV_KMEM_READ);
+ if (flags & FWRITE) {
+ if (error == 0)
+ error = priv_check(td, PRIV_KMEM_WRITE);
+ if (error == 0)
+ error = securelevel_gt(td->td_ucred, 0);
+ }
return (error);
}
Modified: head/sys/kern/kern_priv.c
==
--- head/sys/kern/kern_priv.c Fri Jul 5 21:29:59 2013(r252840)
+++ head/sys/kern/kern_priv.c Fri Jul 5 21:31:16 2013(r252841)
@@ -142,6 +142,15 @@ priv_check_cred(struct ucred *cred, int
}
/*
+* Writes to kernel memory are a typical root-only operation,
+* but non-root users are expected to be able to read it.
+*/
+ if (priv == PRIV_KMEM_READ) {
+ error = 0;
+ goto out;
+ }
+
+ /*
* Now check with MAC, if enabled, to see if a policy module grants
* privilege.
*/
Modified: head/sys/sys/priv.h
==
--- head/sys/sys/priv.h Fri Jul 5 21:29:59 2013(r252840)
+++ head/sys/sys/priv.h Fri Jul 5 21:31:16 2013(r252841)
@@ -494,6 +494,12 @@
#definePRIV_RCTL_REMOVE_RULE 674
/*
+ * Kernel memory privileges.
+ */
+#definePRIV_KMEM_READ 680 /* Read from kernel memory. */
+#definePRIV_KMEM_WRITE 681 /* Write to kernel memory. */
+
+/*
* Track end of privilege list.
*/
#define_PRIV_HIGHEST 675
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252842 - head/usr.sbin/bsdconfig/share/packages
Author: dteske Date: Fri Jul 5 21:32:54 2013 New Revision: 252842 URL: http://svnweb.freebsd.org/changeset/base/252842 Log: Remove superfluous continue at end of loop. (pointy-hat) Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr == --- head/usr.sbin/bsdconfig/share/packages/packages.subrFri Jul 5 21:31:16 2013(r252841) +++ head/usr.sbin/bsdconfig/share/packages/packages.subrFri Jul 5 21:32:54 2013(r252842) @@ -640,7 +640,7 @@ f_package_review() debug= f_getvar _mark_$varpkg mark [ "$mark" = "I" ] || continue f_dprintf "%s: Installing %s package" $fname "$package" - f_package_add "$package" || continue + f_package_add "$package" done for package in $SELECTED_PACKAGES; do mark= ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252845 - head/sys/sys
Author: jamie Date: Fri Jul 5 21:41:05 2013 New Revision: 252845 URL: http://svnweb.freebsd.org/changeset/base/252845 Log: Bump up _PRIV_HIGHEST to account for PRIV_KMEM_READ/WRITE. Submitted by: mdf Modified: head/sys/sys/priv.h Modified: head/sys/sys/priv.h == --- head/sys/sys/priv.h Fri Jul 5 21:40:31 2013(r252844) +++ head/sys/sys/priv.h Fri Jul 5 21:41:05 2013(r252845) @@ -502,7 +502,7 @@ /* * Track end of privilege list. */ -#define_PRIV_HIGHEST 675 +#define_PRIV_HIGHEST 682 /* * Validate that a named privilege is known by the privilege system. Invalid ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252844 - in head/usr.sbin/bsdconfig/share: . packages
Author: dteske
Date: Fri Jul 5 21:40:31 2013
New Revision: 252844
URL: http://svnweb.freebsd.org/changeset/base/252844
Log:
Add the necessary code to reinstall packages. Both scripted access
(packageReinstall) and UI access have been tested successfully with a
variation of different situations including:
+ Reinstall a package for which no other packages depend
+ Purposefully do thinks like reinstall a package that is not installed
+ Try to reinstall a package which other installed packages still depend
NOTE: There is no "force" used; if a package is required by other packages,
it will not be uninstalled (and therefore no reinstall is done).
Modified:
head/usr.sbin/bsdconfig/share/packages/packages.subr
head/usr.sbin/bsdconfig/share/script.subr
Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==
--- head/usr.sbin/bsdconfig/share/packages/packages.subrFri Jul 5
21:33:32 2013(r252843)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subrFri Jul 5
21:40:31 2013(r252844)
@@ -648,7 +648,7 @@ f_package_review()
debug= f_getvar _mark_$varpkg mark
[ "$mark" = "R" ] || continue
f_dprintf "%s: Reinstalling %s package" $fname "$package"
- # XXX Re-install package
+ f_package_reinstall "$package"
done
for package in $SELECTED_PACKAGES; do
mark=
@@ -1186,6 +1186,15 @@ f_package_delete()
fi
}
+# f_package_reinstall $name
+#
+# A simple wrapper to f_package_delete() + f_package_add()
+#
+f_package_reinstall()
+{
+ f_package_delete "$1" && f_package_add "$1"
+}
+
MAIN
f_dprintf "%s: Successfully loaded." packages/packages.subr
Modified: head/usr.sbin/bsdconfig/share/script.subr
==
--- head/usr.sbin/bsdconfig/share/script.subr Fri Jul 5 21:33:32 2013
(r252843)
+++ head/usr.sbin/bsdconfig/share/script.subr Fri Jul 5 21:40:31 2013
(r252844)
@@ -196,6 +196,7 @@ f_resword_new configPCNFSD f_config_pcnf
f_resword_new configPackages f_package_config
f_resword_new packageAdd f_package_add
f_resword_new packageDeletef_package_delete
+f_resword_new packageReinstall f_package_reinstall
# variable.subr
f_resword_new installVarDefaults f_variable_set_defaults
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252846 - head/release
Author: gjb
Date: Fri Jul 5 22:04:49 2013
New Revision: 252846
URL: http://svnweb.freebsd.org/changeset/base/252846
Log:
- Add SRC_FORCE_CHECKOUT configuration option to force svn to checkout
the src/ tree into a directory that contains files/directories, such
as a case where a custom kernel configuration file is specified.
- Allow specification of multiple KERNCONFs to pass to 'make release'.
- Move evaluation of NODOCS/NOPORTS earlier, and set based on how the
release process expects these options to be evaluated.
- Wrap KERNCONF specification in double quotes, and use 'eval' so multiple
kernel configurations do not cause the build to fail in strange ways.
- Set WITHOUT_X11 for the port build flags for the documentation toolchain
build. Also run 'clean distclean' targets during port build.
PR: 180192
Submitted by: Anes Mukhametov
MFC after:3 days
Approved by: kib (mentor, implicit)
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==
--- head/release/release.conf.sampleFri Jul 5 21:41:05 2013
(r252845)
+++ head/release/release.conf.sampleFri Jul 5 22:04:49 2013
(r252846)
@@ -14,6 +14,9 @@ SRCBRANCH="base/head"
DOCBRANCH="doc/head"
PORTBRANCH="ports/head"
+## Run svn co --force for src checkout.
+#SRC_FORCE_CHECKOUT=yes
+
## Set the src/, ports/, and doc/ revisions.
SRCREVISION="-rHEAD"
DOCREVISION="-rHEAD"
@@ -23,6 +26,8 @@ PORTREVISION="-rHEAD"
#TARGET="amd64"
#TARGET_ARCH="amd64"
#KERNEL="GENERIC"
+## Multiple kernels may be set.
+#KERNEL="GENERIC XENHVM"
## Set to specify a custom make.conf and/or src.conf
#MAKE_CONF="/etc/local/make.conf"
Modified: head/release/release.sh
==
--- head/release/release.sh Fri Jul 5 21:41:05 2013(r252845)
+++ head/release/release.sh Fri Jul 5 22:04:49 2013(r252846)
@@ -45,6 +45,10 @@ SRCBRANCH="base/head"
DOCBRANCH="doc/head"
PORTBRANCH="ports/head"
+# Sometimes one needs to checkout src with --force svn option.
+# If custom kernel configs copied to src tree before checkout, e.g.
+SRC_FORCE_CHECKOUT=
+
# The default src/, doc/, and ports/ revisions.
SRCREVISION="-rHEAD"
DOCREVISION="-rHEAD"
@@ -109,6 +113,25 @@ while getopts c: opt; do
done
shift $(($OPTIND - 1))
+# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
+# is required to build the documentation set.
+if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then
+ echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
+ echo "and NOPORTS is set."
+ NODOC=yes
+fi
+
+# If NOPORTS and/or NODOC are unset, they must not pass to make as variables.
+# The release makefile verifies definedness of NOPORTS/NODOC variables
+# instead of their values.
+DOCPORTS=
+if [ "x${NOPORTS}" != "x" ]; then
+ DOCPORTS="NOPORTS=yes "
+fi
+if [ "x${NODOC}" != "x" ]; then
+ DOCPORTS="${DOCPORTS}NODOC=yes"
+fi
+
# The aggregated build-time flags based upon variables defined within
# this file, unless overridden by release.conf. In most cases, these
# will not need to be changed.
@@ -118,16 +141,14 @@ CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD
CHROOT_IMAKEFLAGS="${CONF_FILES}"
CHROOT_DMAKEFLAGS="${CONF_FILES}"
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
-RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=${KERNEL}
${ARCH_FLAGS} ${CONF_FILES}"
-RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=${KERNEL} ${CONF_FILES} \
- NODOC=${NODOC} NOPORTS=${NOPORTS}"
-
-# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
-# is required to build the documentation set.
-if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then
- echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
- echo "and NOPORTS is set."
- NODOC=1
+RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\"
${ARCH_FLAGS} ${CONF_FILES}"
+RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
+ ${DOCPORTS}"
+
+# Force src checkout if configured
+FORCE_SRC_KEY=
+if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then
+ FORCE_SRC_KEY="--force"
fi
if [ ! ${CHROOTDIR} ]; then
@@ -144,7 +165,7 @@ set -e # Everything must succeed
mkdir -p ${CHROOTDIR}/usr
-svn co ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION
+svn co ${FORCE_SRC_KEY} ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src
$SRCREVISION
if [ "x${NODOC}" = "x" ]; then
svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc $DOCREVISION
fi
@@ -164,10 +185,10 @@ trap "umount ${CHROOTDIR}/dev" EXIT # Cl
build_doc_ports() {
## Trick the ports 'run-autotools-fixup' target to do the right thing.
_OSVERSION=$(sysctl -n kern.osreldate)
-
svn commit: r252847 - head/sys/net80211
Author: adrian
Date: Fri Jul 5 22:10:50 2013
New Revision: 252847
URL: http://svnweb.freebsd.org/changeset/base/252847
Log:
Add a missing unlock.
Modified:
head/sys/net80211/ieee80211_mesh.c
Modified: head/sys/net80211/ieee80211_mesh.c
==
--- head/sys/net80211/ieee80211_mesh.c Fri Jul 5 22:04:49 2013
(r252846)
+++ head/sys/net80211/ieee80211_mesh.c Fri Jul 5 22:10:50 2013
(r252847)
@@ -1142,6 +1142,7 @@ mesh_transmit_to_gate(struct ieee80211va
m = ieee80211_encap(vap, ni, m);
if (m == NULL) {
/* NB: stat+msg handled in ieee80211_encap */
+ IEEE80211_TX_UNLOCK(ic);
ieee80211_free_node(ni);
return;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252848 - head/usr.sbin/bsdconfig
Author: dteske
Date: Fri Jul 5 22:24:43 2013
New Revision: 252848
URL: http://svnweb.freebsd.org/changeset/base/252848
Log:
Check menuitem before calculating tag.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 22:10:50 2013
(r252847)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 22:24:43 2013
(r252848)
@@ -235,11 +235,11 @@ dialog_menu_main()
local separator_added=
for menuitem in $( cd "$BSDCFG_LOCAL_LIBE" 2> /dev/null && ls -d * )
do
- [ $index -lt ${#DIALOG_MENU_TAGS} ] || break
-
# Skip the module if it looks like a `base' module
case "$menuitem" in [0-9][0-9][0-9].*) continue;; esac
+ [ $index -lt ${#DIALOG_MENU_TAGS} ] || break
+
menu_program= menu_title= menu_help=
f_include_lang $BSDCFG_LOCAL_LIBE/$menuitem/INDEX || continue
[ "$menu_program" ] || continue
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252849 - head/usr.sbin/bsdconfig
Author: dteske
Date: Fri Jul 5 22:25:40 2013
New Revision: 252849
URL: http://svnweb.freebsd.org/changeset/base/252849
Log:
Check for INDEX file first before anything else when processing modules.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 22:24:43 2013
(r252848)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri Jul 5 22:25:40 2013
(r252849)
@@ -200,6 +200,7 @@ dialog_menu_main()
#
local menuitem menu_title menu_help menu_selection index=2
for menuitem in $( cd $BSDCFG_LIBE && ls -d [0-9][0-9][0-9].* ); do
+ [ -f "$BSDCFG_LIBE/$menuitem/INDEX" ] || continue
[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
menu_program= menu_title= menu_help=
@@ -238,6 +239,7 @@ dialog_menu_main()
# Skip the module if it looks like a `base' module
case "$menuitem" in [0-9][0-9][0-9].*) continue;; esac
+ [ -f "$BSDCFG_LOCAL_LIBE/$menuitem/INDEX" ] || continue
[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
menu_program= menu_title= menu_help=
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252850 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace dev/dtrace
Author: markj
Date: Fri Jul 5 22:42:10 2013
New Revision: 252850
URL: http://svnweb.freebsd.org/changeset/base/252850
Log:
Hide references to mod_lock. In FreeBSD it is always acquired with the
provider lock held, so its use has no effect.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
head/sys/cddl/dev/dtrace/dtrace_ioctl.c
head/sys/cddl/dev/dtrace/dtrace_load.c
head/sys/cddl/dev/dtrace/dtrace_unload.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cFri Jul
5 22:25:40 2013(r252849)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cFri Jul
5 22:42:10 2013(r252850)
@@ -278,8 +278,6 @@ static kmutex_t dtrace_meta_lock; /* me
#if !defined(sun)
/* XXX FreeBSD hacks. */
-static kmutex_tmod_lock;
-
#define cr_suidcr_svuid
#define cr_sgidcr_svgid
#defineipaddr_tin_addr_t
@@ -7678,7 +7676,9 @@ dtrace_unregister(dtrace_provider_id_t i
}
} else {
mutex_enter(&dtrace_provider_lock);
+#if defined(sun)
mutex_enter(&mod_lock);
+#endif
mutex_enter(&dtrace_lock);
}
@@ -7692,7 +7692,9 @@ dtrace_unregister(dtrace_provider_id_t i
dtrace_anon.dta_state->dts_necbs > 0))) {
if (!self) {
mutex_exit(&dtrace_lock);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_provider_lock);
}
return (EBUSY);
@@ -7726,7 +7728,9 @@ dtrace_unregister(dtrace_provider_id_t i
if (!self) {
mutex_exit(&dtrace_lock);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_provider_lock);
}
@@ -7808,7 +7812,9 @@ dtrace_unregister(dtrace_provider_id_t i
if (!self) {
mutex_exit(&dtrace_lock);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_provider_lock);
}
@@ -8141,6 +8147,7 @@ dtrace_probe_provide(dtrace_probedesc_t
*/
prv->dtpv_pops.dtps_provide(prv->dtpv_arg, desc);
+#if defined(sun)
/*
* Now call the per-module provide operation. We will grab
* mod_lock to prevent the list from being modified. Note
@@ -8149,7 +8156,6 @@ dtrace_probe_provide(dtrace_probedesc_t
*/
mutex_enter(&mod_lock);
-#if defined(sun)
ctl = &modules;
do {
if (ctl->mod_busy || ctl->mod_mp == NULL)
@@ -8158,11 +8164,11 @@ dtrace_probe_provide(dtrace_probedesc_t
prv->dtpv_pops.dtps_provide_module(prv->dtpv_arg, ctl);
} while ((ctl = ctl->mod_next) != &modules);
+
+ mutex_exit(&mod_lock);
#else
(void) linker_file_foreach(dtrace_probe_provide_cb, prv);
#endif
-
- mutex_exit(&mod_lock);
} while (all && (prv = prv->dtpv_next) != NULL);
}
@@ -15156,7 +15162,9 @@ dtrace_module_loaded(modctl_t *ctl)
dtrace_provider_t *prv;
mutex_enter(&dtrace_provider_lock);
+#if defined(sun)
mutex_enter(&mod_lock);
+#endif
ASSERT(ctl->mod_busy);
@@ -15167,7 +15175,9 @@ dtrace_module_loaded(modctl_t *ctl)
for (prv = dtrace_provider; prv != NULL; prv = prv->dtpv_next)
prv->dtpv_pops.dtps_provide_module(prv->dtpv_arg, ctl);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_provider_lock);
/*
@@ -15212,7 +15222,9 @@ dtrace_module_unloaded(modctl_t *ctl)
template.dtpr_mod = ctl->mod_modname;
mutex_enter(&dtrace_provider_lock);
+#if defined(sun)
mutex_enter(&mod_lock);
+#endif
mutex_enter(&dtrace_lock);
if (dtrace_bymod == NULL) {
@@ -15221,7 +15233,9 @@ dtrace_module_unloaded(modctl_t *ctl)
* we don't have any work to do.
*/
mutex_exit(&dtrace_provider_lock);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_lock);
return;
}
@@ -15230,7 +15244,9 @@ dtrace_module_unloaded(modctl_t *ctl)
probe != NULL; probe = probe->dtpr_nextmod) {
if (probe->dtpr_ecb != NULL) {
mutex_exit(&dtrace_provider_lock);
+#if defined(sun)
mutex_exit(&mod_lock);
+#endif
mutex_exit(&dtrace_lock);
/*
@@ -15293,7 +15309,9 @@ dtrace_module_unloaded(modctl_t *ctl)
}
mutex_exit(&dtrace_
svn commit: r252851 - in head: share/man/man4 sys/dev/hptiop
Author: delphij
Date: Fri Jul 5 23:10:02 2013
New Revision: 252851
URL: http://svnweb.freebsd.org/changeset/base/252851
Log:
Add PCI IDs for HighPoint RocketRAID 4521, 3620, 3622 and 3640
controllers. Update the hptiop(4) manual page to reflect this
as well as mentioning that some cards are already end-of-life.
Many thanks to Highpoint for providing this driver update.
MFC after:1 day
Modified:
head/share/man/man4/hptiop.4
head/sys/dev/hptiop/hptiop.c
Modified: head/share/man/man4/hptiop.4
==
--- head/share/man/man4/hptiop.4Fri Jul 5 22:42:10 2013
(r252850)
+++ head/share/man/man4/hptiop.4Fri Jul 5 23:10:02 2013
(r252851)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 25, 2012
+.Dd July 5, 2013
.Dt HPTIOP 4
.Os
.Sh NAME
@@ -60,6 +60,8 @@ driver supports the following SAS and SA
.It
HighPoint RocketRAID 4522
.It
+HighPoint RocketRAID 4521
+.It
HighPoint RocketRAID 4520
.It
HighPoint RocketRAID 4322
@@ -72,6 +74,20 @@ HighPoint RocketRAID 4311
.It
HighPoint RocketRAID 4310
.It
+HighPoint RocketRAID 3640
+.It
+HighPoint RocketRAID 3622
+.It
+HighPoint RocketRAID 3620
+.El
+.Pp
+The
+.Nm
+driver also supports the following SAS and SATA RAID controllers that
+are already End-of-Life:
+.Pp
+.Bl -bullet -compact
+.It
HighPoint RocketRAID 4211
.It
HighPoint RocketRAID 4210
Modified: head/sys/dev/hptiop/hptiop.c
==
--- head/sys/dev/hptiop/hptiop.cFri Jul 5 22:42:10 2013
(r252850)
+++ head/sys/dev/hptiop/hptiop.cFri Jul 5 23:10:02 2013
(r252851)
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
#include
static const char driver_name[] = "hptiop";
-static const char driver_version[] = "v1.8";
+static const char driver_version[] = "v1.9";
static devclass_t hptiop_devclass;
@@ -1821,8 +1821,12 @@ static int hptiop_probe(device_t dev)
switch (id) {
case 0x4520:
+ case 0x4521:
case 0x4522:
sas = 1;
+ case 0x3620:
+ case 0x3622:
+ case 0x3640:
ops = &hptiop_mvfrey_ops;
break;
case 0x4210:
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252852 - head/sys/dev/hpt27xx
Author: delphij
Date: Fri Jul 5 23:13:54 2013
New Revision: 252852
URL: http://svnweb.freebsd.org/changeset/base/252852
Log:
Update hpt27xx(4) driver to address a problem reported by FreeNAS
user, where when more than one hpt27xx adapters are being used,
the "unit number" stays at 0.
Many thanks to HighPoint for providing this driver update.
MFC after:1 day
Modified:
head/sys/dev/hpt27xx/hpt27xx_config.c
head/sys/dev/hpt27xx/osm_bsd.c
Modified: head/sys/dev/hpt27xx/hpt27xx_config.c
==
--- head/sys/dev/hpt27xx/hpt27xx_config.c Fri Jul 5 23:10:02 2013
(r252851)
+++ head/sys/dev/hpt27xx/hpt27xx_config.c Fri Jul 5 23:13:54 2013
(r252852)
@@ -60,7 +60,7 @@ int init_config(void)
const char driver_name[] = "hpt27xx";
const char driver_name_long[] = "RocketRAID 27xx controller driver";
-const char driver_ver[] = "v1.0";
+const char driver_ver[] = "v1.1";
int osm_max_targets = 0xff;
Modified: head/sys/dev/hpt27xx/osm_bsd.c
==
--- head/sys/dev/hpt27xx/osm_bsd.c Fri Jul 5 23:10:02 2013
(r252851)
+++ head/sys/dev/hpt27xx/osm_bsd.c Fri Jul 5 23:13:54 2013
(r252852)
@@ -944,7 +944,6 @@ static void hpt_stop_tasks(PVBUS_EXT vbu
static d_open_thpt_open;
static d_close_t hpt_close;
static d_ioctl_t hpt_ioctl;
-static voidhpt_bus_scan_cb(struct cam_periph *periph, union ccb
*ccb);
static inthpt_rescan_bus(void);
static struct cdevsw hpt_cdevsw = {
@@ -974,7 +973,7 @@ static struct intr_config_hook hpt_ich;
*/
static void hpt_final_init(void *dummy)
{
- int i;
+ int i,unit_number=0;
PVBUS_EXT vbus_ext;
PVBUS vbus;
PHBA hba;
@@ -1058,12 +1057,12 @@ static void hpt_final_init(void *dummy)
#if __FreeBSD_version > 700025
vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
- vbus_ext, 0, &Giant, os_max_queue_comm,
/*tagged*/8, devq);
+ vbus_ext, unit_number, &Giant,
os_max_queue_comm, /*tagged*/8, devq);
#else
vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
- vbus_ext, 0, os_max_queue_comm, /*tagged*/8,
devq);
+ vbus_ext, unit_number, os_max_queue_comm,
/*tagged*/8, devq);
#endif
-
+ unit_number++;
if (!vbus_ext->sim) {
os_printk("cam_sim_alloc failed");
cam_simq_free(devq);
@@ -1337,44 +1336,26 @@ invalid:
static int hpt_rescan_bus(void)
{
- struct cam_path *path;
union ccb *ccb;
PVBUS vbus;
PVBUS_EXT vbus_ext;
-#if (__FreeBSD_version >= 50)
mtx_lock(&Giant);
-#endif
ldm_for_each_vbus(vbus, vbus_ext) {
- if (xpt_create_path(&path, NULL, cam_sim_path(vbus_ext->sim),
+ if ((ccb = xpt_alloc_ccb()) == NULL)
+ {
+ return(ENOMEM);
+ }
+ if (xpt_create_path(&ccb->ccb_h.path, NULL,
cam_sim_path(vbus_ext->sim),
CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)
+ {
+ xpt_free_ccb(ccb);
return(EIO);
- if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK)) == NULL)
- return(ENOMEM);
- bzero(ccb, sizeof(union ccb));
- xpt_setup_ccb(&ccb->ccb_h, path, 5);
- ccb->ccb_h.func_code = XPT_SCAN_BUS;
- ccb->ccb_h.cbfcnp = hpt_bus_scan_cb;
- ccb->crcn.flags = CAM_FLAG_NONE;
- xpt_action(ccb);
+ }
+ xpt_rescan(ccb);
}
-
-#if (__FreeBSD_version >= 50)
mtx_unlock(&Giant);
-#endif
-
return(0);
}
-static voidhpt_bus_scan_cb(struct cam_periph *periph, union ccb *ccb)
-{
- if (ccb->ccb_h.status != CAM_REQ_CMP)
- KdPrint(("cam_scan_callback: failure status =
%x",ccb->ccb_h.status));
- else
- KdPrint(("Scan bus successfully!"));
-
- xpt_free_path(ccb->ccb_h.path);
- free(ccb, M_TEMP);
- return;
-}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252853 - in head/usr.sbin/bsdconfig/networking: include share
Author: dteske Date: Fri Jul 5 23:16:56 2013 New Revision: 252853 URL: http://svnweb.freebsd.org/changeset/base/252853 Log: Don't prevent the user from hanging their system by changing network settings while NFS mounts are active; but DO warn them and make the default action to do nothing. (thanks julian) Modified: head/usr.sbin/bsdconfig/networking/include/messages.subr head/usr.sbin/bsdconfig/networking/share/device.subr head/usr.sbin/bsdconfig/networking/share/ipaddr.subr head/usr.sbin/bsdconfig/networking/share/media.subr head/usr.sbin/bsdconfig/networking/share/netmask.subr head/usr.sbin/bsdconfig/networking/share/routing.subr Modified: head/usr.sbin/bsdconfig/networking/include/messages.subr == --- head/usr.sbin/bsdconfig/networking/include/messages.subrFri Jul 5 23:13:54 2013(r252852) +++ head/usr.sbin/bsdconfig/networking/include/messages.subrFri Jul 5 23:16:56 2013(r252853) @@ -73,7 +73,7 @@ msg_network_configuration="%s Network Co msg_network_interfaces="Network Interfaces" msg_network_management="Network Management" msg_networking_devices="Networking Devices" -msg_nfs_mounts_may_cause_hang="WARNING! Changing this setting while NFS directories are\nmounted may cause the system to hang. Please exit this\nutility and dismount any/all remaining NFS-mounts before\nattempting to change this setting.\n\n%s" +msg_nfs_mounts_may_cause_hang="WARNING! Changing this setting while NFS directories are\nmounted may cause the system to hang. Are you sure you\nwant to proceed?\n\n%s" msg_no_network_interfaces="No network interfaces detected." msg_no_options="No options (Default)" msg_ok="OK" Modified: head/usr.sbin/bsdconfig/networking/share/device.subr == --- head/usr.sbin/bsdconfig/networking/share/device.subrFri Jul 5 23:13:54 2013(r252852) +++ head/usr.sbin/bsdconfig/networking/share/device.subrFri Jul 5 23:16:56 2013(r252853) @@ -263,16 +263,15 @@ f_dialog_menu_netdev_edit() case "$tag" in X\ *) break ;; 2\ *) # - # Do not proceed if/when there are NFS-mounts currently - # active. If the network is changed while NFS-exported - # directories are mounted, the system may hang (if any - # NFS mounts are using that interface). + # Proceed cautiously (confirm with the user) if/when NFS- + # mounts are active. If the network on which these mounts + # are made is changed parts of the system may hang. # if f_nfs_mounted && ! f_jailed; then local setting="$( printf "$msg_current_dhcp_status" \ "$interface" "$dhcp_status" )" - f_show_msg "$msg_nfs_mounts_may_cause_hang" "$setting" - continue + f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" || + continue fi # Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr == --- head/usr.sbin/bsdconfig/networking/share/ipaddr.subrFri Jul 5 23:13:54 2013(r252852) +++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subrFri Jul 5 23:16:56 2013(r252853) @@ -146,8 +146,8 @@ f_dialog_input_ipaddr() if f_nfs_mounted && ! f_jailed; then local setting="$( printf "$msg_current_ipaddr" \ "$interface" "$_ipaddr" )" - f_show_msg "$msg_nfs_mounts_may_cause_hang" "$setting" - return $FAILURE + f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" || + return $FAILURE fi local msg="$( printf "$msg_please_enter_new_ip_addr" "$interface" )" Modified: head/usr.sbin/bsdconfig/networking/share/media.subr == --- head/usr.sbin/bsdconfig/networking/share/media.subr Fri Jul 5 23:13:54 2013(r252852) +++ head/usr.sbin/bsdconfig/networking/share/media.subr Fri Jul 5 23:16:56 2013(r252853) @@ -117,8 +117,8 @@ f_dialog_input_options() if f_nfs_mounted && ! f_jailed; then local setting="$( printf "$msg_current_options" \ "$interface" "$options" )" - f_show_msg "$msg_nfs_mounts_may_cause_hang" "$setting" - return $FAILURE + f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" || + return $FAILURE fi local msg="$( printf "
svn commit: r252854 - head/sys/net
Author: cperciva
Date: Fri Jul 5 23:40:08 2013
New Revision: 252854
URL: http://svnweb.freebsd.org/changeset/base/252854
Log:
Fix typo: minmum -> minimum.
Submitted by: @z3ndrag0n
Modified:
head/sys/net/if_var.h
Modified: head/sys/net/if_var.h
==
--- head/sys/net/if_var.h Fri Jul 5 23:16:56 2013(r252853)
+++ head/sys/net/if_var.h Fri Jul 5 23:40:08 2013(r252854)
@@ -204,7 +204,7 @@ struct ifnet {
u_int if_fib; /* interface FIB */
u_char if_alloctype; /* if_type at time of allocation */
- u_int if_hw_tsomax; /* tso burst length limit, the minmum
+ u_int if_hw_tsomax; /* tso burst length limit, the minimum
* is (IP_MAXPACKET / 8).
* XXXAO: Have to find a better place
* for it eventually. */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252855 - in head/sys: kern sys
Author: jamie
Date: Sat Jul 6 00:10:52 2013
New Revision: 252855
URL: http://svnweb.freebsd.org/changeset/base/252855
Log:
Make the comments a little more clear about PRIV_KMEM_*, explicitly
referring to /dev/[k]mem and noting it's about opening the files rather
than actually reading and writing.
Reviewed by: jmallett
Modified:
head/sys/kern/kern_priv.c
head/sys/sys/priv.h
Modified: head/sys/kern/kern_priv.c
==
--- head/sys/kern/kern_priv.c Fri Jul 5 23:40:08 2013(r252854)
+++ head/sys/kern/kern_priv.c Sat Jul 6 00:10:52 2013(r252855)
@@ -142,8 +142,9 @@ priv_check_cred(struct ucred *cred, int
}
/*
-* Writes to kernel memory are a typical root-only operation,
-* but non-root users are expected to be able to read it.
+* Writes to kernel/physical memory are a typical root-only operation,
+* but non-root users are expected to be able to read it (provided they
+* have permission to access /dev/[k]mem).
*/
if (priv == PRIV_KMEM_READ) {
error = 0;
Modified: head/sys/sys/priv.h
==
--- head/sys/sys/priv.h Fri Jul 5 23:40:08 2013(r252854)
+++ head/sys/sys/priv.h Sat Jul 6 00:10:52 2013(r252855)
@@ -494,10 +494,10 @@
#definePRIV_RCTL_REMOVE_RULE 674
/*
- * Kernel memory privileges.
+ * mem(4) privileges.
*/
-#definePRIV_KMEM_READ 680 /* Read from kernel memory. */
-#definePRIV_KMEM_WRITE 681 /* Write to kernel memory. */
+#definePRIV_KMEM_READ 680 /* Open mem/kmem for reading. */
+#definePRIV_KMEM_WRITE 681 /* Open mem/kmem for writing. */
/*
* Track end of privilege list.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252856 - head
Author: sjg
Date: Sat Jul 6 00:13:08 2013
New Revision: 252856
URL: http://svnweb.freebsd.org/changeset/base/252856
Log:
Sprinkle some .MAKE magic
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sat Jul 6 00:10:52 2013(r252855)
+++ head/Makefile.inc1 Sat Jul 6 00:13:08 2013(r252856)
@@ -1237,7 +1237,7 @@ _kerberos5_bootstrap_tools= \
# Please document (add comment) why something is in 'bootstrap-tools'.
# Try to bound the building of the bootstrap-tool to just the
# FreeBSD versions that need the tool built at this stage of the build.
-bootstrap-tools:
+bootstrap-tools: .MAKE
.for _tool in \
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
@@ -1290,7 +1290,7 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools
_rescue= rescue/rescue
.endif
-build-tools:
+build-tools: .MAKE
.for _tool in \
bin/csh \
bin/sh \
@@ -1352,7 +1352,7 @@ _cc= gnu/usr.bin/cc
.endif
.endif
-cross-tools:
+cross-tools: .MAKE
.for _tool in \
${_clang_libs} \
${_clang} \
@@ -1383,12 +1383,12 @@ hierarchy hier:
# interdependencies (__L) are built automatically by the
# ${.CURDIR}/tools/make_libdeps.sh script.
#
-libraries:
- cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 _prereq_libs; \
- ${MAKE} -f Makefile.inc1 _startup_libs; \
- ${MAKE} -f Makefile.inc1 _prebuild_libs; \
- ${MAKE} -f Makefile.inc1 _generic_libs;
+libraries: .MAKE
+ cd ${.CURDIR} && \
+ ${MAKE} -f Makefile.inc1 _prereq_libs && \
+ ${MAKE} -f Makefile.inc1 _startup_libs && \
+ ${MAKE} -f Makefile.inc1 _prebuild_libs && \
+ ${MAKE} -f Makefile.inc1 _generic_libs
#
# static libgcc.a prerequisite for shared libc
@@ -1542,7 +1542,7 @@ lib/libradius__L: lib/libmd__L
.endif
.for _lib in ${_prereq_libs}
-${_lib}__PL: .PHONY
+${_lib}__PL: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
@@ -1554,7 +1554,7 @@ ${_lib}__PL: .PHONY
.endfor
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
-${_lib}__L: .PHONY
+${_lib}__L: .PHONY .MAKE
.if exists(${.CURDIR}/${_lib})
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib} && \
@@ -1568,7 +1568,7 @@ ${_lib}__L: .PHONY
# libpam is special: we need to build static PAM modules before
# static PAM library, and dynamic PAM library before dynamic PAM
# modules.
-lib/libpam__L: .PHONY
+lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam && \
${MAKE} DIRPRFX=lib/libpam/ obj && \
@@ -1583,7 +1583,7 @@ _generic_libs: ${_generic_libs:S/$/__L/}
.for __target in all clean cleandepend cleandir depend includes obj
.for entry in ${SUBDIR}
-${entry}.${__target}__D: .PHONY
+${entry}.${__target}__D: .PHONY .MAKE
${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}
(${__target})"; \
edir=${entry}.${MACHINE_ARCH}; \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252857 - head/sys/dev/arcmsr
Author: delphij Date: Sat Jul 6 01:46:58 2013 New Revision: 252857 URL: http://svnweb.freebsd.org/changeset/base/252857 Log: Refresh vendor driver version which fixes command queue full issue with ARC-1214 and ARC-1224. Many thanks to Areca for continuing to support FreeBSD. Submitted by: 黃清隆 MFC after:1 day Modified: head/sys/dev/arcmsr/arcmsr.c head/sys/dev/arcmsr/arcmsr.h Modified: head/sys/dev/arcmsr/arcmsr.c == --- head/sys/dev/arcmsr/arcmsr.cSat Jul 6 00:13:08 2013 (r252856) +++ head/sys/dev/arcmsr/arcmsr.cSat Jul 6 01:46:58 2013 (r252857) @@ -35,44 +35,45 @@ ** History ** -**REV# DATE NAME DESCRIPTION -** 1.00.00.00 03/31/2004 Erich Chen First release -** 1.20.00.02 11/29/2004 Erich Chen bug fix with arcmsr_bus_reset when PHY error -** 1.20.00.03 04/19/2005 Erich Chen add SATA 24 Ports adapter type support -** clean unused function -** 1.20.00.12 09/12/2005 Erich Chen bug fix with abort command handling, -** firmware version check -** and firmware update notify for hardware bug fix -** handling if none zero high part physical address -** of srb resource -** 1.20.00.13 08/18/2006 Erich Chen remove pending srb and report busy -** add iop message xfer -** with scsi pass-through command -** add new device id of sas raid adapters -** code fit for SPARC64 & PPC -** 1.20.00.14 02/05/2007 Erich Chen bug fix for incorrect ccb_h.status report -** and cause g_vfs_done() read write error -** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x -** 1.20.00.16 10/10/2009 Erich Chen Bug fix for RAID adapter type ARC120x -** bus_dmamem_alloc() with BUS_DMA_ZERO -** 1.20.00.17 07/15/2010 Ching Huang Added support ARC1880 -** report CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT when device failed, -** prevent cam_periph_error removing all LUN devices of one Target id -** for any one LUN device failed -** 1.20.00.18 10/14/2010 Ching Huang Fixed "inquiry data fails comparion at DV1 step" -** 10/25/2010 Ching Huang Fixed bad range input in bus_alloc_resource for ADAPTER_TYPE_B -** 1.20.00.19 11/11/2010 Ching Huang Fixed arcmsr driver prevent arcsas support for Areca SAS HBA ARC13x0 -** 1.20.00.20 12/08/2010 Ching Huang Avoid calling atomic_set_int function -** 1.20.00.21 02/08/2011 Ching Huang Implement I/O request timeout -** 02/14/2011 Ching Huang Modified pktRequestCount -** 1.20.00.21 03/03/2011 Ching Huang if a command timeout, then wait its ccb back before free it -** 1.20.00.22 07/04/2011 Ching Huang Fixed multiple MTX panic -** 1.20.00.23 10/28/2011 Ching Huang Added TIMEOUT_DELAY in case of too many HDDs need to start -** 1.20.00.23 11/08/2011 Ching Huang Added report device transfer speed -** 1.20.00.23 01/30/2012 Ching Huang Fixed Request requeued and Retrying command -** 1.20.00.24 06/11/2012 Ching Huang Fixed return sense data condition -** 1.20.00.25 08/17/2012 Ching Huang Fixed hotplug device no function on type A adapter -** 1.20.00.26 12/14/2012 Ching Huang Added support ARC1214,1224 +**REV# DATE NAMEDESCRIPTION +** 1.00.00.00 03/31/2004 Erich Chen First release +** 1.20.00.02 11/29/2004 Erich Chen bug fix with arcmsr_bus_reset when PHY error +** 1.20.00.03 04/19/2005 Erich Chen add SATA 24 Ports adapter type support +** clean unused function +** 1.20.00.12 09/12/2005 Erich Chen bug fix with abort command handling, +** fir
svn commit: r252862 - head/usr.sbin
Author: dteske
Date: Sat Jul 6 04:13:47 2013
New Revision: 252862
URL: http://svnweb.freebsd.org/changeset/base/252862
Log:
Take the training-wheels off, after nearly 30 months of development. MFC to
stable/9 planned after MFC 3-day period. The MFC to stable/9 is desired for
the next release to get some much-needed time:
+ Living side-by-side with sysinstall for compare/contrast/transition
+ Living side-by-side with bsdinstall for integration/transition
+ Additional feedback/testing before eventual 10.0-R to make it even better
MFC after:3 days
Modified:
head/usr.sbin/Makefile
Modified: head/usr.sbin/Makefile
==
--- head/usr.sbin/Makefile Sat Jul 6 03:40:00 2013(r252861)
+++ head/usr.sbin/Makefile Sat Jul 6 04:13:47 2013(r252862)
@@ -6,6 +6,7 @@
SUBDIR=adduser \
arp \
bootparamd \
+ bsdconfig \
bsdinstall \
cdcontrol \
chkgrp \
@@ -80,6 +81,7 @@ SUBDIR= adduser \
snapinfo \
spray \
syslogd \
+ sysrc \
tcpdchk \
tcpdmatch \
tcpdrop \
@@ -146,11 +148,6 @@ SUBDIR+= rndc-confgen
SUBDIR+= bluetooth
.endif
-.if ${MK_BSDCONFIG} != "no"
-SUBDIR+= bsdconfig
-SUBDIR+= sysrc
-.endif
-
.if ${MK_BSNMP} != "no"
SUBDIR+= bsnmpd
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252863 - head/sys/arm/ti
Author: rpaulo
Date: Sat Jul 6 04:18:34 2013
New Revision: 252863
URL: http://svnweb.freebsd.org/changeset/base/252863
Log:
Don't clear the SYSCONFIG register on boot.
This follows section 18.4.2.2 SD Soft Reset Flow in the TI AM335x Technical
Reference Manual and seems to fix the "ti_mmchs0: Error: current cmd NULL,
already done?" messages.
Modified:
head/sys/arm/ti/ti_mmchs.c
head/sys/arm/ti/ti_mmchs.h
Modified: head/sys/arm/ti/ti_mmchs.c
==
--- head/sys/arm/ti/ti_mmchs.c Sat Jul 6 04:13:47 2013(r252862)
+++ head/sys/arm/ti/ti_mmchs.c Sat Jul 6 04:18:34 2013(r252863)
@@ -1327,7 +1327,7 @@ ti_mmchs_hw_init(device_t dev)
unsigned long timeout;
uint32_t sysctl;
uint32_t capa;
- uint32_t con;
+ uint32_t con, sysconfig;
/* 1: Enable the controller and interface/functional clocks */
clk = MMC0_CLK + sc->device_id;
@@ -1344,7 +1344,9 @@ ti_mmchs_hw_init(device_t dev)
}
/* 2: Issue a softreset to the controller */
- ti_mmchs_write_4(sc, MMCHS_SYSCONFIG, 0x0002);
+ sysconfig = ti_mmchs_read_4(sc, MMCHS_SYSCONFIG);
+ sysconfig |= MMCHS_SYSCONFIG_SRST;
+ ti_mmchs_write_4(sc, MMCHS_SYSCONFIG, sysconfig);
timeout = 100;
while ((ti_mmchs_read_4(sc, MMCHS_SYSSTATUS) & 0x01) == 0x0) {
DELAY(1000);
Modified: head/sys/arm/ti/ti_mmchs.h
==
--- head/sys/arm/ti/ti_mmchs.h Sat Jul 6 04:13:47 2013(r252862)
+++ head/sys/arm/ti/ti_mmchs.h Sat Jul 6 04:18:34 2013(r252863)
@@ -67,6 +67,12 @@
#define AM335X_MMCHS_REG_OFFSET 0x100
/* Register bit settings */
+#defineMMCHS_SYSCONFIG_CLK_FUN (2 << 8)
+#defineMMCHS_SYSCONFIG_CLK_IFC (1 << 8)
+#defineMMCHS_SYSCONFIG_SIDL(2 << 3)
+#defineMMCHS_SYSCONFIG_ENW (1 << 2)
+#defineMMCHS_SYSCONFIG_SRST(1 << 1)
+#defineMMCHS_SYSCONFIG_AIDL(1 << 0)
#define MMCHS_STAT_BADA (1UL << 29)
#define MMCHS_STAT_CERR (1UL << 28)
#define MMCHS_STAT_ACE (1UL << 24)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r252864 - head/sys/dev/drm2/ttm
Author: kib
Date: Sat Jul 6 04:46:42 2013
New Revision: 252864
URL: http://svnweb.freebsd.org/changeset/base/252864
Log:
Remove unneeded page lock around vm_page_insert().
Submitted by: alc
Modified:
head/sys/dev/drm2/ttm/ttm_bo_vm.c
Modified: head/sys/dev/drm2/ttm/ttm_bo_vm.c
==
--- head/sys/dev/drm2/ttm/ttm_bo_vm.c Sat Jul 6 04:18:34 2013
(r252863)
+++ head/sys/dev/drm2/ttm/ttm_bo_vm.c Sat Jul 6 04:46:42 2013
(r252864)
@@ -220,9 +220,7 @@ reserve:
}
m->valid = VM_PAGE_BITS_ALL;
*mres = m;
- vm_page_lock(m);
vm_page_insert(m, vm_obj, OFF_TO_IDX(offset));
- vm_page_unlock(m);
vm_page_busy(m);
if (oldm != NULL) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
