svn commit: r256023 - in projects/random_number_generator: etc/mtree etc/rc.d games/fortune/datfiles sys/conf sys/net sys/powerpc/include usr.sbin/ntp usr.sbin/ntp/libparse
Mark Murray
markm at FreeBSD.org
Thu Oct 3 17:30:58 UTC 2013
Author: markm
Date: Thu Oct 3 17:30:55 2013
New Revision: 256023
URL: http://svnweb.freebsd.org/changeset/base/256023
Log:
MFC - tracking commit
Modified:
projects/random_number_generator/etc/mtree/Makefile
projects/random_number_generator/etc/rc.d/Makefile
projects/random_number_generator/games/fortune/datfiles/freebsd-tips
projects/random_number_generator/sys/conf/newvers.sh
projects/random_number_generator/sys/net/if_tap.c
projects/random_number_generator/sys/net/if_tun.c
projects/random_number_generator/sys/powerpc/include/proc.h
projects/random_number_generator/usr.sbin/ntp/config.h
projects/random_number_generator/usr.sbin/ntp/libparse/Makefile
Directory Properties:
projects/random_number_generator/ (props changed)
projects/random_number_generator/sys/ (props changed)
projects/random_number_generator/sys/conf/ (props changed)
Modified: projects/random_number_generator/etc/mtree/Makefile
==============================================================================
--- projects/random_number_generator/etc/mtree/Makefile Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/etc/mtree/Makefile Thu Oct 3 17:30:55 2013 (r256023)
@@ -2,13 +2,13 @@
.include <bsd.own.mk>
-FILES= BSD.include.dist \
+FILES= ${_BSD.debug.dist} \
+ BSD.include.dist \
BSD.root.dist \
${_BSD.sendmail.dist} \
BSD.usr.dist \
BSD.var.dist
-.endif
.if ${MK_DEBUG_FILES} != "no"
_BSD.debug.dist= BSD.debug.dist
.endif
Modified: projects/random_number_generator/etc/rc.d/Makefile
==============================================================================
--- projects/random_number_generator/etc/rc.d/Makefile Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/etc/rc.d/Makefile Thu Oct 3 17:30:55 2013 (r256023)
@@ -21,11 +21,11 @@ FILES= DAEMON \
auditd \
auditdistd \
bgfsck \
- bluetooth \
+ ${_bluetooth} \
bootparams \
bridge \
bsnmpd \
- bthidd \
+ ${_bthidd} \
ccd \
cleanvar \
cleartmp \
@@ -48,7 +48,7 @@ FILES= DAEMON \
gptboot \
gssd \
hastd \
- hcsecd \
+ ${_hcsecd} \
hostapd \
hostid \
hostid_save \
@@ -182,6 +182,9 @@ _nscd= nscd
.endif
.if ${MK_BLUETOOTH} != "no"
+_bluetooth= bluetooth
+_bthidd= bthidd
+_hcsecd= hcsecd
_ubthidhci= ubthidhci
.endif
Modified: projects/random_number_generator/games/fortune/datfiles/freebsd-tips
==============================================================================
--- projects/random_number_generator/games/fortune/datfiles/freebsd-tips Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/games/fortune/datfiles/freebsd-tips Thu Oct 3 17:30:55 2013 (r256023)
@@ -8,8 +8,8 @@ a root login. You can add a user to the
By pressing "Scroll Lock" you can use the arrow keys to scroll backward
through the console output. Press "Scroll Lock" again to turn it off.
%
-Can't remember if you've installed a certain port or not? Try "pkg_info
--Ix port_name".
+Can't remember if you've installed a certain port or not? Try "pkg info
+-x port_name".
%
Ever wonder what those numbers after command names were, as in cat(1)? It's
the section of the manual the man page is in. "man man" will tell you more.
@@ -96,12 +96,6 @@ If you want to play CDs with FreeBSD, a
Type 'cdcontrol' then 'help' to learn more. (You may need to set the CDROM
environment variable in order to make cdcontrol want to start.)
%
-If you want to quickly check for duplicate package/port installations,
-try the following pkg_info command.
-
- pkg_info | sort | sed -e 's/-[0-9].*$//' | \
- uniq -c | grep -v '^[[:space:]]*1'
-%
If you'd like to keep track of applications in the FreeBSD ports tree, take a
look at FreshPorts;
@@ -356,11 +350,10 @@ adjust, just type 'mixer'.
%
You can automatically download and install binary packages by doing
- pkg_add -r <URL>
+ pkg install <package>
-where you replace <URL> with the URL to the package. This will also
-automatically install the packages the package you download is dependent on
-(ie, the packages it needs in order to work.)
+This will also automatically install the packages that are dependencies
+for the package you install (ie, the packages it needs in order to work.)
%
You can change the video mode on all consoles by adding something like
the following to /etc/rc.conf:
@@ -448,8 +441,7 @@ You can use /etc/make.conf to control th
on this system. Example entries are in
/usr/share/examples/etc/make.conf.
%
-You can use "pkg_info" to see a list of packages you have installed.
- -- Konstantinos Konstantinidis <kkonstan at duth.gr>
+You can use "pkg info" to see a list of packages you have installed.
%
You can use the 'fetch' command to retrieve files over ftp or http.
Modified: projects/random_number_generator/sys/conf/newvers.sh
==============================================================================
--- projects/random_number_generator/sys/conf/newvers.sh Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/sys/conf/newvers.sh Thu Oct 3 17:30:55 2013 (r256023)
@@ -159,6 +159,10 @@ if [ -n "$git_cmd" ] ; then
git=" ${git}"
fi
fi
+ git_b=`$git_cmd rev-parse --abbrev-ref HEAD`
+ if [ -n "$git_b" ] ; then
+ git="${git}(${git_b})"
+ fi
if $git_cmd --work-tree=${SYSDIR}/.. diff-index \
--name-only HEAD | read dummy; then
git="${git}-dirty"
Modified: projects/random_number_generator/sys/net/if_tap.c
==============================================================================
--- projects/random_number_generator/sys/net/if_tap.c Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/sys/net/if_tap.c Thu Oct 3 17:30:55 2013 (r256023)
@@ -220,6 +220,7 @@ tap_destroy(struct tap_softc *tp)
CURVNET_SET(ifp->if_vnet);
destroy_dev(tp->tap_dev);
seldrain(&tp->tap_rsel);
+ knlist_clear(&tp->tap_rsel.si_note, 0);
knlist_destroy(&tp->tap_rsel.si_note);
ether_ifdetach(ifp);
if_free(ifp);
Modified: projects/random_number_generator/sys/net/if_tun.c
==============================================================================
--- projects/random_number_generator/sys/net/if_tun.c Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/sys/net/if_tun.c Thu Oct 3 17:30:55 2013 (r256023)
@@ -258,6 +258,7 @@ tun_destroy(struct tun_softc *tp)
if_free(TUN2IFP(tp));
destroy_dev(dev);
seldrain(&tp->tun_rsel);
+ knlist_clear(&tp->tun_rsel.si_note, 0);
knlist_destroy(&tp->tun_rsel.si_note);
mtx_destroy(&tp->tun_mtx);
cv_destroy(&tp->tun_cv);
Modified: projects/random_number_generator/sys/powerpc/include/proc.h
==============================================================================
--- projects/random_number_generator/sys/powerpc/include/proc.h Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/sys/powerpc/include/proc.h Thu Oct 3 17:30:55 2013 (r256023)
@@ -54,6 +54,18 @@ struct mdproc {
#endif
#ifdef _KERNEL
+
+#include <machine/pcb.h>
+
+/* Get the current kernel thread stack usage. */
+#define GET_STACK_USAGE(total, used) do { \
+ struct thread *td = curthread; \
+ (total) = td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb); \
+ (used) = (char *)td->td_kstack + \
+ td->td_kstack_pages * PAGE_SIZE - \
+ (char *)&td; \
+} while (0)
+
struct syscall_args {
u_int code;
struct sysent *callp;
Modified: projects/random_number_generator/usr.sbin/ntp/config.h
==============================================================================
--- projects/random_number_generator/usr.sbin/ntp/config.h Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/usr.sbin/ntp/config.h Thu Oct 3 17:30:55 2013 (r256023)
@@ -84,7 +84,7 @@
#define CLOCK_LOCAL 1
/* Meinberg clocks */
-/* #undef CLOCK_MEINBERG */
+#define CLOCK_MEINBERG 1
/* Magnavox MX4200 GPS receiver */
/* #undef CLOCK_MX4200 */
Modified: projects/random_number_generator/usr.sbin/ntp/libparse/Makefile
==============================================================================
--- projects/random_number_generator/usr.sbin/ntp/libparse/Makefile Thu Oct 3 15:19:16 2013 (r256022)
+++ projects/random_number_generator/usr.sbin/ntp/libparse/Makefile Thu Oct 3 17:30:55 2013 (r256023)
@@ -9,7 +9,7 @@ SRCS= clk_computime.c clk_dcf7000.c clk_
clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \
clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \
info_trimble.c parse.c parse_conf.c trim_info.c \
- binio.c gpstolfp.c
+ binio.c gpstolfp.c ieee754io.c mfp_mul.c
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
More information about the svn-src-projects
mailing list