Re: svn commit: r283424 - in head/sys: amd64/linux modules/linux64
On 25 мая 2015 г., at 17:40, John Baldwin j...@freebsd.org wrote: Some other related questions are: can we revive print/acroread now and or use a 64-bit flash plugin after these changes? I also wonder if it is possible to run 64bit Oracle JDK (Linux version) now? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283424 - in head/sys: amd64/linux modules/linux64
On Tue, May 26, 2015 at 01:18:01AM +0100, Bruce Simpson wrote: All, The enhancements to the Linux runtime are probably of more interest to folk porting server applications; I am particularly happy to see recvmmsg() and sendmmsg() go in. It might also be wise to emulate the getrandom() API, even if this is only in terms of wrapping the relevant sysctl for now. What about skype4.3? Do you collaborate with Baptiste Daroussin to allow install linux32 on amd64 (some iKVM have linux binyary .so for Java plugin and don't work [w/o tricks] on linux64) Do you plan to MFC? On 25/05/2015 18:27, Slawa Olhovchenkov wrote: Currenly I don't see any linux in Acrobat Reader support OS: https://get.adobe.com/reader/otherversions/ It got pulled. Of course, support for PDF's forms varies greatly outside of official Adobe product. A better alternative might be the MuPDF backend for KDE Okular, or for Zathura, neither of which are packaged anywhere in the Linux world yet. Of course, this could be built natively, without needing the Linux runtime support. I've noticed that rendering performance seems disappointing in the open source Linux PDF readers, as compared to OS X Preview.app on similar hardware. I am just restore from SVN latest working print/acroread9 and continue to use. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283132 - head/lib/libproc
On 2015-05-19 Tue 22:23:16 + Baptiste Daroussin b...@freebsd.org, wrote: Hi, Author: bapt Date: Tue May 19 22:23:15 2015 New Revision: 283132 URL: https://svnweb.freebsd.org/changeset/base/283132 Log: Fix underlinking Modified: head/lib/libproc/Makefile Modified: head/lib/libproc/Makefile == --- head/lib/libproc/Makefile Tue May 19 22:22:53 2015(r283131) +++ head/lib/libproc/Makefile Tue May 19 22:23:15 2015(r283132) @@ -23,6 +23,8 @@ LIBADD+=cxxrt LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + I have to revert this commit on my CURRENT systems so buildworld can continue. On one such system(r283554): [...] building shared library libproc.so.3 --- all_subdir_libdwarf --- --- libdwarf_elf_init.So --- cc -fpic -DPIC -O2 -pipe -march=bdver2 -I. -I/usr/src/lib/libdwarf/../../contrib/elftoolchain/libdwarf -I/usr/src/lib/libdwarf/../../contrib/elftoolchain/common -I/usr/src/lib/libdwarf/../../contrib/elftoolchain/libelf -std=gnu99 -fstack-protector -Ws ystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wnested- externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -Wmissing-variable-declarations -Wthread-safety -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Qunused-arguments -c /usr/src/lib/libdwarf/../../contrib/elftoolchain/libd warf/libdwarf_elf_init.c -o libdwarf_elf_init.So --- all_subdir_libproc --- cc -fstack-protector -shared -Wl,-x -Wl,--fatal-warnings -Wl,--warn-shared-textrel -o libproc.so.3 -Wl,-soname,libproc.so.3 `NM='nm' lorder proc_bkpt.So proc_create.So proc_regs.So proc_sym.So proc_rtld.So proc_util.So | tsort -q` -lcxxrt -lelf -l rtld_db -lutil --- all_subdir_librt --- --- mq.o --- cc -O2 -pipe -march=bdver2 -I/usr/src/lib/librt/../libc/include -I/usr/src/lib/librt -fexceptions -Winline -Wall -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-stri ng-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments - c /usr/src/lib/librt/mq.c -o mq.o --- sigev_thread.o --- cc -O2 -pipe -march=bdver2 -I/usr/src/lib/librt/../libc/include -I/usr/src/lib/librt -fexceptions -Winline -Wall -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-stri ng-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments - c /usr/src/lib/librt/sigev_thread.c -o sigev_thread.o --- all_subdir_librpcsvc --- --- nfs_prot_xdr.o --- cc -O2 -pipe -march=bdver2 -DYP -I/tmp/bdver2/usr/src/tmp/usr/include/rpcsvc -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused- value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses -Qunused-arguments -c nfs_prot_xdr.c -o nfs_prot_xdr.o --- all_subdir_libproc --- /tmp/bdver2/usr/src/tmp/usr/bin/ld: cannot find -lrtld_db cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libproc.so.3] Error code 1 $ cat /etc/make.conf: ALWAYS_CHECK_MAKE=YES CPUTYPE?=corei7-avx DEFAULT_VERSIONS= perl5=5.20 KERNCONF= GENERIC KROPOTKIN KROPOTKIN_DEBUG MALLOC_PRODUCTION= NO_MODULES= PERL5_DEFAULT= 5.20 WITH_PKG= devel $ cat /etc/src.conf WITH_BSD_GREP= WITH_CLANG_EXTRAS= WITH_LLDB= WITH_PIE= #WITH_SORT_THREADS= WITHOUT_AMD= WITHOUT_APM= WITHOUT_ATM= WITHOUT_BLUETOOTH= WITHOUT_CDDL= WITHOUT_CTM= WITHOUT_CUSE= WITHOUT_FDT= WITHOUT_FLOPPY= WITHOUT_FMTREE= WITHOUT_FREEBSD_UPDATE= WITHOUT_FTP= WITHOUT_GCOV= WITHOUT_GDB= WITHOUT_GPL_DTC= WITHOUT_GROFF= WITHOUT_HAST= WITHOUT_HTML= WITHOUT_HYPERV= WITHOUT_INFO= WITHOUT_IPFILTER= WITHOUT_IPFW= WITHOUT_ISCSI= WITHOUT_LEGACY_CONSOLE= WITHOUT_LPR= WITHOUT_NDIS= WITHOUT_NTP= WITHOUT_PC_SYSINSTALL= WITHOUT_PORTSNAP= WITHOUT_PROFILE= WITHOUT_RCMDS= WITHOUT_RCS= WITHOUT_SENDMAIL= WITHOUT_SHAREDOCS= WITHOUT_SVNLITE= WITHOUT_SYSCONS= WITHOUT_SYSINSTALL= WITHOUT_TEXINFO= WITHOUT_TESTS= WITHOUT_TFTP= WITHOUT_WIRELESS= WITHOUT_WPA_SUPPLICANT_EAPOL= Ta very much al -- Smile, Cthulhu Loathes You. ___
Re: svn commit: r283547 - head/sys/arm/conf
On Mon, 25 May 2015, John-Mark Gurney wrote: Ian Lepore wrote this message on Mon, May 25, 2015 at 23:27 +: Author: ian Date: Mon May 25 23:27:13 2015 New Revision: 283547 URL: https://svnweb.freebsd.org/changeset/base/283547 Log: Ensure that all arm kernel configs contain ALT_BREAK_TO_DEBUGGER and not BREAK_TO_DEBUGGER if they have a serial console (most do). A burst of serial line noise (such as unplugging a usb serial adapter) can look like a break and drop a working system into the debugger. The alt break sequence (CR~^B) works fine on both serial and non-serial consoles. Just so you know, this removes support for video console to break into the debugger via keyboard... This mean ctrl-alt-esc and other key sequences won't work anymore... Actually, it only breaks the usual non-sequences ctrl-prtscrn and ctrl-alt-esc. All console drivers support ALT_BREAK_TO_DEBUGGER, so escape sequences still work if this option is configured, but these quences are harder to remember and harder to type (I often forget where \n goes in them, or mistype it) and were not needed before except for serial consoles, so at most users of serial consoles will know them. Most of this is broken. 1. The BREAK in BREAK_TO_DEBUGGER means a serial line break. This is now confused with breaking into the debugger in all sorts of ways, and/or with the breakpoint() function used to implement breaking into the debugger in some of these ways. The breakpoint() function has a generic name although not all arches have a breakpoint instruction in hardware, at least by name. kdb_break() is misnamed. It is just a wrapper for kdb_enter() that supplies the (wrong) entry code KDB_WHY_BREAK and the (wrong) message Break to debugger. Here BREAK and Break have nothing to do with serial line breaks or the (virtual) breakpoint instruction. They mean break in the sense of stop the normal execution and enter the debugger. Normal uses of the breakpoint instruction don't go via this path -- they have already executed the instruction, while this path will execute the instruction. 2. BREAK_TO_DEBUGGER with its non-broken meaning is unusable for most systems since it causes the problems mentioned by ian, except the problems are not really line noise. Just unplugging the line causes a serial line break unless you are quick enough to re-plug it in less than the break detection time, and no one can do that except at low speeds like 1 bit/second, since the break detection time is just 1 character times. Unplugging is also less of a problem than turning off the terminal, since with the former you are more likely to see that the system has entered the debugger immediately after re-plugging, instead of much later when turning on the terminal. I didn't notice this problem for many years. Even BREAK_TO_DEBUGGER was only added in 1996. Before that, serial line breaks caused debugger entry unconditionally if a debugger was configured. Just before that, until 1995 debugger entry was similarly unconditional except it occured when a slip FRAME_END character (0xc0) was received. I don't see how slip could have worked with that. I didn't notice the problem with unplugging for many more years. There was a bug in detecting these line breaks. Serial interrupts were only enabled when the console was open for normal syscalls and the line breaks were not detected otherwise, so they didn't bite as often as they should have. 3. So BREAK_TO_DEBUGGER should normally not be configured. ALT_BREAK_TO_DEBUGGER used to provide an adequate workaround. The name of this option is confusing but not wrong. I gives an alternative to entering the debugger with a serial line break, not an alternative to the normal way of breaking into the debugger. 4. Breakage started occuring with multiple consoles. You might have 1 serial console that is most secure and never turned off, so BREAK_TO_DEBUGGER is best for it, 1 serial console that is secure but sometimes turned off, so ALT_BREAK_TO_DEBUGGER is best for it, and 1 serial console that is insecure so both BREAK_TO_DEBUGGER and ALT_BREAK_TO_DEBUGGER are too insecure to use. Since they are global flags, they must be turned off for all serial consoles. Or just don't use multiple serial consoles. Since no serial console drivers support multiple serial consoles, this is too easy to do. 5. Next, the breakage with multiple consoles spread to affect all console drivers. The configuration is now dynamic, with sysctls to control it, but the confusion of serial line breaks with breaking into the debugger combined with the null support for multiple serial consoles breaks the usual case of just no serial consoles at all, as pointed out by jmg. The config-time-variable for serial line breaks (BREAK_TO_DEBUGGER) is misused to configure breaking into the the debugger in
svn commit: r283562 - in head: sys/kern tests/sys/kern
Author: jhb
Date: Tue May 26 10:29:37 2015
New Revision: 283562
URL: https://svnweb.freebsd.org/changeset/base/283562
Log:
Do not allow a process to reap an orphan (a child currently being
traced by another process such as a debugger). The parent process does
need to check for matching orphan pids to avoid returning ECHILD if an
orphan has exited, but it should not return the exited status for the
child until after the debugger has detached from the orphan process
either explicitly or implicitly via wait().
Add two tests for for this case: one where the debugger is the direct
child (thus the parent has a non-empty children list) and one where
the debugger is not a direct child (so the only child of the parent
is the orphan).
Differential Revision:https://reviews.freebsd.org/D2644
Reviewed by: kib
MFC after:2 weeks
Modified:
head/sys/kern/kern_exit.c
head/tests/sys/kern/ptrace_test.c
Modified: head/sys/kern/kern_exit.c
==
--- head/sys/kern/kern_exit.c Tue May 26 09:38:16 2015(r283561)
+++ head/sys/kern/kern_exit.c Tue May 26 10:29:37 2015(r283562)
@@ -955,7 +955,8 @@ proc_reap(struct thread *td, struct proc
static int
proc_to_reap(struct thread *td, struct proc *p, idtype_t idtype, id_t id,
-int *status, int options, struct __wrusage *wrusage, siginfo_t *siginfo)
+int *status, int options, struct __wrusage *wrusage, siginfo_t *siginfo,
+int check_only)
{
struct proc *q;
struct rusage *rup;
@@ -1093,7 +1094,7 @@ proc_to_reap(struct thread *td, struct p
calccru(p, rup-ru_utime, rup-ru_stime);
}
- if (p-p_state == PRS_ZOMBIE) {
+ if (p-p_state == PRS_ZOMBIE !check_only) {
PROC_SLOCK(p);
proc_reap(td, p, status, options);
return (-1);
@@ -1187,7 +1188,7 @@ loop:
sx_xlock(proctree_lock);
LIST_FOREACH(p, q-p_children, p_sibling) {
ret = proc_to_reap(td, p, idtype, id, status, options,
- wrusage, siginfo);
+ wrusage, siginfo, 0);
if (ret == 0)
continue;
else if (ret == 1)
@@ -1289,15 +1290,17 @@ loop:
* for. By maintaining a list of orphans we allow the parent
* to successfully wait until the child becomes a zombie.
*/
- LIST_FOREACH(p, q-p_orphans, p_orphan) {
- ret = proc_to_reap(td, p, idtype, id, status, options,
- wrusage, siginfo);
- if (ret == 0)
- continue;
- else if (ret == 1)
- nfound++;
- else
- return (0);
+ if (nfound == 0) {
+ LIST_FOREACH(p, q-p_orphans, p_orphan) {
+ ret = proc_to_reap(td, p, idtype, id, NULL, options,
+ NULL, NULL, 1);
+ if (ret != 0) {
+ KASSERT(ret != -1, (reaped an orphan (pid %d),
+ (int)td-td_retval[0]));
+ nfound++;
+ break;
+ }
+ }
}
if (nfound == 0) {
sx_xunlock(proctree_lock);
Modified: head/tests/sys/kern/ptrace_test.c
==
--- head/tests/sys/kern/ptrace_test.c Tue May 26 09:38:16 2015
(r283561)
+++ head/tests/sys/kern/ptrace_test.c Tue May 26 10:29:37 2015
(r283562)
@@ -29,6 +29,8 @@ __FBSDID($FreeBSD$);
#include sys/types.h
#include sys/ptrace.h
+#include sys/sysctl.h
+#include sys/user.h
#include sys/wait.h
#include errno.h
#include signal.h
@@ -133,11 +135,255 @@ ATF_TC_BODY(ptrace__parent_wait_after_at
ATF_REQUIRE(errno == ECHILD);
}
+/*
+ * Verify that a parent process sees the exit of a debugged process only
+ * after the debugger has seen it.
+ */
+ATF_TC_WITHOUT_HEAD(ptrace__parent_sees_exit_after_child_debugger);
+ATF_TC_BODY(ptrace__parent_sees_exit_after_child_debugger, tc)
+{
+ pid_t child, debugger, wpid;
+ int cpipe[2], dpipe[2], status;
+ char c;
+
+ ATF_REQUIRE(pipe(cpipe) == 0);
+ ATF_REQUIRE((child = fork()) != -1);
+
+ if (child == 0) {
+ /* Child process. */
+ close(cpipe[0]);
+
+ /* Wait for parent to be ready. */
+ ATF_REQUIRE(read(cpipe[1], c, sizeof(c)) == sizeof(c));
+
+ exit(1);
+ }
+ close(cpipe[1]);
+
+ ATF_REQUIRE(pipe(dpipe) == 0);
+ ATF_REQUIRE((debugger = fork()) != -1);
+
+ if (debugger == 0) {
+ /* Debugger process. */
+ close(dpipe[0]);
+
+ ATF_REQUIRE(ptrace(PT_ATTACH, child, NULL, 0) != -1);
+
+ wpid =
svn commit: r283565 - head/sys/net80211
Author: glebius Date: Tue May 26 12:06:36 2015 New Revision: 283565 URL: https://svnweb.freebsd.org/changeset/base/283565 Log: Reduce diff before functional changes: - Use ic_name instead of if_xname. - Formatting cleanup. Modified: head/sys/net80211/ieee80211.c Modified: head/sys/net80211/ieee80211.c == --- head/sys/net80211/ieee80211.c Tue May 26 11:15:51 2015 (r283564) +++ head/sys/net80211/ieee80211.c Tue May 26 12:06:36 2015 (r283565) @@ -302,7 +302,7 @@ ieee80211_ifattach(struct ieee80211com * ic-ic_tq = taskqueue_create(ic_taskq, M_WAITOK | M_ZERO, taskqueue_thread_enqueue, ic-ic_tq); taskqueue_start_threads(ic-ic_tq, 1, PI_NET, %s net80211 taskq, - ifp-if_xname); + ic-ic_name); /* * Fill in 802.11 available channel set, mark all * available channels as active, and pick a default @@ -617,8 +617,7 @@ ieee80211_vap_detach(struct ieee80211vap CURVNET_SET(ifp-if_vnet); IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, %s: %s parent %s\n, - __func__, ieee80211_opmode_name[vap-iv_opmode], - ic-ic_name); + __func__, ieee80211_opmode_name[vap-iv_opmode], ic-ic_name); /* NB: bpfdetach is called by ether_ifdetach and claims all taps */ ether_ifdetach(ifp); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283567 - head/sys/net80211
Author: glebius
Date: Tue May 26 12:51:14 2015
New Revision: 283567
URL: https://svnweb.freebsd.org/changeset/base/283567
Log:
Add two counters to ieee80211com, that will be used to count transmission
or receive errors that can't be associated with any vap.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
head/sys/net80211/ieee80211_crypto.c
head/sys/net80211/ieee80211_crypto_ccmp.c
head/sys/net80211/ieee80211_crypto_none.c
head/sys/net80211/ieee80211_crypto_tkip.c
head/sys/net80211/ieee80211_crypto_wep.c
head/sys/net80211/ieee80211_hwmp.c
head/sys/net80211/ieee80211_ratectl_none.c
head/sys/net80211/ieee80211_var.h
Modified: head/sys/net80211/ieee80211_crypto.c
==
--- head/sys/net80211/ieee80211_crypto.cTue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_crypto.cTue May 26 12:51:14 2015
(r283567)
@@ -33,6 +33,8 @@ __FBSDID($FreeBSD$);
#include opt_wlan.h
#include sys/param.h
+#include sys/systm.h
+#include sys/counter.h
#include sys/kernel.h
#include sys/malloc.h
#include sys/mbuf.h
Modified: head/sys/net80211/ieee80211_crypto_ccmp.c
==
--- head/sys/net80211/ieee80211_crypto_ccmp.c Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_crypto_ccmp.c Tue May 26 12:51:14 2015
(r283567)
@@ -37,6 +37,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
+#include sys/counter.h
#include sys/mbuf.h
#include sys/malloc.h
#include sys/kernel.h
Modified: head/sys/net80211/ieee80211_crypto_none.c
==
--- head/sys/net80211/ieee80211_crypto_none.c Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_crypto_none.c Tue May 26 12:51:14 2015
(r283567)
@@ -32,8 +32,9 @@ __FBSDID($FreeBSD$);
#include opt_wlan.h
#include sys/param.h
-#include sys/kernel.h
#include sys/systm.h
+#include sys/counter.h
+#include sys/kernel.h
#include sys/mbuf.h
#include sys/module.h
Modified: head/sys/net80211/ieee80211_crypto_tkip.c
==
--- head/sys/net80211/ieee80211_crypto_tkip.c Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_crypto_tkip.c Tue May 26 12:51:14 2015
(r283567)
@@ -37,6 +37,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
+#include sys/counter.h
#include sys/mbuf.h
#include sys/malloc.h
#include sys/kernel.h
Modified: head/sys/net80211/ieee80211_crypto_wep.c
==
--- head/sys/net80211/ieee80211_crypto_wep.cTue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_crypto_wep.cTue May 26 12:51:14 2015
(r283567)
@@ -33,6 +33,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
+#include sys/counter.h
#include sys/mbuf.h
#include sys/malloc.h
#include sys/kernel.h
Modified: head/sys/net80211/ieee80211_hwmp.c
==
--- head/sys/net80211/ieee80211_hwmp.c Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_hwmp.c Tue May 26 12:51:14 2015
(r283567)
@@ -41,6 +41,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
+#include sys/counter.h
#include sys/mbuf.h
#include sys/malloc.h
#include sys/kernel.h
Modified: head/sys/net80211/ieee80211_ratectl_none.c
==
--- head/sys/net80211/ieee80211_ratectl_none.c Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_ratectl_none.c Tue May 26 12:51:14 2015
(r283567)
@@ -30,6 +30,7 @@ __FBSDID($FreeBSD$);
#include sys/param.h
#include sys/systm.h
+#include sys/counter.h
#include sys/kernel.h
#include sys/malloc.h
#include sys/module.h
Modified: head/sys/net80211/ieee80211_var.h
==
--- head/sys/net80211/ieee80211_var.h Tue May 26 12:40:27 2015
(r283566)
+++ head/sys/net80211/ieee80211_var.h Tue May 26 12:51:14 2015
(r283567)
@@ -135,6 +135,9 @@ struct ieee80211com {
struct task ic_bmiss_task; /* deferred beacon miss hndlr */
struct task ic_chw_task;/* deferred HT CHW update */
+ counter_u64_t ic_ierrors; /* input errors */
+ counter_u64_t ic_oerrors; /* output errors */
+
uint32_tic_flags; /* state flags */
uint32_tic_flags_ext; /* extended state flags */
uint32_tic_flags_ht;/* HT state flags */
svn commit: r283566 - head/sys/net80211
Author: glebius
Date: Tue May 26 12:40:27 2015
New Revision: 283566
URL: https://svnweb.freebsd.org/changeset/base/283566
Log:
Make ieee80211broadcastaddr global, so that drivers or other
code may use it and not paste.
Modified:
head/sys/net80211/ieee80211.c
head/sys/net80211/ieee80211.h
Modified: head/sys/net80211/ieee80211.c
==
--- head/sys/net80211/ieee80211.c Tue May 26 12:06:36 2015
(r283565)
+++ head/sys/net80211/ieee80211.c Tue May 26 12:40:27 2015
(r283566)
@@ -82,7 +82,7 @@ const int ieee80211_opcap[IEEE80211_OPMO
#endif
};
-static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
+const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
static void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag);
Modified: head/sys/net80211/ieee80211.h
==
--- head/sys/net80211/ieee80211.h Tue May 26 12:06:36 2015
(r283565)
+++ head/sys/net80211/ieee80211.h Tue May 26 12:40:27 2015
(r283566)
@@ -36,6 +36,10 @@
/* is 802.11 address multicast/broadcast? */
#defineIEEE80211_IS_MULTICAST(_a) (*(_a) 0x01)
+#ifdef _KERNEL
+extern const uint8_t ieee80211broadcastaddr[];
+#endif
+
typedef uint16_t ieee80211_seq;
/* IEEE 802.11 PLCP header */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283568 - head/sys/net80211
Author: glebius
Date: Tue May 26 13:19:05 2015
New Revision: 283568
URL: https://svnweb.freebsd.org/changeset/base/283568
Log:
Provide ieee80211_get_counter() that sums up ieee802com
errors to the errors of this vap interface.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
head/sys/net80211/ieee80211.c
Modified: head/sys/net80211/ieee80211.c
==
--- head/sys/net80211/ieee80211.c Tue May 26 12:51:14 2015
(r283567)
+++ head/sys/net80211/ieee80211.c Tue May 26 13:19:05 2015
(r283568)
@@ -95,6 +95,7 @@ staticvoid ieee80211com_media_status(st
static int ieee80211com_media_change(struct ifnet *);
static int media_status(enum ieee80211_opmode,
const struct ieee80211_channel *);
+static uint64_t ieee80211_get_counter(struct ifnet *, ift_counter);
MALLOC_DEFINE(M_80211_VAP, 80211vap, 802.11 vap state);
@@ -303,6 +304,8 @@ ieee80211_ifattach(struct ieee80211com *
taskqueue_thread_enqueue, ic-ic_tq);
taskqueue_start_threads(ic-ic_tq, 1, PI_NET, %s net80211 taskq,
ic-ic_name);
+ ic-ic_ierrors = counter_u64_alloc(M_WAITOK);
+ ic-ic_oerrors = counter_u64_alloc(M_WAITOK);
/*
* Fill in 802.11 available channel set, mark all
* available channels as active, and pick a default
@@ -401,6 +404,8 @@ ieee80211_ifdetach(struct ieee80211com *
/* XXX VNET needed? */
ifmedia_removeall(ic-ic_media);
+ counter_u64_free(ic-ic_ierrors);
+ counter_u64_free(ic-ic_oerrors);
taskqueue_free(ic-ic_tq);
IEEE80211_TX_LOCK_DESTROY(ic);
@@ -423,6 +428,31 @@ default_reset(struct ieee80211vap *vap,
}
/*
+ * Add underlying device errors to vap errors.
+ */
+static uint64_t
+ieee80211_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+ struct ieee80211vap *vap = ifp-if_softc;
+ struct ieee80211com *ic = vap-iv_ic;
+ uint64_t rv;
+
+ rv = if_get_counter_default(ifp, cnt);
+ switch (cnt) {
+ case IFCOUNTER_OERRORS:
+ rv += counter_u64_fetch(ic-ic_oerrors);
+ break;
+ case IFCOUNTER_IERRORS:
+ rv += counter_u64_fetch(ic-ic_ierrors);
+ break;
+ default:
+ break;
+ }
+
+ return (rv);
+}
+
+/*
* Prepare a vap for use. Drivers use this call to
* setup net80211 state in new vap's prior attaching
* them with ieee80211_vap_attach (below).
@@ -448,6 +478,7 @@ ieee80211_vap_setup(struct ieee80211com
ifp-if_qflush = ieee80211_vap_qflush;
ifp-if_ioctl = ieee80211_ioctl;
ifp-if_init = ieee80211_init;
+ ifp-if_get_counter = ieee80211_get_counter;
vap-iv_ifp = ifp;
vap-iv_ic = ic;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283132 - head/lib/libproc
On Tue, May 26, 2015 at 5:07 AM, Alastair Hogge a...@fastmail.fm wrote: On 2015-05-19 Tue 22:23:16 + Baptiste Daroussin b...@freebsd.org, wrote: == --- head/lib/libproc/Makefile Tue May 19 22:22:53 2015(r283131) +++ head/lib/libproc/Makefile Tue May 19 22:23:15 2015(r283132) @@ -23,6 +23,8 @@ LIBADD+=cxxrt LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + I have to revert this commit on my CURRENT systems so buildworld can continue. On one such system(r283554): [..] --- all_subdir_libproc --- /tmp/bdver2/usr/src/tmp/usr/bin/ld: cannot find -lrtld_db cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libproc.so.3] Error code 1 Same here. make.conf: KERNCONF=TRITON CPUTYPE?=k8-sse3 SVN_UPDATE=y COPTFLAGS=-O2 -pipe MALLOC_PRODUCTION=y src.conf: WITHOUT_AMD=y WITHOUT_APM=y WITHOUT_ASSERT_DEBUG=y WITHOUT_ATM=y WITHOUT_AUTOFS=y WITHOUT_BHYVE=y WITHOUT_BLUETOOTH=y WITHOUT_BOOTPARAMD=y WITHOUT_BOOTPD=y WITHOUT_BSNMP=y WITHOUT_CAPSICUM=y WITHOUT_CASPER=y WITHOUT_CDDL=y WITHOUT_CTM=y WITHOUT_FLOPPY=y WITHOUT_HAST=y WITHOUT_HTML=y WITHOUT_HYPERV=y WITHOUT_IPFILTER=y WITHOUT_ISCSI=y WITHOUT_NDIS=y WITHOUT_PPP=y WITHOUT_PROFILE=y WITHOUT_RBOOTD=y WITHOUT_ROUTED=y WITH_SORT_THREADS=y WITHOUT_TESTS=y WITHOUT_WIRELESS=y Best, Matteo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283577 - head/sbin/dumpfs
Author: ae Date: Tue May 26 18:27:38 2015 New Revision: 283577 URL: https://svnweb.freebsd.org/changeset/base/283577 Log: Print leading zeroes of UFS2 fs_id like we do for UFS1. PR: 156908 MFC after:1 week Modified: head/sbin/dumpfs/dumpfs.c Modified: head/sbin/dumpfs/dumpfs.c == --- head/sbin/dumpfs/dumpfs.c Tue May 26 17:44:31 2015(r283576) +++ head/sbin/dumpfs/dumpfs.c Tue May 26 18:27:38 2015(r283577) @@ -165,7 +165,7 @@ dumpfs(const char *name) fstime = afs.fs_time; printf(magic\t%x (UFS2)\ttime\t%s, afs.fs_magic, ctime(fstime)); - printf(superblock location\t%jd\tid\t[ %x %x ]\n, + printf(superblock location\t%jd\tid\t[ %08x %08x ]\n, (intmax_t)afs.fs_sblockloc, afs.fs_id[0], afs.fs_id[1]); printf(ncg\t%d\tsize\t%jd\tblocks\t%jd\n, afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283568 - head/sys/net80211
On 26 May 2015 at 08:44, Gleb Smirnoff gleb...@freebsd.org wrote: On Tue, May 26, 2015 at 08:25:01AM -0700, Adrian Chadd wrote: A Hi, A A We're going to have to move all of the counter API stuff into A ieee80211_freebsd.[ch]. Well, I put the function in the same file where if_get_counter pointer is set, so that it can be static. You need distinctive border between FreeBSD and non-FreeBSD stuff, which right now isn't yet clear. I don't mind moving, but looks like the ifnet attachment process, either the current one or the future one, also needs to be moved to FreeBSD part of the code. Yeah, the lines got .. blurred. I don't want to go full portability unless someone comes up with a very pressing need - eg, still assume ifnet ,still assume ioctl ,transmit/start, receive, mbufs, etc. But vnets and counter API should be easy to migrate out so netbsd/dragonflybsd can port things. -adrian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283538 - head/sys/net80211
There's only one place that it's used in net80211, and that's for the ifnet setup. All I wanted to do was ensure it didn't end up getting used elsewhere in the stack. -adrian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283572 - head
Author: bapt
Date: Tue May 26 16:25:28 2015
New Revision: 283572
URL: https://svnweb.freebsd.org/changeset/base/283572
Log:
Fix build WITHOUT_CDDL by unconditionnaly adding libproc and librtld_db
on supported arches to the prebuild libs
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue May 26 16:17:24 2015(r283571)
+++ head/Makefile.inc1 Tue May 26 16:25:28 2015(r283572)
@@ -1755,6 +1755,7 @@ _cddl_lib= cddl/lib
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
cddl/lib/libzfs__L: lib/libgeom__L
cddl/lib/libctf__L: lib/libz__L
+.endif
# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
# on select architectures though (see cddl/lib/Makefile)
.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386 || \
@@ -1762,7 +1763,6 @@ cddl/lib/libctf__L: lib/libz__L
${MACHINE_CPUARCH} == arm
_prebuild_libs+= lib/libproc lib/librtld_db
.endif
-.endif
.if ${MK_CRYPT} != no
.if ${MK_OPENSSL} != no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283568 - head/sys/net80211
On Tue, May 26, 2015 at 08:25:01AM -0700, Adrian Chadd wrote: A Hi, A A We're going to have to move all of the counter API stuff into A ieee80211_freebsd.[ch]. Well, I put the function in the same file where if_get_counter pointer is set, so that it can be static. You need distinctive border between FreeBSD and non-FreeBSD stuff, which right now isn't yet clear. I don't mind moving, but looks like the ifnet attachment process, either the current one or the future one, also needs to be moved to FreeBSD part of the code. -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283132 - head/lib/libproc
On Tue, May 26, 2015 at 09:20:39AM -0400, Matteo Riondato wrote: On Tue, May 26, 2015 at 5:07 AM, Alastair Hogge a...@fastmail.fm wrote: On 2015-05-19 Tue 22:23:16 + Baptiste Daroussin b...@freebsd.org, wrote: == --- head/lib/libproc/Makefile Tue May 19 22:22:53 2015(r283131) +++ head/lib/libproc/Makefile Tue May 19 22:23:15 2015(r283132) @@ -23,6 +23,8 @@ LIBADD+=cxxrt LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + I have to revert this commit on my CURRENT systems so buildworld can continue. On one such system(r283554): [..] --- all_subdir_libproc --- /tmp/bdver2/usr/src/tmp/usr/bin/ld: cannot find -lrtld_db cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libproc.so.3] Error code 1 Same here. make.conf: KERNCONF=TRITON CPUTYPE?=k8-sse3 SVN_UPDATE=y COPTFLAGS=-O2 -pipe MALLOC_PRODUCTION=y src.conf: WITHOUT_AMD=y WITHOUT_APM=y WITHOUT_ASSERT_DEBUG=y WITHOUT_ATM=y WITHOUT_AUTOFS=y WITHOUT_BHYVE=y WITHOUT_BLUETOOTH=y WITHOUT_BOOTPARAMD=y WITHOUT_BOOTPD=y WITHOUT_BSNMP=y WITHOUT_CAPSICUM=y WITHOUT_CASPER=y WITHOUT_CDDL=y WITHOUT_CTM=y WITHOUT_FLOPPY=y WITHOUT_HAST=y WITHOUT_HTML=y WITHOUT_HYPERV=y WITHOUT_IPFILTER=y WITHOUT_ISCSI=y WITHOUT_NDIS=y WITHOUT_PPP=y WITHOUT_PROFILE=y WITHOUT_RBOOTD=y WITHOUT_ROUTED=y WITH_SORT_THREADS=y WITHOUT_TESTS=y WITHOUT_WIRELESS=y Best, Matteo Should be fixed, thanks for reporting Best regards, Bapt pgpfcLGEafOY_.pgp Description: PGP signature
svn commit: r283579 - head/sys/boot/uboot/lib
Author: gonzo
Date: Tue May 26 20:32:14 2015
New Revision: 283579
URL: https://svnweb.freebsd.org/changeset/base/283579
Log:
Print error message if autoload fails due to missing DTB blob, otherwise
ubldr just falls back to loader prompt with no apparent reason
Modified:
head/sys/boot/uboot/lib/module.c
Modified: head/sys/boot/uboot/lib/module.c
==
--- head/sys/boot/uboot/lib/module.cTue May 26 19:46:41 2015
(r283578)
+++ head/sys/boot/uboot/lib/module.cTue May 26 20:32:14 2015
(r283579)
@@ -47,8 +47,10 @@ uboot_autoload(void)
#if defined(LOADER_FDT_SUPPORT)
int err;
- if ((err = fdt_setup_fdtp()) != 0)
+ if ((err = fdt_setup_fdtp()) != 0) {
+ printf(No valid device tree blob found!\n);
return (err);
+ }
#endif
return(0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283569 - head/sys/conf
Author: nyan
Date: Tue May 26 14:08:32 2015
New Revision: 283569
URL: https://svnweb.freebsd.org/changeset/base/283569
Log:
MFi386: r283407
Implement vdso - virtual dynamic shared object.
MFi386: r283474
Rework signal code to allow using it by other modules, like linprocfs.
MFi386: r283506
For objcopy, use --input-target and --output-target.
This fixes pc98 build.
Modified:
head/sys/conf/files.pc98
Modified: head/sys/conf/files.pc98
==
--- head/sys/conf/files.pc98Tue May 26 13:19:05 2015(r283568)
+++ head/sys/conf/files.pc98Tue May 26 14:08:32 2015(r283569)
@@ -21,6 +21,18 @@ linux_assym.hoptional
compat_linux\
no-obj no-implicit-rule before-depend \
clean linux_assym.h
#
+linux_locore.o optionalcompat_linux\
+ dependency linux_assym.h $S/i386/linux/linux_locore.s\
+ compile-with${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe
-I. -I$S -Werror -Wall -fno-common -nostdinc -nostdlib
-Wl,-T$S/i386/linux/linux_vdso.lds.s
-Wl,-soname=linux_vdso.so,--eh-frame-hdr,-fPIC,-warn-common ${.IMPSRC} -o
${.TARGET} \
+ no-obj no-implicit-rule \
+ clean linux_locore.o
+#
+linux_vdso.so optionalcompat_linux\
+ dependency linux_locore.o\
+ compile-with${OBJCOPY} --input-target binary --output-target
elf32-i386-freebsd --binary-architecture i386 linux_locore.o ${.TARGET} \
+ no-implicit-rule\
+ clean linux_vdso.so
+#
svr4_genassym.ooptionalcompat_svr4
\
dependency $S/i386/svr4/svr4_genassym.c \
compile-with${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}\
@@ -59,6 +71,8 @@ compat/linux/linux_time.c optional compa
compat/linux/linux_timer.c optional compat_linux
compat/linux/linux_uid16.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
+compat/linux/linux_vdso.c optional compat_linux
+compat/linux/linux.c optional compat_linux
compat/svr4/imgact_svr4.c optional compat_svr4
compat/svr4/svr4_fcntl.c optional compat_svr4
compat/svr4/svr4_filio.c optional compat_svr4
@@ -193,8 +207,6 @@ i386/isa/pmtimer.c optional pmtimer
i386/isa/prof_machdep.coptional profiling-routine
i386/linux/imgact_linux.c optional compat_linux
i386/linux/linux_dummy.c optional compat_linux
-i386/linux/linux_locore.s optional compat_linux \
- dependency linux_assym.h
i386/linux/linux_machdep.c optional compat_linux
i386/linux/linux_ptrace.c optional compat_linux
i386/linux/linux_support.s optional compat_linux \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283580 - head/release
Author: gjb
Date: Tue May 26 20:51:44 2015
New Revision: 283580
URL: https://svnweb.freebsd.org/changeset/base/283580
Log:
Use SVNREVISION and BUILDDATE if passed into the make(1)
environment, fallback to trying to figure it out otherwise.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 20:32:14 2015
(r283579)
+++ head/release/Makefile.mirrors Tue May 26 20:51:44 2015
(r283580)
@@ -30,24 +30,26 @@ EMBEDDED= 1
.if ${BRANCH} == STABLE || ${BRANCH} == CURRENT
SNAPSHOT= 1
TLD?= ${FTPDIR}/snapshots
-. for _D in /usr/bin /usr/local/bin
-. for _S in svnversion svnliteversion
-. if exists(${_D}/${_S})
+. if !defined(SVNREVISION) || empty(SVNREVISION)
+. for _D in /usr/bin /usr/local/bin
+. for _S in svnversion svnliteversion
+.if exists(${_D}/${_S})
SVNVERSION?= ${_D}/${_S}
-. endif
+.endif
+. endfor
. endfor
-. endfor
-. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
+. if exists(${SVNVERSION}) !empty(SVNVERSION)
+SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile
+. endif
+. endif # !defined(SVNERVISION)
+. if !defined(BUILDDATE) || empty(BUILDDATE)
+. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
BUILDDATE!=cd ${.CURDIR} date -j -f '%s' $$(stat -f %c
${.OBJDIR}/dist/base/bin/sh) +%Y%m%d
-. else
+. else
BUILDDATE!=date +%Y%m%d
+. endif
. endif
-. if exists(${SVNVERSION}) !empty(SVNVERSION)
-SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile
_SNAP_SUFFIX:= -r${SVNREVISION}-${BUILDDATE}
-. else
-_SNAP_SUFFIX:= -${BUILDDATE}
-. endif
.else
# release
SNAPSHOT=
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283583 - stable/10/contrib/tcpdump
Author: luigi
Date: Tue May 26 21:12:02 2015
New Revision: 283583
URL: https://svnweb.freebsd.org/changeset/base/283583
Log:
MFC: 272451, 272653 add CAP_EVENT so that we can poll() on netmap and pcap
file descriptors
Modified:
stable/10/contrib/tcpdump/tcpdump.c
Modified: stable/10/contrib/tcpdump/tcpdump.c
==
--- stable/10/contrib/tcpdump/tcpdump.c Tue May 26 21:03:41 2015
(r283582)
+++ stable/10/contrib/tcpdump/tcpdump.c Tue May 26 21:12:02 2015
(r283583)
@@ -1486,7 +1486,12 @@ main(int argc, char **argv)
if (RFileName == NULL VFileName == NULL) {
static const unsigned long cmds[] = { BIOCGSTATS };
- cap_rights_init(rights, CAP_IOCTL, CAP_READ);
+ /*
+* The various libpcap devices use a combination of
+* read (bpf), ioctl (bpf, netmap), poll (netmap).
+* Grant the relevant access rights, sorted by name.
+*/
+ cap_rights_init(rights, CAP_EVENT, CAP_IOCTL, CAP_READ);
if (cap_rights_limit(pcap_fileno(pd), rights) 0
errno != ENOSYS) {
error(unable to limit pcap descriptor);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283584 - in head: contrib/netbsd-tests/lib/libc/string lib/libc/string
Author: emaste
Date: Tue May 26 21:16:07 2015
New Revision: 283584
URL: https://svnweb.freebsd.org/changeset/base/283584
Log:
memmem(3): empty little string matches the beginning of the big string
This function originated in glibc, and this matches their behaviour
(and NetBSD, OpenBSD, and musl).
An empty big string (arg l) is handled by the existing
l_len s_len test.
Reviewed by: bapt, ngie
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D2657
Modified:
head/contrib/netbsd-tests/lib/libc/string/t_memmem.c
head/lib/libc/string/memmem.3
head/lib/libc/string/memmem.c
Modified: head/contrib/netbsd-tests/lib/libc/string/t_memmem.c
==
--- head/contrib/netbsd-tests/lib/libc/string/t_memmem.cTue May 26
21:12:02 2015(r283583)
+++ head/contrib/netbsd-tests/lib/libc/string/t_memmem.cTue May 26
21:16:07 2015(r283584)
@@ -75,7 +75,7 @@ ATF_TC_HEAD(memmem_basic, tc)
ATF_TC_BODY(memmem_basic, tc)
{
-#if defined(__darwin__) || defined(__FreeBSD__)
+#if defined(__darwin__)
expect(memmem(b2, lb2, p0, lp0) == NULL);
expect(memmem(b0, lb0, p0, lp0) == NULL);
#else
Modified: head/lib/libc/string/memmem.3
==
--- head/lib/libc/string/memmem.3 Tue May 26 21:12:02 2015
(r283583)
+++ head/lib/libc/string/memmem.3 Tue May 26 21:16:07 2015
(r283584)
@@ -26,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd August 24, 2005
+.Dd May 26, 2015
.Dt MEMMEM 3
.Os
.Sh NAME
@@ -51,14 +51,12 @@ in the byte string
.Fa big .
.Sh RETURN VALUES
If
-.Fa big_len
-is smaller than
-.Fa little_len ,
-if
.Fa little_len
-is 0, if
-.Fa big_len
-is 0 or if
+is zero
+.Fa big
+is returned (that is, an empty little is deemed to match at the beginning of
+big);
+if
.Fa little
occurs nowhere in
.Fa big ,
@@ -84,3 +82,11 @@ function first appeared in
.Sh BUGS
This function was broken in Linux libc up to and including version 5.0.9
and in GNU libc prior to version 2.1.
+Prior to
+.Fx 11.0
+.Nm
+returned
+.Dv NULL
+when
+.Fa little_len
+equals 0.
Modified: head/lib/libc/string/memmem.c
==
--- head/lib/libc/string/memmem.c Tue May 26 21:12:02 2015
(r283583)
+++ head/lib/libc/string/memmem.c Tue May 26 21:16:07 2015
(r283584)
@@ -42,9 +42,9 @@ memmem(const void *l, size_t l_len, cons
const char *cl = (const char *)l;
const char *cs = (const char *)s;
- /* we need something to compare */
- if (l_len == 0 || s_len == 0)
- return NULL;
+ /* empty s matches the beginning of l */
+ if (s_len == 0)
+ return (void *)cl;
/* s must be smaller or equal to l */
if (l_len s_len)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283320 - head/sys/kern
On Sat, May 23, 2015 at 07:09:04PM +, Konstantin Belousov wrote: Author: kib Date: Sat May 23 19:09:04 2015 New Revision: 283320 URL: https://svnweb.freebsd.org/changeset/base/283320 Log: If thread requested to not stop on non-boundary, then not only stopping signals should obey, but also all forms of single-threading. This sentence is messes up my English parser... Joerg ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283589 - head/sys/net80211
Author: gavin
Date: Tue May 26 21:50:53 2015
New Revision: 283589
URL: https://svnweb.freebsd.org/changeset/base/283589
Log:
Fix spelling mistake in comment.
Modified:
head/sys/net80211/ieee80211.h
Modified: head/sys/net80211/ieee80211.h
==
--- head/sys/net80211/ieee80211.h Tue May 26 21:47:43 2015
(r283588)
+++ head/sys/net80211/ieee80211.h Tue May 26 21:50:53 2015
(r283589)
@@ -816,7 +816,7 @@ struct ieee80211_csa_ie {
#defineIEEE80211_RATE_BASIC0x80
#defineIEEE80211_RATE_VAL 0x7f
-/* EPR information element flags */
+/* ERP information element flags */
#defineIEEE80211_ERP_NON_ERP_PRESENT 0x01
#defineIEEE80211_ERP_USE_PROTECTION0x02
#defineIEEE80211_ERP_LONG_PREAMBLE 0x04
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283568 - head/sys/net80211
Hi,
We're going to have to move all of the counter API stuff into
ieee80211_freebsd.[ch].
-adrian
On 26 May 2015 at 06:19, Gleb Smirnoff gleb...@freebsd.org wrote:
Author: glebius
Date: Tue May 26 13:19:05 2015
New Revision: 283568
URL: https://svnweb.freebsd.org/changeset/base/283568
Log:
Provide ieee80211_get_counter() that sums up ieee802com
errors to the errors of this vap interface.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
head/sys/net80211/ieee80211.c
Modified: head/sys/net80211/ieee80211.c
==
--- head/sys/net80211/ieee80211.c Tue May 26 12:51:14 2015
(r283567)
+++ head/sys/net80211/ieee80211.c Tue May 26 13:19:05 2015
(r283568)
@@ -95,6 +95,7 @@ staticvoid ieee80211com_media_status(st
static int ieee80211com_media_change(struct ifnet *);
static int media_status(enum ieee80211_opmode,
const struct ieee80211_channel *);
+static uint64_t ieee80211_get_counter(struct ifnet *, ift_counter);
MALLOC_DEFINE(M_80211_VAP, 80211vap, 802.11 vap state);
@@ -303,6 +304,8 @@ ieee80211_ifattach(struct ieee80211com *
taskqueue_thread_enqueue, ic-ic_tq);
taskqueue_start_threads(ic-ic_tq, 1, PI_NET, %s net80211 taskq,
ic-ic_name);
+ ic-ic_ierrors = counter_u64_alloc(M_WAITOK);
+ ic-ic_oerrors = counter_u64_alloc(M_WAITOK);
/*
* Fill in 802.11 available channel set, mark all
* available channels as active, and pick a default
@@ -401,6 +404,8 @@ ieee80211_ifdetach(struct ieee80211com *
/* XXX VNET needed? */
ifmedia_removeall(ic-ic_media);
+ counter_u64_free(ic-ic_ierrors);
+ counter_u64_free(ic-ic_oerrors);
taskqueue_free(ic-ic_tq);
IEEE80211_TX_LOCK_DESTROY(ic);
@@ -423,6 +428,31 @@ default_reset(struct ieee80211vap *vap,
}
/*
+ * Add underlying device errors to vap errors.
+ */
+static uint64_t
+ieee80211_get_counter(struct ifnet *ifp, ift_counter cnt)
+{
+ struct ieee80211vap *vap = ifp-if_softc;
+ struct ieee80211com *ic = vap-iv_ic;
+ uint64_t rv;
+
+ rv = if_get_counter_default(ifp, cnt);
+ switch (cnt) {
+ case IFCOUNTER_OERRORS:
+ rv += counter_u64_fetch(ic-ic_oerrors);
+ break;
+ case IFCOUNTER_IERRORS:
+ rv += counter_u64_fetch(ic-ic_ierrors);
+ break;
+ default:
+ break;
+ }
+
+ return (rv);
+}
+
+/*
* Prepare a vap for use. Drivers use this call to
* setup net80211 state in new vap's prior attaching
* them with ieee80211_vap_attach (below).
@@ -448,6 +478,7 @@ ieee80211_vap_setup(struct ieee80211com
ifp-if_qflush = ieee80211_vap_qflush;
ifp-if_ioctl = ieee80211_ioctl;
ifp-if_init = ieee80211_init;
+ ifp-if_get_counter = ieee80211_get_counter;
vap-iv_ifp = ifp;
vap-iv_ic = ic;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283132 - head/lib/libproc
On Tue, May 26, 2015 at 09:20:39AM -0400, Matteo Riondato wrote: On Tue, May 26, 2015 at 5:07 AM, Alastair Hogge a...@fastmail.fm wrote: On 2015-05-19 Tue 22:23:16 + Baptiste Daroussin b...@freebsd.org, wrote: == --- head/lib/libproc/Makefile Tue May 19 22:22:53 2015(r283131) +++ head/lib/libproc/Makefile Tue May 19 22:23:15 2015(r283132) @@ -23,6 +23,8 @@ LIBADD+=cxxrt LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + I have to revert this commit on my CURRENT systems so buildworld can continue. On one such system(r283554): [..] --- all_subdir_libproc --- /tmp/bdver2/usr/src/tmp/usr/bin/ld: cannot find -lrtld_db cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libproc.so.3] Error code 1 Same here. make.conf: KERNCONF=TRITON CPUTYPE?=k8-sse3 SVN_UPDATE=y COPTFLAGS=-O2 -pipe MALLOC_PRODUCTION=y src.conf: WITHOUT_AMD=y WITHOUT_APM=y WITHOUT_ASSERT_DEBUG=y WITHOUT_ATM=y WITHOUT_AUTOFS=y WITHOUT_BHYVE=y WITHOUT_BLUETOOTH=y WITHOUT_BOOTPARAMD=y WITHOUT_BOOTPD=y WITHOUT_BSNMP=y WITHOUT_CAPSICUM=y WITHOUT_CASPER=y WITHOUT_CDDL=y WITHOUT_CTM=y WITHOUT_FLOPPY=y WITHOUT_HAST=y WITHOUT_HTML=y WITHOUT_HYPERV=y WITHOUT_IPFILTER=y WITHOUT_ISCSI=y WITHOUT_NDIS=y WITHOUT_PPP=y WITHOUT_PROFILE=y WITHOUT_RBOOTD=y WITHOUT_ROUTED=y WITH_SORT_THREADS=y WITHOUT_TESTS=y WITHOUT_WIRELESS=y Thanks, working on a fix now, this only happens due to WITHOUT_CDDL. Best regards, Bapt pgpBIyTaXHwkC.pgp Description: PGP signature
svn commit: r283593 - head/release
Author: gjb
Date: Tue May 26 21:58:22 2015
New Revision: 283593
URL: https://svnweb.freebsd.org/changeset/base/283593
Log:
Fix a typo.
Submitted by: ian
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 21:53:04 2015
(r283592)
+++ head/release/Makefile.mirrors Tue May 26 21:58:22 2015
(r283593)
@@ -41,7 +41,7 @@ SVNVERSION?= ${_D}/${_S}
. if exists(${SVNVERSION}) !empty(SVNVERSION)
SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile
. endif
-. endif # !defined(SVNERVISION)
+. endif # !defined(SVNREVISION)
. if !defined(BUILDDATE) || empty(BUILDDATE)
. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
BUILDDATE!=cd ${.CURDIR} date -j -f '%s' $$(stat -f %c
${.OBJDIR}/dist/base/bin/sh) +%Y%m%d
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283424 - in head/sys: amd64/linux modules/linux64
On 25/05/2015 09:04 a.m., Chagin Dmitry wrote: On Mon, May 25, 2015 at 07:48:49AM -0400, John Baldwin wrote: On Sunday, May 24, 2015 04:07:12 PM Dmitry Chagin wrote: Author: dchagin Date: Sun May 24 16:07:11 2015 New Revision: 283424 URL: https://svnweb.freebsd.org/changeset/base/283424 Log: Add preliminary support for x86-64 Linux binaries. Differential Revision: https://reviews.freebsd.org/D1076 Added: head/sys/amd64/linux/ head/sys/amd64/linux/Makefile (contents, props changed) head/sys/amd64/linux/linux.h (contents, props changed) head/sys/amd64/linux/linux_dummy.c (contents, props changed) head/sys/amd64/linux/linux_genassym.c (contents, props changed) head/sys/amd64/linux/linux_ipc64.h (contents, props changed) head/sys/amd64/linux/linux_locore.s (contents, props changed) head/sys/amd64/linux/linux_machdep.c (contents, props changed) head/sys/amd64/linux/linux_support.s (contents, props changed) head/sys/amd64/linux/linux_sysvec.c (contents, props changed) head/sys/amd64/linux/linux_vdso.lds.s (contents, props changed) head/sys/amd64/linux/syscalls.conf (contents, props changed) head/sys/amd64/linux/syscalls.master (contents, props changed) head/sys/modules/linux64/ head/sys/modules/linux64/Makefile (contents, props changed) First, I'm really happy to see this land in HEAD! Thanks! Indeed ... HUGE congratulations and thanks to Dmitry .. Great Job! Pedro. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283576 - head/release
Author: gjb
Date: Tue May 26 17:44:31 2015
New Revision: 283576
URL: https://svnweb.freebsd.org/changeset/base/283576
Log:
Reindent after r283575.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 17:42:28 2015
(r283575)
+++ head/release/Makefile.mirrors Tue May 26 17:44:31 2015
(r283576)
@@ -85,16 +85,16 @@ remove-old-bits:
iso-images-stage:
mkdir -p ${ISO_DIR}
mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
-. if defined(SNAPSHOT) !empty(SNAPSHOT)
+.if defined(SNAPSHOT) !empty(SNAPSHOT)
cd ${RELEASEDIR} rm -f CHECKSUM.*
-. for IMAGE in ${IMAGES}
-. if defined(EMBEDDED) !empty(EMBEDDED)
-.if defined(OLDNAME) !empty(OLDNAME)
+. for IMAGE in ${IMAGES}
+. if defined(EMBEDDED) !empty(EMBEDDED)
+. if defined(OLDNAME) !empty(OLDNAME)
@# arm/armv6 IMX6 - WANDBOARD, for example.
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${OLDNAME}.${IMAGE}.xz \
${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
-.endif
+. endif
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \
${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz
@@ -103,8 +103,8 @@ iso-images-stage:
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz
-. endif # not embedded
-.if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
+. endif # not embedded
+. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${IMAGE} \
${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
@@ -113,8 +113,8 @@ iso-images-stage:
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
-.endif
-.if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
+. endif
+. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${IMAGE}.xz \
${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
@@ -123,11 +123,11 @@ iso-images-stage:
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
-.endif
-. endfor # images loop
+. endif
+. endfor # images loop
cd ${RELEASEDIR} rm -f CHECKSUM.*
-. for CHECKSUM in ${CHECKSUM_FILES}
-. if defined(EMBEDDED) !empty(EMBEDDED)
+. for CHECKSUM in ${CHECKSUM_FILES}
+. if defined(EMBEDDED) !empty(EMBEDDED)
cd ${RELEASEDIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}
cp -p
${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX} \
@@ -135,7 +135,7 @@ iso-images-stage:
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}
-. else # not embedded
+. else # not embedded
cd ${RELEASEDIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX} \
@@ -143,42 +143,42 @@ iso-images-stage:
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
-. endif #
-. endfor # checksum files
-. else # not snapshot
-. for IMAGE in ${IMAGES}
-. if defined(EMBEDDED) !empty(EMBEDDED)
-.if defined(OLDNAME) !empty(OLDNAME)
+. endif #
+. endfor # checksum files
+.else # not snapshot
+. for IMAGE in ${IMAGES}
+. if defined(EMBEDDED) !empty(EMBEDDED)
+. if defined(OLDNAME) !empty(OLDNAME)
@# arm/armv6 IMX6 - WANDBOARD, for example.
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${OLDNAME}.${IMAGE}.xz \
${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
-.endif
+. endif
cp -p ${RELEASEDIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
-. endif # not embedded
-.if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
+. endif # not embedded
+. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
cd ${RELEASEDIR} \
cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE} \
${ISO_DIR}/${OSRELEASE}-${IMAGE}
cd
Re: svn commit: r283552 - stable/10/share/man/man9
On Tuesday, May 26, 2015 11:55:10 AM Julian Elischer wrote: On 5/26/15 10:50 AM, Benjamin Kaduk wrote: On Mon, May 25, 2015 at 10:18 PM, Julian Elischer jul...@freebsd.org mailto:jul...@freebsd.org wrote: Author: julian Date: Tue May 26 02:18:10 2015 New Revision: 283552 URL: https://svnweb.freebsd.org/changeset/base/283552 Log: MFH: r283105 Only several years late, catch the psignal man page up to the fact that psignal has been renamed to kern_psignal since 9.0. Why did you not merge r283114 as well? -Ben I didn't do it.. didn't even see it. Part of my standing practice with merges is to actually open the link to the change in viewvc in a web browser and open the revision logs of each changed file in a new tab. In each tab I clear the sticky revision and then check for any followup commits that might have fixed issues in the previous change. For smaller changes where I know there wasn't a followup I will skip this, but if I'm not sure I use this to check for followups. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283538 - head/sys/net80211
On Monday, May 25, 2015 10:38:33 PM Gleb Smirnoff wrote: On Mon, May 25, 2015 at 07:18:16PM +, Adrian Chadd wrote: A * kill M_WAITOK - some platforms just don't want you to use it Actually all functions called in device attach context or in syscall context should use M_WAITOK. This makes API more robust and simplifies code a lot. Can we achieve portability without losing this nice feature of FreeBSD? I agree with this general policy. There are several places that currently use M_NOWAIT (e.g. new-bus) that could safely use M_WAITOK instead in many cases (if not always). -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r283569 - head/sys/conf
On Tue, May 26, 2015 at 02:08:32PM +, Takahashi Yoshihiro wrote: Author: nyan Date: Tue May 26 14:08:32 2015 New Revision: 283569 URL: https://svnweb.freebsd.org/changeset/base/283569 Log: MFi386: r283407 Implement vdso - virtual dynamic shared object. MFi386: r283474 Rework signal code to allow using it by other modules, like linprocfs. MFi386: r283506 For objcopy, use --input-target and --output-target. This fixes pc98 build. Thank you, my make universe just ended, sorry -- Have fun! chd ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283573 - head/release
Author: gjb
Date: Tue May 26 17:34:56 2015
New Revision: 283573
URL: https://svnweb.freebsd.org/changeset/base/283573
Log:
Remove a continuation on error, since the relevant behavior can
only occur if a particular file exists.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 16:25:28 2015
(r283572)
+++ head/release/Makefile.mirrors Tue May 26 17:34:56 2015
(r283573)
@@ -107,7 +107,7 @@ iso-images-stage:
.if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${IMAGE} \
- ${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE} || true
+ ${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
cp -p ${RELEASEDIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE} \
${ISO_DIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
cd ${TLD}/ISO-IMAGES/${REVISION} \
@@ -117,7 +117,7 @@ iso-images-stage:
.if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
cd ${RELEASEDIR} \
mv ${OSRELEASE}-${IMAGE}.xz \
- ${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz || true
+ ${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
cp -p ${RELEASEDIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
cd ${TLD}/ISO-IMAGES/${REVISION} \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283574 - head/release
Author: gjb
Date: Tue May 26 17:40:36 2015
New Revision: 283574
URL: https://svnweb.freebsd.org/changeset/base/283574
Log:
Set STAGE_TARGETS only if RELEASEDIR exists.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 17:34:56 2015
(r283573)
+++ head/release/Makefile.mirrors Tue May 26 17:40:36 2015
(r283574)
@@ -16,7 +16,9 @@
RELEASEDIR?= /R
FTPDIR?= ${RELEASEDIR}/ftp-stage
+.if exists(${RELEASEDIR})
STAGE_TARGETS?=iso-images-stage
+.endif
.if (defined(EMBEDDED_TARGET) !empty(EMBEDDED_TARGET)) ||
(defined(EMBEDDEDBUILD) !empty(EMBEDDEDBUILD))
. if ${TARGET} == arm || ${EMBEDDED_TARGET} == arm
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r283575 - head/release
Author: gjb
Date: Tue May 26 17:42:28 2015
New Revision: 283575
URL: https://svnweb.freebsd.org/changeset/base/283575
Log:
Remove duplicate exists() sanity check.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 26 17:40:36 2015
(r283574)
+++ head/release/Makefile.mirrors Tue May 26 17:42:28 2015
(r283575)
@@ -85,8 +85,6 @@ remove-old-bits:
iso-images-stage:
mkdir -p ${ISO_DIR}
mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
-.if exists(${RELEASEDIR})
- @# Assume we have images to copy.
. if defined(SNAPSHOT) !empty(SNAPSHOT)
cd ${RELEASEDIR} rm -f CHECKSUM.*
. for IMAGE in ${IMAGES}
@@ -206,7 +204,6 @@ iso-images-stage:
ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
${REVISION}-${BRANCH}
. endif
-.endif # no RELEASEDIR
vm-images-stage:
mkdir -p ${VM_DIR}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
