Re: svn commit: r282736 - in head: . lib/libmd
* Sean Bruno, 2015-05-11 : I already pinged Thomas about this privately, but in the event anyone is looking, MIPS is still broken after this commit. Probably all the GCC based targets are, if I read this correctly. make -s -j8 buildworld TARGET=mips TARGET_ARCH=mips ... === libexec/rtld-elf/tests/libpythagoras (all) make[6]: /var/tmp/mips.mips/home/sbruno/bsd/fbsd_head/libexec/rtld-elf/tests/libp ythagoras/.depend, 11: ignoring stale .depend for /var/tmp/mips.mips/home/sbruno/bsd/fbsd_head/tmp/usr/tests/libexec/rtld- elf/libm.a === kerberos5/lib/libgssapi_krb5 (all) === libexec/rtld-elf/tests/target (all) === rescue/rescue/date/tests (depend) /var/tmp/mips.mips/home/sbruno/bsd/fbsd_head/tmp/usr/lib/libcrypt.so: undefined reference to `_libmd_MD4Init' Ack, trying to reproduce this one locally. Can you make a full build log available somewhere? Thanks! Thomas. ___ 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: r282748 - in stable/10/sys: cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/sys cddl/dev/cyclic cddl/dev/fbt cddl/dev/profile ...
Author: avg
Date: Mon May 11 07:54:39 2015
New Revision: 282748
URL: https://svnweb.freebsd.org/changeset/base/282748
Log:
MFC r275576: remove opensolaris cyclic code, replace with high-precision
callouts
Deleted:
stable/10/sys/cddl/compat/opensolaris/sys/cyclic.h
stable/10/sys/cddl/compat/opensolaris/sys/cyclic_impl.h
stable/10/sys/cddl/dev/cyclic/
Modified:
stable/10/sys/cddl/compat/opensolaris/sys/cpuvar.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
stable/10/sys/cddl/dev/fbt/fbt.c
stable/10/sys/cddl/dev/profile/profile.c
stable/10/sys/kern/kern_clocksource.c
stable/10/sys/modules/Makefile
stable/10/sys/modules/dtrace/Makefile.inc
stable/10/sys/modules/dtrace/dtraceall/dtraceall.c
stable/10/sys/sys/dtrace_bsd.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/compat/opensolaris/sys/cpuvar.h
==
--- stable/10/sys/cddl/compat/opensolaris/sys/cpuvar.h Mon May 11 04:54:56
2015(r282747)
+++ stable/10/sys/cddl/compat/opensolaris/sys/cpuvar.h Mon May 11 07:54:39
2015(r282748)
@@ -38,11 +38,8 @@ struct cyc_cpu;
typedef struct {
int cpuid;
-struct cyc_cpu *cpu_cyclic;
uint32_tcpu_flags;
uint_t cpu_intr_actv;
- uintptr_t cpu_profile_pc;
- uintptr_t cpu_profile_upc;
uintptr_t cpu_dtrace_caller; /* DTrace: caller, if any */
hrtime_tcpu_dtrace_chillmark; /* DTrace: chill mark time */
hrtime_tcpu_dtrace_chilled; /* DTrace: total chill time */
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Mon May
11 04:54:56 2015(r282747)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Mon May
11 07:54:39 2015(r282748)
@@ -17947,6 +17947,5 @@ SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_
DEV_MODULE(dtrace, dtrace_modevent, NULL);
MODULE_VERSION(dtrace, 1);
-MODULE_DEPEND(dtrace, cyclic, 1, 1, 1);
MODULE_DEPEND(dtrace, opensolaris, 1, 1, 1);
#endif
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Mon May
11 04:54:56 2015(r282747)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Mon May
11 07:54:39 2015(r282748)
@@ -57,6 +57,7 @@ extern C {
#if defined(sun)
#include sys/systm.h
#else
+#include sys/cpuvar.h
#include sys/param.h
#include sys/linker.h
#include sys/ioccom.h
@@ -64,8 +65,8 @@ extern C {
typedef int model_t;
#endif
#include sys/ctf_api.h
-#include sys/cyclic.h
#if defined(sun)
+#include sys/cyclic.h
#include sys/int_limits.h
#else
#include sys/stdint.h
Modified: stable/10/sys/cddl/dev/fbt/fbt.c
==
--- stable/10/sys/cddl/dev/fbt/fbt.cMon May 11 04:54:56 2015
(r282747)
+++ stable/10/sys/cddl/dev/fbt/fbt.cMon May 11 07:54:39 2015
(r282748)
@@ -428,13 +428,6 @@ fbt_provide_module(void *arg, modctl_t *
return;
/*
-* The cyclic timer subsystem can be built as a module and DTrace
-* depends on that, so it is ineligible too.
-*/
- if (strcmp(modname, cyclic) == 0)
- return;
-
- /*
* To register with DTrace, a module must list 'dtrace' as a
* dependency in order for the kernel linker to resolve
* symbols like dtrace_register(). All modules with such a
Modified: stable/10/sys/cddl/dev/profile/profile.c
==
--- stable/10/sys/cddl/dev/profile/profile.cMon May 11 04:54:56 2015
(r282747)
+++ stable/10/sys/cddl/dev/profile/profile.cMon May 11 07:54:39 2015
(r282748)
@@ -52,9 +52,9 @@
#include sys/smp.h
#include sys/uio.h
#include sys/unistd.h
+#include machine/cpu.h
#include machine/stdarg.h
-#include sys/cyclic.h
#include sys/dtrace.h
#include sys/dtrace_bsd.h
@@ -97,7 +97,7 @@
* allow for a manual override in case we get it completely wrong.
*/
#ifdef __amd64
-#definePROF_ARTIFICIAL_FRAMES 7
+#definePROF_ARTIFICIAL_FRAMES 10
#else
#ifdef __i386
#definePROF_ARTIFICIAL_FRAMES 6
@@ -126,18 +126,30 @@
#definePROF_ARTIFICIAL_FRAMES 3
#endif
+struct profile_probe_percpu;
+
typedef struct profile_probe {
charprof_name[PROF_NAMELEN];
dtrace_id_t prof_id;
int prof_kind;
+#ifdef illumos
hrtime_t
svn commit: r282749 - in stable/10/sys/dev: fb vt vt/hw/fb
Author: avg
Date: Mon May 11 08:00:16 2015
New Revision: 282749
URL: https://svnweb.freebsd.org/changeset/base/282749
Log:
MFC r277795,278849: vt(4): Use power_{suspend,resume} event handlers
Modified:
stable/10/sys/dev/fb/fbd.c
stable/10/sys/dev/vt/hw/fb/vt_fb.c
stable/10/sys/dev/vt/hw/fb/vt_fb.h
stable/10/sys/dev/vt/vt.h
stable/10/sys/dev/vt/vt_core.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/fb/fbd.c
==
--- stable/10/sys/dev/fb/fbd.c Mon May 11 07:54:39 2015(r282748)
+++ stable/10/sys/dev/fb/fbd.c Mon May 11 08:00:16 2015(r282749)
@@ -332,22 +332,6 @@ fbd_detach(device_t dev)
return (err);
}
-static int
-fbd_suspend(device_t dev)
-{
-
- vt_fb_suspend();
- return (bus_generic_suspend(dev));
-}
-
-static int
-fbd_resume(device_t dev)
-{
-
- vt_fb_resume();
- return (bus_generic_resume(dev));
-}
-
static device_method_t fbd_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, fbd_probe),
@@ -355,8 +339,6 @@ static device_method_t fbd_methods[] = {
DEVMETHOD(device_detach,fbd_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- DEVMETHOD(device_suspend, fbd_suspend),
- DEVMETHOD(device_resume,fbd_resume),
{ 0, 0 }
};
Modified: stable/10/sys/dev/vt/hw/fb/vt_fb.c
==
--- stable/10/sys/dev/vt/hw/fb/vt_fb.c Mon May 11 07:54:39 2015
(r282748)
+++ stable/10/sys/dev/vt/hw/fb/vt_fb.c Mon May 11 08:00:16 2015
(r282749)
@@ -53,6 +53,8 @@ static struct vt_driver vt_fb_driver = {
.vd_priority = VD_PRIORITY_GENERIC+10,
.vd_fb_ioctl = vt_fb_ioctl,
.vd_fb_mmap = vt_fb_mmap,
+ .vd_suspend = vt_fb_suspend,
+ .vd_resume = vt_fb_resume,
};
VT_DRIVER_DECLARE(vt_fb, vt_fb_driver);
@@ -441,15 +443,15 @@ vt_fb_attach(struct fb_info *info)
}
void
-vt_fb_resume(void)
+vt_fb_suspend(struct vt_device *vd)
{
- vt_resume();
+ vt_suspend(vd);
}
void
-vt_fb_suspend(void)
+vt_fb_resume(struct vt_device *vd)
{
- vt_suspend();
+ vt_resume(vd);
}
Modified: stable/10/sys/dev/vt/hw/fb/vt_fb.h
==
--- stable/10/sys/dev/vt/hw/fb/vt_fb.h Mon May 11 07:54:39 2015
(r282748)
+++ stable/10/sys/dev/vt/hw/fb/vt_fb.h Mon May 11 08:00:16 2015
(r282749)
@@ -33,8 +33,8 @@
#define_DEV_VT_HW_FB_VT_FB_H_
/* Generic framebuffer interface call vt_fb_attach to init VT(9) */
int vt_fb_attach(struct fb_info *info);
-void vt_fb_resume(void);
-void vt_fb_suspend(void);
+void vt_fb_resume(struct vt_device *vd);
+void vt_fb_suspend(struct vt_device *vd);
vd_init_t vt_fb_init;
vd_blank_t vt_fb_blank;
Modified: stable/10/sys/dev/vt/vt.h
==
--- stable/10/sys/dev/vt/vt.h Mon May 11 07:54:39 2015(r282748)
+++ stable/10/sys/dev/vt/vt.h Mon May 11 08:00:16 2015(r282749)
@@ -91,8 +91,6 @@ TUNABLE_INT(kern.vt. #_name, vt_##_na
struct vt_driver;
void vt_allocate(struct vt_driver *, void *);
-void vt_resume(void);
-void vt_suspend(void);
typedef unsigned int vt_axis_t;
@@ -162,6 +160,9 @@ struct vt_device {
#defineVD_PASTEBUFSZ(vd) ((vd)-vd_pastebuf.vpb_bufsz)
#defineVD_PASTEBUFLEN(vd) ((vd)-vd_pastebuf.vpb_len)
+void vt_resume(struct vt_device *vd);
+void vt_suspend(struct vt_device *vd);
+
/*
* Per-window terminal screen buffer.
*
@@ -314,6 +315,8 @@ typedef int vd_fb_mmap_t(struct vt_devic
typedef void vd_drawrect_t(struct vt_device *, int, int, int, int, int,
term_color_t);
typedef void vd_setpixel_t(struct vt_device *, int, int, term_color_t);
+typedef void vd_suspend_t(struct vt_device *);
+typedef void vd_resume_t(struct vt_device *);
struct vt_driver {
char vd_name[16];
@@ -337,6 +340,10 @@ struct vt_driver {
/* Update display setting on vt switch. */
vd_postswitch_t *vd_postswitch;
+ /* Suspend/resume handlers. */
+ vd_suspend_t*vd_suspend;
+ vd_resume_t *vd_resume;
+
/* Priority to know which one can override */
int vd_priority;
#defineVD_PRIORITY_DUMB10
Modified: stable/10/sys/dev/vt/vt_core.c
==
--- stable/10/sys/dev/vt/vt_core.c Mon May 11 07:54:39 2015
(r282748)
+++ stable/10/sys/dev/vt/vt_core.c Mon May 11 08:00:16 2015
(r282749)
@@ -166,6 +166,8 @@ static void vt_update_static(void *);
#ifndef SC_NO_CUTPASTE
static void vt_mouse_paste(void);
#endif
+static void vt_suspend_handler(void *priv);
+static void
svn commit: r282751 - stable/10/cddl/contrib/opensolaris/lib/libnvpair
Author: avg
Date: Mon May 11 08:30:57 2015
New Revision: 282751
URL: https://svnweb.freebsd.org/changeset/base/282751
Log:
MFC r282121: dump_nvlist: handle DATA_TYPE_BOOLEAN_ARRAY
Modified:
stable/10/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
==
--- stable/10/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.cMon May
11 08:16:33 2015(r282750)
+++ stable/10/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.cMon May
11 08:30:57 2015(r282751)
@@ -793,6 +793,7 @@ dump_nvlist(nvlist_t *list, int indent)
{
nvpair_t*elem = NULL;
boolean_t bool_value;
+ boolean_t *bool_array_value;
nvlist_t*nvlist_value;
nvlist_t**nvlist_array_value;
uint_t i, count;
@@ -853,6 +854,16 @@ dump_nvlist(nvlist_t *list, int indent)
NVP(elem, string, char *, char *, '%s');
break;
+ case DATA_TYPE_BOOLEAN_ARRAY:
+ (void) nvpair_value_boolean_array(elem,
+ bool_array_value, count);
+ for (i = 0; i count; i++) {
+ (void) printf(%*s%s[%d]: %s\n, indent, ,
+ nvpair_name(elem), i,
+ bool_array_value[i] ? true : false);
+ }
+ break;
+
case DATA_TYPE_BYTE_ARRAY:
NVPA(elem, byte_array, uchar_t, int, %u);
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r282752 - stable/9/cddl/contrib/opensolaris/lib/libnvpair
Author: avg
Date: Mon May 11 08:31:39 2015
New Revision: 282752
URL: https://svnweb.freebsd.org/changeset/base/282752
Log:
MFC r282121: dump_nvlist: handle DATA_TYPE_BOOLEAN_ARRAY
Modified:
stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
Directory Properties:
stable/9/cddl/contrib/opensolaris/lib/libnvpair/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
==
--- stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Mon May 11
08:30:57 2015(r282751)
+++ stable/9/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Mon May 11
08:31:39 2015(r282752)
@@ -793,6 +793,7 @@ dump_nvlist(nvlist_t *list, int indent)
{
nvpair_t*elem = NULL;
boolean_t bool_value;
+ boolean_t *bool_array_value;
nvlist_t*nvlist_value;
nvlist_t**nvlist_array_value;
uint_t i, count;
@@ -853,6 +854,16 @@ dump_nvlist(nvlist_t *list, int indent)
NVP(elem, string, char *, char *, '%s');
break;
+ case DATA_TYPE_BOOLEAN_ARRAY:
+ (void) nvpair_value_boolean_array(elem,
+ bool_array_value, count);
+ for (i = 0; i count; i++) {
+ (void) printf(%*s%s[%d]: %s\n, indent, ,
+ nvpair_name(elem), i,
+ bool_array_value[i] ? true : false);
+ }
+ break;
+
case DATA_TYPE_BYTE_ARRAY:
NVPA(elem, byte_array, uchar_t, int, %u);
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r282757 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 08:41:21 2015
New Revision: 282757
URL: https://svnweb.freebsd.org/changeset/base/282757
Log:
MFC r282126: FV r282123: 5610 zfs clone from different source and target pools
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
Mon May 11 08:40:55 2015(r282756)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
Mon May 11 08:41:21 2015(r282757)
@@ -23,6 +23,7 @@
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/
/* Portions Copyright 2010 Robert Milkowski */
@@ -842,11 +843,7 @@ dmu_objset_clone_check(void *arg, dmu_tx
dsl_dir_rele(pdd, FTAG);
return (SET_ERROR(EEXIST));
}
- /* You can't clone across pools. */
- if (pdd-dd_pool != dp) {
- dsl_dir_rele(pdd, FTAG);
- return (SET_ERROR(EXDEV));
- }
+
error = dsl_fs_ss_limit_check(pdd, 1, ZFS_PROP_FILESYSTEM_LIMIT, NULL,
doca-doca_cred);
if (error != 0) {
@@ -859,12 +856,6 @@ dmu_objset_clone_check(void *arg, dmu_tx
if (error != 0)
return (error);
- /* You can't clone across pools. */
- if (origin-ds_dir-dd_pool != dp) {
- dsl_dataset_rele(origin, FTAG);
- return (SET_ERROR(EXDEV));
- }
-
/* You can only clone snapshots, not the head datasets. */
if (!dsl_dataset_is_snapshot(origin)) {
dsl_dataset_rele(origin, FTAG);
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:40:55 2015(r282756)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:41:21 2015(r282757)
@@ -24,6 +24,7 @@
* All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2014 Joyent, Inc. All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/
#include sys/dmu.h
@@ -404,7 +405,7 @@ dsl_dir_hold(dsl_pool_t *dp, const char
/* Make sure the name is in the specified pool. */
spaname = spa_name(dp-dp_spa);
if (strcmp(buf, spaname) != 0)
- return (SET_ERROR(EINVAL));
+ return (SET_ERROR(EXDEV));
ASSERT(dsl_pool_config_held(dp));
___
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: r282753 - stable/10/sys/cddl/contrib/opensolaris/common/nvpair
Author: avg Date: Mon May 11 08:33:49 2015 New Revision: 282753 URL: https://svnweb.freebsd.org/changeset/base/282753 Log: MFC r282122: nvpair_type_is_array: DATA_TYPE_INT8_ARRAY was not recognized Modified: stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c == --- stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Mon May 11 08:31:39 2015(r282752) +++ stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Mon May 11 08:33:49 2015(r282753) @@ -1227,6 +1227,7 @@ nvpair_type_is_array(nvpair_t *nvp) data_type_t type = NVP_TYPE(nvp); if ((type == DATA_TYPE_BYTE_ARRAY) || + (type == DATA_TYPE_INT8_ARRAY) || (type == DATA_TYPE_UINT8_ARRAY) || (type == DATA_TYPE_INT16_ARRAY) || (type == DATA_TYPE_UINT16_ARRAY) || ___ 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: r282754 - stable/9/sys/cddl/contrib/opensolaris/common/nvpair
Author: avg Date: Mon May 11 08:34:08 2015 New Revision: 282754 URL: https://svnweb.freebsd.org/changeset/base/282754 Log: MFC r282122: nvpair_type_is_array: DATA_TYPE_INT8_ARRAY was not recognized Modified: stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c == --- stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.cMon May 11 08:33:49 2015(r282753) +++ stable/9/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.cMon May 11 08:34:08 2015(r282754) @@ -1227,6 +1227,7 @@ nvpair_type_is_array(nvpair_t *nvp) data_type_t type = NVP_TYPE(nvp); if ((type == DATA_TYPE_BYTE_ARRAY) || + (type == DATA_TYPE_INT8_ARRAY) || (type == DATA_TYPE_UINT8_ARRAY) || (type == DATA_TYPE_INT16_ARRAY) || (type == DATA_TYPE_UINT16_ARRAY) || ___ 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: r282765 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 09:43:16 2015
New Revision: 282765
URL: https://svnweb.freebsd.org/changeset/base/282765
Log:
MFC r282131: replace a comment about zfs recv -F corner case with a longer one
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon May
11 09:43:03 2015(r282764)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Mon May
11 09:43:16 2015(r282765)
@@ -1319,15 +1319,25 @@ zfs_rezget(znode_t *zp)
}
/*
-* XXXPJD: Not sure how is that possible, but under heavy
-* zfs recv -F load it happens that z_gen is the same, but
-* vnode type is different than znode type. This would mean
-* that for example regular file was replaced with directory
-* which has the same object number.
+* It is highly improbable but still quite possible that two
+* objects in different datasets are created with the same
+* object numbers and in transaction groups with the same
+* numbers. znodes corresponding to those objects would
+* have the same z_id and z_gen, but their other attributes
+* may be different.
+* zfs recv -F may replace one of such objects with the other.
+* As a result file properties recorded in the replaced
+* object's vnode may no longer match the received object's
+* properties. At present the only cached property is the
+* files type recorded in v_type.
+* So, handle this case by leaving the old vnode and znode
+* disassociated from the actual object. A new vnode and a
+* znode will be created if the object is accessed
+* (e.g. via a look-up). The old vnode and znode will be
+* recycled when the last vnode reference is dropped.
*/
vp = ZTOV(zp);
- if (vp != NULL
- vp-v_type != IFTOVT((mode_t)zp-z_mode)) {
+ if (vp != NULL vp-v_type != IFTOVT((mode_t)zp-z_mode)) {
zfs_znode_dmu_fini(zp);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
return (EIO);
___
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: r282755 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 08:36:58 2015
New Revision: 282755
URL: https://svnweb.freebsd.org/changeset/base/282755
Log:
MFC r282125: MFV r282124: 5393 spurious failures from dsl_dataset_hold_obj()
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
Mon May 11 08:34:08 2015(r282754)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
Mon May 11 08:36:58 2015(r282755)
@@ -413,7 +413,8 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uin
offsetof(dmu_sendarg_t, dsa_link));
if (doi.doi_type == DMU_OTN_ZAP_METADATA) {
- int zaperr = zap_contains(mos, dsobj,
DS_FIELD_LARGE_BLOCKS);
+ int zaperr = zap_contains(mos, dsobj,
+ DS_FIELD_LARGE_BLOCKS);
if (zaperr != ENOENT) {
VERIFY0(zaperr);
ds-ds_large_blocks = B_TRUE;
___
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: r282758 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 08:43:20 2015
New Revision: 282758
URL: https://svnweb.freebsd.org/changeset/base/282758
Log:
MFC r282127: dsl_dir_rename_check: return EXDEV on cross-pool rename attempt
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:41:21 2015(r282757)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:43:20 2015(r282758)
@@ -1707,7 +1707,7 @@ dsl_dir_rename_check(void *arg, dmu_tx_t
if (dd-dd_pool != newparent-dd_pool) {
dsl_dir_rele(newparent, FTAG);
dsl_dir_rele(dd, FTAG);
- return (SET_ERROR(ENXIO));
+ return (SET_ERROR(EXDEV));
}
/* new name should not already exist */
___
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: r282759 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 08:43:37 2015
New Revision: 282759
URL: https://svnweb.freebsd.org/changeset/base/282759
Log:
MFC r282127: dsl_dir_rename_check: return EXDEV on cross-pool rename attempt
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:43:20 2015(r282758)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:43:37 2015(r282759)
@@ -1698,7 +1698,7 @@ dsl_dir_rename_check(void *arg, dmu_tx_t
if (dd-dd_pool != newparent-dd_pool) {
dsl_dir_rele(newparent, FTAG);
dsl_dir_rele(dd, FTAG);
- return (SET_ERROR(ENXIO));
+ return (SET_ERROR(EXDEV));
}
/* new name should not already exist */
___
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: r282761 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg Date: Mon May 11 08:46:23 2015 New Revision: 282761 URL: https://svnweb.freebsd.org/changeset/base/282761 Log: MFC r282130: zfs_onexit_fd_hold: return EBADF even if devfs_get_cdevpriv gave ENOENT Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c == --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:46:03 2015(r282760) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:46:23 2015(r282761) @@ -136,7 +136,7 @@ zfs_onexit_fd_hold(int fd, minor_t *mino *minorp = (minor_t)(uintptr_t)data; curthread-td_fpop = tmpfp; if (error != 0) - return (error); + return (SET_ERROR(EBADF)); return (zfs_onexit_minor_to_state(*minorp, zo)); } ___ 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: r282763 - head/sys/arm/arm
Author: andrew
Date: Mon May 11 08:57:23 2015
New Revision: 282763
URL: https://svnweb.freebsd.org/changeset/base/282763
Log:
Move to use __ARM_ARCH in more places in the kernel.
Modified:
head/sys/arm/arm/fusu.S
head/sys/arm/arm/stdatomic.c
Modified: head/sys/arm/arm/fusu.S
==
--- head/sys/arm/arm/fusu.S Mon May 11 08:51:24 2015(r282762)
+++ head/sys/arm/arm/fusu.S Mon May 11 08:57:23 2015(r282763)
@@ -33,6 +33,7 @@
*
*/
+#include machine/acle-compat.h
#include machine/asm.h
#include machine/armreg.h
#include assym.s
@@ -40,7 +41,7 @@ __FBSDID($FreeBSD$);
.syntax unified
-#ifdef _ARM_ARCH_6
+#if __ARM_ARCH = 6
#define GET_PCB(tmp) \
mrc p15, 0, tmp, c13, c0, 4; \
add tmp, tmp, #(TD_PCB)
@@ -68,7 +69,7 @@ EENTRY_NP(casuword32)
stmfd sp!, {r4, r5}
adr r4, .Lcasuwordfault
str r4, [r3, #PCB_ONFAULT]
-#ifdef _ARM_ARCH_6
+#if __ARM_ARCH = 6
1:
cmp r0, #KERNBASE
mvnhs r0, #0
Modified: head/sys/arm/arm/stdatomic.c
==
--- head/sys/arm/arm/stdatomic.cMon May 11 08:51:24 2015
(r282762)
+++ head/sys/arm/arm/stdatomic.cMon May 11 08:57:23 2015
(r282763)
@@ -31,6 +31,7 @@ __FBSDID($FreeBSD$);
#include sys/stdatomic.h
#include sys/types.h
+#include machine/acle-compat.h
#include machine/cpufunc.h
#include machine/sysarch.h
@@ -66,16 +67,14 @@ do_sync(void)
__asm volatile ( : : : memory);
}
-#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#elif __ARM_ARCH = 7
static inline void
do_sync(void)
{
__asm volatile (dmb : : : memory);
}
-#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
-defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
-defined(__ARM_ARCH_6ZK__)
+#elif __ARM_ARCH = 6
static inline void
do_sync(void)
{
@@ -90,14 +89,8 @@ do_sync(void)
* New C11 __atomic_* API.
*/
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
-defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
-defined(__ARM_ARCH_6ZK__) || \
-defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
-
-/* These systems should be supported by the compiler. */
-
-#else /* __ARM_ARCH_5__ */
+/* ARMv6+ systems should be supported by the compiler. */
+#if __ARM_ARCH = 5
/* Clang doesn't allow us to reimplement builtins without this. */
#ifdef __clang__
@@ -331,7 +324,7 @@ EMIT_ALL_OPS_N(4, uint32_t, ldr, str
#endif /* _KERNEL */
-#endif
+#endif /* __ARM_ARCH */
#endif /* __CLANG_ATOMICS || __GNUC_ATOMICS */
@@ -365,10 +358,7 @@ EMIT_ALL_OPS_N(4, uint32_t, ldr, str
* Old __sync_* API.
*/
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
-defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
-defined(__ARM_ARCH_6ZK__) || \
-defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#if __ARM_ARCH = 6
/* Implementations for old GCC versions, lacking support for atomics. */
@@ -686,7 +676,7 @@ __strong_reference(__sync_fetch_and_xor_
__strong_reference(__sync_fetch_and_xor_4_c, __sync_fetch_and_xor_4);
#endif
-#else /* __ARM_ARCH_5__ */
+#else /* __ARM_ARCH 6 */
#ifdef _KERNEL
@@ -881,7 +871,7 @@ __strong_reference(__sync_fetch_and_or_4
__strong_reference(__sync_fetch_and_xor_1_c, __sync_fetch_and_xor_1);
__strong_reference(__sync_fetch_and_xor_2_c, __sync_fetch_and_xor_2);
__strong_reference(__sync_fetch_and_xor_4_c, __sync_fetch_and_xor_4);
-#endif
+#endif /* __ARM_ARCH */
#endif /* _KERNEL */
___
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: r282764 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 09:43:03 2015
New Revision: 282764
URL: https://svnweb.freebsd.org/changeset/base/282764
Log:
MFC r282131: replace a comment about zfs recv -F corner case with a longer one
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon May 11 08:57:23 2015(r282763)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon May 11 09:43:03 2015(r282764)
@@ -1320,15 +1320,25 @@ zfs_rezget(znode_t *zp)
}
/*
-* XXXPJD: Not sure how is that possible, but under heavy
-* zfs recv -F load it happens that z_gen is the same, but
-* vnode type is different than znode type. This would mean
-* that for example regular file was replaced with directory
-* which has the same object number.
+* It is highly improbable but still quite possible that two
+* objects in different datasets are created with the same
+* object numbers and in transaction groups with the same
+* numbers. znodes corresponding to those objects would
+* have the same z_id and z_gen, but their other attributes
+* may be different.
+* zfs recv -F may replace one of such objects with the other.
+* As a result file properties recorded in the replaced
+* object's vnode may no longer match the received object's
+* properties. At present the only cached property is the
+* files type recorded in v_type.
+* So, handle this case by leaving the old vnode and znode
+* disassociated from the actual object. A new vnode and a
+* znode will be created if the object is accessed
+* (e.g. via a look-up). The old vnode and znode will be
+* recycled when the last vnode reference is dropped.
*/
vp = ZTOV(zp);
- if (vp != NULL
- vp-v_type != IFTOVT((mode_t)zp-z_mode)) {
+ if (vp != NULL vp-v_type != IFTOVT((mode_t)zp-z_mode)) {
zfs_znode_dmu_fini(zp);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
return (EIO);
___
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: r282760 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg Date: Mon May 11 08:46:03 2015 New Revision: 282760 URL: https://svnweb.freebsd.org/changeset/base/282760 Log: MFC r282130: zfs_onexit_fd_hold: return EBADF even if devfs_get_cdevpriv gave ENOENT Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c == --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:43:37 2015(r282759) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c Mon May 11 08:46:03 2015(r282760) @@ -137,7 +137,7 @@ zfs_onexit_fd_hold(int fd, minor_t *mino *minorp = (minor_t)(uintptr_t)data; curthread-td_fpop = tmpfp; if (error != 0) - return (error); + return (SET_ERROR(EBADF)); return (zfs_onexit_minor_to_state(*minorp, zo)); } ___ 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: r282736 - in head: . lib/libmd
* Sean Bruno, 2015-05-11 :
I already pinged Thomas about this privately, but in the event anyone
is looking, MIPS is still broken after this commit.
Probably all the GCC based targets are, if I read this correctly.
make -s -j8 buildworld TARGET=mips TARGET_ARCH=mips
...
Sean,
Can you try the attached patch? with it I was able to complete a MIPS
build with the command above.
Thomas.
Index: lib/libmd/Makefile
===
--- lib/libmd/Makefile (révision 282735)
+++ lib/libmd/Makefile (copie de travail)
@@ -42,7 +42,7 @@
sha0.ref sha0hl.c sha1.ref sha1hl.c shadriver \
sha256.ref sha256hl.c sha512.ref sha512hl.c
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR} -DWEAK_REFS
.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
.if exists(${MACHINE_ARCH}/sha.S)
Index: lib/libmd/md4c.c
===
--- lib/libmd/md4c.c(révision 282735)
+++ lib/libmd/md4c.c(copie de travail)
@@ -291,6 +291,11 @@
(((UINT4)input[j+2]) 16) | (((UINT4)input[j+3]) 24);
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MD4Init
__weak_reference(_libmd_MD4Init, MD4Init);
#undef MD4Update
@@ -299,3 +304,4 @@
__weak_reference(_libmd_MD4Pad, MD4Pad);
#undef MD4Final
__weak_reference(_libmd_MD4Final, MD4Final);
+#endif
Index: lib/libmd/md5c.c
===
--- lib/libmd/md5c.c(révision 282735)
+++ lib/libmd/md5c.c(copie de travail)
@@ -336,6 +336,11 @@
memset ((void *)x, 0, sizeof (x));
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MD5Init
__weak_reference(_libmd_MD5Init, MD5Init);
#undef MD5Update
@@ -346,3 +351,4 @@
__weak_reference(_libmd_MD5Final, MD5Final);
#undef MD5Transform
__weak_reference(_libmd_MD5Transform, MD5Transform);
+#endif
Index: lib/libmd/mdXhl.c
===
--- lib/libmd/mdXhl.c (révision 282735)
+++ lib/libmd/mdXhl.c (copie de travail)
@@ -97,6 +97,11 @@
return (MDXEnd(ctx, buf));
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MDXEnd
__weak_reference(_libmd_MDXEnd, MDXEnd);
#undef MDXFile
@@ -105,3 +110,4 @@
__weak_reference(_libmd_MDXFileChunk, MDXFileChunk);
#undef MDXData
__weak_reference(_libmd_MDXData, MDXData);
+#endif
Index: lib/libmd/rmd160c.c
===
--- lib/libmd/rmd160c.c (révision 282735)
+++ lib/libmd/rmd160c.c (copie de travail)
@@ -546,6 +546,11 @@
}
#endif
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef RIPEMD160_Init
__weak_reference(_libmd_RIPEMD160_Init, RIPEMD160_Init);
#undef RIPEMD160_Update
@@ -558,3 +563,4 @@
__weak_reference(_libmd_RMD160_version, RMD160_version);
#undef ripemd160_block
__weak_reference(_libmd_ripemd160_block, ripemd160_block);
+#endif
Index: lib/libmd/sha1c.c
===
--- lib/libmd/sha1c.c (révision 282735)
+++ lib/libmd/sha1c.c (copie de travail)
@@ -488,7 +488,11 @@
/* memset((char *)c,0,sizeof(c));*/
}
-
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef SHA_Init
__weak_reference(_libmd_SHA_Init, SHA_Init);
#undef SHA_Update
@@ -513,3 +517,4 @@
__weak_reference(_libmd_SHA1_version, SHA1_version);
#undef sha1_block
__weak_reference(_libmd_sha1_block, sha1_block);
+#endif
Index: lib/libmd/sha256c.c
===
--- lib/libmd/sha256c.c (révision 282735)
+++ lib/libmd/sha256c.c (copie de travail)
@@ -296,6 +296,11 @@
memset((void *)ctx, 0, sizeof(*ctx));
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef SHA256_Init
__weak_reference(_libmd_SHA256_Init, SHA256_Init);
#undef SHA256_Update
@@ -304,5 +309,4 @@
__weak_reference(_libmd_SHA256_Final, SHA256_Final);
#undef SHA256_Transform
__weak_reference(_libmd_SHA256_Transform, SHA256_Transform);
-#undef SHA256_version
-__weak_reference(_libmd_SHA256_version, SHA256_version);
+#endif
Index: lib/libmd/sha512c.c
svn commit: r282766 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 10:07:31 2015
New Revision: 282766
URL: https://svnweb.freebsd.org/changeset/base/282766
Log:
zfs ioctls: use fget_write / fget_read instead of getf wrapper for fget
This allows to ensure that we do not write to a file that was opened
for reading only or vice versa.
Also, use the correct capability in in zfs_ioc_send_new().
Differential Revision:https://reviews.freebsd.org/D2382
Reviewed by: delphij
MFC after:17 days
Sponsored by: ClusterHQ
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon May
11 09:43:16 2015(r282765)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon May
11 10:07:31 2015(r282766)
@@ -4196,7 +4196,11 @@ zfs_ioc_recv(zfs_cmd_t *zc)
return (error);
fd = zc-zc_cookie;
- fp = getf(fd, cap_rights_init(rights, CAP_PREAD));
+#ifdef illumos
+ fp = getf(fd);
+#else
+ fget_read(curthread, fd, cap_rights_init(rights, CAP_PREAD), fp);
+#endif
if (fp == NULL) {
nvlist_free(props);
return (SET_ERROR(EBADF));
@@ -4442,8 +4446,12 @@ zfs_ioc_send(zfs_cmd_t *zc)
file_t *fp;
cap_rights_t rights;
- fp = getf(zc-zc_cookie,
- cap_rights_init(rights, CAP_WRITE));
+#ifdef illumos
+ fp = getf(zc-zc_cookie);
+#else
+ fget_write(curthread, zc-zc_cookie,
+ cap_rights_init(rights, CAP_WRITE), fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5039,7 +5047,12 @@ zfs_ioc_diff(zfs_cmd_t *zc)
offset_t off;
int error;
- fp = getf(zc-zc_cookie, cap_rights_init(rights, CAP_WRITE));
+#ifdef illumos
+ fp = getf(zc-zc_cookie);
+#else
+ fget_write(curthread, zc-zc_cookie,
+ cap_rights_init(rights, CAP_WRITE), fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
@@ -5404,6 +5417,7 @@ static int
zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
{
cap_rights_t rights;
+ file_t *fp;
int error;
offset_t off;
char *fromname = NULL;
@@ -5420,7 +5434,11 @@ zfs_ioc_send_new(const char *snapname, n
largeblockok = nvlist_exists(innvl, largeblockok);
embedok = nvlist_exists(innvl, embedok);
- file_t *fp = getf(fd, cap_rights_init(rights, CAP_READ));
+#ifdef illumos
+ file_t *fp = getf(fd);
+#else
+ fget_write(curthread, fd, cap_rights_init(rights, CAP_WRITE), fp);
+#endif
if (fp == NULL)
return (SET_ERROR(EBADF));
___
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: r282750 - in stable/10/sys: dev/acpica dev/syscons dev/vt sys
Author: avg
Date: Mon May 11 08:16:33 2015
New Revision: 282750
URL: https://svnweb.freebsd.org/changeset/base/282750
Log:
MFC r277796: hook userland threads suspend + resume into acpi suspend code
Modified:
stable/10/sys/dev/acpica/acpi.c
stable/10/sys/dev/syscons/syscons.c
stable/10/sys/dev/vt/vt_core.c
stable/10/sys/sys/eventhandler.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/acpica/acpi.c
==
--- stable/10/sys/dev/acpica/acpi.c Mon May 11 08:00:16 2015
(r282749)
+++ stable/10/sys/dev/acpica/acpi.c Mon May 11 08:16:33 2015
(r282750)
@@ -2749,6 +2749,8 @@ acpi_EnterSleepState(struct acpi_softc *
return_ACPI_STATUS (AE_OK);
}
+EVENTHANDLER_INVOKE(power_suspend_early);
+stop_all_proc();
EVENTHANDLER_INVOKE(power_suspend);
if (smp_started) {
@@ -2892,6 +2894,8 @@ backout:
thread_unlock(curthread);
}
+resume_all_proc();
+
EVENTHANDLER_INVOKE(power_resume);
/* Allow another sleep request after a while. */
Modified: stable/10/sys/dev/syscons/syscons.c
==
--- stable/10/sys/dev/syscons/syscons.c Mon May 11 08:00:16 2015
(r282749)
+++ stable/10/sys/dev/syscons/syscons.c Mon May 11 08:16:33 2015
(r282750)
@@ -550,7 +550,7 @@ sc_attach_unit(int unit, int flags)
/* Register suspend/resume/shutdown callbacks for the kernel console. */
if (sc_console_unit == unit) {
- EVENTHANDLER_REGISTER(power_suspend, scsuspend, NULL,
+ EVENTHANDLER_REGISTER(power_suspend_early, scsuspend, NULL,
EVENTHANDLER_PRI_ANY);
EVENTHANDLER_REGISTER(power_resume, scresume, NULL,
EVENTHANDLER_PRI_ANY);
Modified: stable/10/sys/dev/vt/vt_core.c
==
--- stable/10/sys/dev/vt/vt_core.c Mon May 11 08:00:16 2015
(r282749)
+++ stable/10/sys/dev/vt/vt_core.c Mon May 11 08:16:33 2015
(r282750)
@@ -2560,8 +2560,8 @@ vt_upgrade(struct vt_device *vd)
if (register_handlers) {
/* Register suspend/resume handlers. */
- EVENTHANDLER_REGISTER(power_suspend, vt_suspend_handler, vd,
- EVENTHANDLER_PRI_ANY);
+ EVENTHANDLER_REGISTER(power_suspend_early, vt_suspend_handler,
+ vd, EVENTHANDLER_PRI_ANY);
EVENTHANDLER_REGISTER(power_resume, vt_resume_handler, vd,
EVENTHANDLER_PRI_ANY);
}
Modified: stable/10/sys/sys/eventhandler.h
==
--- stable/10/sys/sys/eventhandler.hMon May 11 08:00:16 2015
(r282749)
+++ stable/10/sys/sys/eventhandler.hMon May 11 08:16:33 2015
(r282750)
@@ -182,6 +182,7 @@ EVENTHANDLER_DECLARE(shutdown_final, shu
typedef void (*power_change_fn)(void *);
EVENTHANDLER_DECLARE(power_resume, power_change_fn);
EVENTHANDLER_DECLARE(power_suspend, power_change_fn);
+EVENTHANDLER_DECLARE(power_suspend_early, power_change_fn);
/* Low memory event */
typedef void (*vm_lowmem_handler_t)(void *, int);
___
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: r282756 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Mon May 11 08:40:55 2015
New Revision: 282756
URL: https://svnweb.freebsd.org/changeset/base/282756
Log:
MFC r282126: FV r282123: 5610 zfs clone from different source and target pools
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
Mon May 11 08:36:58 2015(r282755)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
Mon May 11 08:40:55 2015(r282756)
@@ -23,6 +23,7 @@
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/
/* Portions Copyright 2010 Robert Milkowski */
@@ -879,11 +880,7 @@ dmu_objset_clone_check(void *arg, dmu_tx
dsl_dir_rele(pdd, FTAG);
return (SET_ERROR(EEXIST));
}
- /* You can't clone across pools. */
- if (pdd-dd_pool != dp) {
- dsl_dir_rele(pdd, FTAG);
- return (SET_ERROR(EXDEV));
- }
+
error = dsl_fs_ss_limit_check(pdd, 1, ZFS_PROP_FILESYSTEM_LIMIT, NULL,
doca-doca_cred);
if (error != 0) {
@@ -896,12 +893,6 @@ dmu_objset_clone_check(void *arg, dmu_tx
if (error != 0)
return (error);
- /* You can't clone across pools. */
- if (origin-ds_dir-dd_pool != dp) {
- dsl_dataset_rele(origin, FTAG);
- return (SET_ERROR(EXDEV));
- }
-
/* You can only clone snapshots, not the head datasets. */
if (!dsl_dataset_is_snapshot(origin)) {
dsl_dataset_rele(origin, FTAG);
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:36:58 2015(r282755)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Mon May
11 08:40:55 2015(r282756)
@@ -24,6 +24,7 @@
* All rights reserved.
* Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2014 Joyent, Inc. All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/
#include sys/dmu.h
@@ -408,7 +409,7 @@ dsl_dir_hold(dsl_pool_t *dp, const char
/* Make sure the name is in the specified pool. */
spaname = spa_name(dp-dp_spa);
if (strcmp(buf, spaname) != 0)
- return (SET_ERROR(EINVAL));
+ return (SET_ERROR(EXDEV));
ASSERT(dsl_pool_config_held(dp));
___
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: r282762 - head/sys/arm/arm
Author: andrew Date: Mon May 11 08:51:24 2015 New Revision: 282762 URL: https://svnweb.freebsd.org/changeset/base/282762 Log: Use the ACLE spelling of _ARM_ARCH_6: __ARM_ARCH = 6 Modified: head/sys/arm/arm/swtch.S Modified: head/sys/arm/arm/swtch.S == --- head/sys/arm/arm/swtch.SMon May 11 08:46:23 2015(r282761) +++ head/sys/arm/arm/swtch.SMon May 11 08:51:24 2015(r282762) @@ -81,6 +81,7 @@ #include assym.s #include opt_sched.h +#include machine/acle-compat.h #include machine/asm.h #include machine/asmacros.h #include machine/armreg.h @@ -88,7 +89,7 @@ __FBSDID($FreeBSD$); -#if defined(_ARM_ARCH_6) defined(SMP) +#if __ARM_ARCH = 6 defined(SMP) #define GET_PCPU(tmp, tmp2) \ mrc p15, 0, tmp, c0, c0, 5; \ and tmp, tmp, #0xf; \ ___ 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: r282767 - head/sys/arm/include
Author: andrew Date: Mon May 11 12:44:02 2015 New Revision: 282767 URL: https://svnweb.freebsd.org/changeset/base/282767 Log: cpu-v6.h should only be used in the kernel, add an error to enforce this. Modified: head/sys/arm/include/cpu-v6.h Modified: head/sys/arm/include/cpu-v6.h == --- head/sys/arm/include/cpu-v6.h Mon May 11 10:07:31 2015 (r282766) +++ head/sys/arm/include/cpu-v6.h Mon May 11 12:44:02 2015 (r282767) @@ -29,6 +29,11 @@ #ifndef MACHINE_CPU_V6_H #define MACHINE_CPU_V6_H +/* There are no user serviceable parts here, they may change without notice */ +#ifndef _KERNEL +#error Only include this file in the kernel +#else + #include machine/atomic.h #include machine/cpufunc.h #include machine/cpuinfo.h @@ -499,4 +504,6 @@ cp15_ttbr_set(uint32_t reg) tlb_flush_all_ng_local(); } +#endif /* _KERNEL */ + #endif /* !MACHINE_CPU_V6_H */ ___ 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: r282768 - in vendor/ficl: . dist dist/contrib dist/contrib/xclasses dist/doc dist/doc/articles dist/doc/graphics dist/doc/source dist/ficlplatform dist/softcore dist/test
Author: pfg Date: Mon May 11 14:02:38 2015 New Revision: 282768 URL: https://svnweb.freebsd.org/changeset/base/282768 Log: Bring ficl4 to the vendor area. We currently use ficl3 but there is interest (and a GSoC) to bring the newer version for use in the bootloader. WWW: http://ficl.sourceforge.net/ Discussed with: dteske Added: vendor/ficl/ vendor/ficl/dist/ vendor/ficl/dist/Makefile (contents, props changed) vendor/ficl/dist/Makefile.ansi (contents, props changed) vendor/ficl/dist/Makefile.linux (contents, props changed) vendor/ficl/dist/ReadMe.txt (contents, props changed) vendor/ficl/dist/bit.c (contents, props changed) vendor/ficl/dist/callback.c (contents, props changed) vendor/ficl/dist/compatibility.c (contents, props changed) vendor/ficl/dist/contrib/ vendor/ficl/dist/contrib/xclasses/ vendor/ficl/dist/contrib/xclasses/readme.txt (contents, props changed) vendor/ficl/dist/contrib/xclasses/xclasses.py (contents, props changed) vendor/ficl/dist/dictionary.c (contents, props changed) vendor/ficl/dist/doc/ vendor/ficl/dist/doc/api.html (contents, props changed) vendor/ficl/dist/doc/articles/ vendor/ficl/dist/doc/articles/ficlddj.pdf (contents, props changed) vendor/ficl/dist/doc/articles/jwsforml.pdf (contents, props changed) vendor/ficl/dist/doc/articles/oo_in_c.html (contents, props changed) vendor/ficl/dist/doc/articles/sigplan9906.doc (contents, props changed) vendor/ficl/dist/doc/debugger.html (contents, props changed) vendor/ficl/dist/doc/dpans.html (contents, props changed) vendor/ficl/dist/doc/favicon.ico (contents, props changed) vendor/ficl/dist/doc/ficl.html (contents, props changed) vendor/ficl/dist/doc/graphics/ vendor/ficl/dist/doc/graphics/4ring.gif (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.128.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.64.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.96.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl_oop.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl_top.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/sourceforge.jpg (contents, props changed) vendor/ficl/dist/doc/index.html (contents, props changed) vendor/ficl/dist/doc/license.html (contents, props changed) vendor/ficl/dist/doc/links.html (contents, props changed) vendor/ficl/dist/doc/locals.html (contents, props changed) vendor/ficl/dist/doc/oop.html (contents, props changed) vendor/ficl/dist/doc/parsesteps.html (contents, props changed) vendor/ficl/dist/doc/releases.html (contents, props changed) vendor/ficl/dist/doc/source/ vendor/ficl/dist/doc/source/api.ht vendor/ficl/dist/doc/source/debugger.ht vendor/ficl/dist/doc/source/dpans.ht vendor/ficl/dist/doc/source/ficl.ht vendor/ficl/dist/doc/source/generate.py (contents, props changed) vendor/ficl/dist/doc/source/index.ht vendor/ficl/dist/doc/source/license.ht vendor/ficl/dist/doc/source/links.ht vendor/ficl/dist/doc/source/locals.ht vendor/ficl/dist/doc/source/oop.ht vendor/ficl/dist/doc/source/parsesteps.ht vendor/ficl/dist/doc/source/releases.ht vendor/ficl/dist/doc/source/upgrading.ht vendor/ficl/dist/doc/upgrading.html (contents, props changed) vendor/ficl/dist/double.c (contents, props changed) vendor/ficl/dist/extras.c (contents, props changed) vendor/ficl/dist/ficl.dsw vendor/ficl/dist/ficl.h (contents, props changed) vendor/ficl/dist/ficlcompatibility.h (contents, props changed) vendor/ficl/dist/ficldll.def vendor/ficl/dist/ficldll.dsp vendor/ficl/dist/ficlexe.dsp vendor/ficl/dist/ficllib.dsp vendor/ficl/dist/ficllocal.h (contents, props changed) vendor/ficl/dist/ficlplatform/ vendor/ficl/dist/ficlplatform/alpha.h (contents, props changed) vendor/ficl/dist/ficlplatform/ansi.c (contents, props changed) vendor/ficl/dist/ficlplatform/ansi.h (contents, props changed) vendor/ficl/dist/ficlplatform/ficlexports.txt (contents, props changed) vendor/ficl/dist/ficlplatform/makedef.py (contents, props changed) vendor/ficl/dist/ficlplatform/unix.c (contents, props changed) vendor/ficl/dist/ficlplatform/unix.h (contents, props changed) vendor/ficl/dist/ficlplatform/win32.c (contents, props changed) vendor/ficl/dist/ficlplatform/win32.h (contents, props changed) vendor/ficl/dist/ficltokens.h (contents, props changed) vendor/ficl/dist/fileaccess.c (contents, props changed) vendor/ficl/dist/float.c (contents, props changed) vendor/ficl/dist/hash.c (contents, props changed) vendor/ficl/dist/lzcompress.c (contents, props changed) vendor/ficl/dist/lzuncompress.c (contents, props changed) vendor/ficl/dist/main.c (contents, props changed) vendor/ficl/dist/prefix.c (contents, props changed) vendor/ficl/dist/primitives.c (contents, props changed)
Re: svn commit: r282744 - in head/sys/cddl/dev/dtrace: amd64 i386
On 10 May 2015 at 22:47, Mark Johnston ma...@freebsd.org wrote: I've caught several cases (specifically in merging DTrace code) where the upstream code block is so large the merger didn't even notice the #ifndef __FreeBSD__ was present and thought that the merge was fine because the upstream diff applied cleanly. Indeed - leaving large blocks of #if'd out upstream code can easily lead to a false sense that everything was successful in a merge. It's actually better that the merge creates a conflict: the merger then needs to understand the change and determine if it actually applies to FreeBSD or not, rather than just accepting the patch. Both approaches have arguments for and against, but ultimately I think the decision rests with the one doing the work. ___ 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: r282769 - vendor/ficl/4.1.0
Author: pfg Date: Mon May 11 14:07:48 2015 New Revision: 282769 URL: https://svnweb.freebsd.org/changeset/base/282769 Log: Tag ficl 4.1.0 Added: vendor/ficl/4.1.0/ - copied from r282768, vendor/ficl/dist/ ___ 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: r282772 - head/release/tools
Author: gjb
Date: Mon May 11 14:53:07 2015
New Revision: 282772
URL: https://svnweb.freebsd.org/changeset/base/282772
Log:
Fix virtual machine disk format creating by passing VMFORMAT
to mkimg(1)
PR: 200068
Submitted by: Jeremy Norris
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/vmimage.subr
Modified: head/release/tools/vmimage.subr
==
--- head/release/tools/vmimage.subr Mon May 11 14:36:34 2015
(r282771)
+++ head/release/tools/vmimage.subr Mon May 11 14:53:07 2015
(r282772)
@@ -23,20 +23,21 @@ write_partition_layout() {
case ${TARGET}:${TARGET_ARCH} in
amd64:amd64 | i386:i386)
- mkimg -s gpt -b ${BOOTFILES}/i386/pmbr/pmbr \
+ mkimg -s gpt -f ${VMFORMAT} \
+ -b ${BOOTFILES}/i386/pmbr/pmbr \
-p
freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \
${SWAPOPT} \
-p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
;;
arm64:aarch64)
- mkimg -s mbr \
+ mkimg -s mbr -f ${VMFORMAT} \
-p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
-p freebsd:=${VMBASE} \
-o ${VMIMAGE}
;;
powerpc:powerpc*)
- mkimg -s apm \
+ mkimg -s apm -f ${VMFORMAT} \
-p
apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs \
${SWAPOPT} \
-p freebsd-ufs/rootfs:=${VMBASE} \
___
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: r282770 - head/sys/dev/ofw
On Mon, 11 May 2015 14:10:55 + (UTC) Andrew Turner and...@freebsd.org wrote: Author: andrew Date: Mon May 11 14:10:54 2015 New Revision: 282770 URL: https://svnweb.freebsd.org/changeset/base/282770 Log: Add ofw_bus_find_compatible to find a compatible ofw node. This will be used on ARM to help find the correct node to use to start secondary CPUs as this happens before device enumeration. Differential Revision: https://reviews.freebsd.org/D2416 ___ 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: r282771 - head/sys/dev/acpica
Author: andrew
Date: Mon May 11 14:36:34 2015
New Revision: 282771
URL: https://svnweb.freebsd.org/changeset/base/282771
Log:
Hide code only used on i386 and amd64.
Modified:
head/sys/dev/acpica/acpi_cpu.c
Modified: head/sys/dev/acpica/acpi_cpu.c
==
--- head/sys/dev/acpica/acpi_cpu.c Mon May 11 14:10:54 2015
(r282770)
+++ head/sys/dev/acpica/acpi_cpu.c Mon May 11 14:36:34 2015
(r282771)
@@ -746,6 +746,7 @@ acpi_cpu_generic_cx_probe(struct acpi_cp
}
}
+#if defined(__i386__) || defined(__amd64__)
static void
acpi_cpu_cx_cst_mwait(struct acpi_cx *cx_ptr, uint64_t address, int accsize)
{
@@ -755,6 +756,7 @@ acpi_cpu_cx_cst_mwait(struct acpi_cx *cx
cx_ptr-mwait_hw_coord = (accsize CST_FFH_MWAIT_HW_COORD) != 0;
cx_ptr-mwait_bm_avoidance = (accsize CST_FFH_MWAIT_BM_AVOID) != 0;
}
+#endif
static void
acpi_cpu_cx_cst_free_plvlx(device_t cpu_dev, struct acpi_cx *cx_ptr)
@@ -781,8 +783,11 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s
ACPI_OBJECT*top;
ACPI_OBJECT*pkg;
uint32_tcount;
+int i;
+#if defined(__i386__) || defined(__amd64__)
uint64_taddress;
-int i, vendor, class, accsize;
+int vendor, class, accsize;
+#endif
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
___
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: r282770 - head/sys/dev/ofw
Author: andrew
Date: Mon May 11 14:10:54 2015
New Revision: 282770
URL: https://svnweb.freebsd.org/changeset/base/282770
Log:
Add ofw_bus_find_compatible to find a compatible ofw node. This will be
used on ARM to help find the correct node to use to start secondary CPUs
as this happens before device enumeration.
Modified:
head/sys/dev/ofw/ofw_bus_subr.c
Modified: head/sys/dev/ofw/ofw_bus_subr.c
==
--- head/sys/dev/ofw/ofw_bus_subr.c Mon May 11 14:07:48 2015
(r282769)
+++ head/sys/dev/ofw/ofw_bus_subr.c Mon May 11 14:10:54 2015
(r282770)
@@ -176,12 +176,37 @@ ofw_bus_status_okay(device_t dev)
return (0);
}
+static int
+ofw_bus_node_is_compatible(const char *compat, int len, const char *onecompat)
+{
+ int onelen, l, ret;
+
+ onelen = strlen(onecompat);
+
+ ret = 0;
+ while (len 0) {
+ if (strlen(compat) == onelen
+ strncasecmp(compat, onecompat, onelen) == 0) {
+ /* Found it. */
+ ret = 1;
+ break;
+ }
+
+ /* Slide to the next sub-string. */
+ l = strlen(compat) + 1;
+ compat += l;
+ len -= l;
+ }
+
+ return (ret);
+}
+
int
ofw_bus_is_compatible(device_t dev, const char *onecompat)
{
phandle_t node;
const char *compat;
- int len, onelen, l;
+ int len;
if ((compat = ofw_bus_get_compat(dev)) == NULL)
return (0);
@@ -193,20 +218,7 @@ ofw_bus_is_compatible(device_t dev, cons
if ((len = OF_getproplen(node, compatible)) = 0)
return (0);
- onelen = strlen(onecompat);
-
- while (len 0) {
- if (strlen(compat) == onelen
- strncasecmp(compat, onecompat, onelen) == 0)
- /* Found it. */
- return (1);
-
- /* Slide to the next sub-string. */
- l = strlen(compat) + 1;
- compat += l;
- len -= l;
- }
- return (0);
+ return (ofw_bus_node_is_compatible(compat, len, onecompat));
}
int
@@ -487,3 +499,30 @@ ofw_bus_intr_to_rl(device_t dev, phandle
return (err);
}
+phandle_t
+ofw_bus_find_compatible(phandle_t node, const char *onecompat)
+{
+ phandle_t child, ret;
+ void *compat;
+ int len;
+
+ /*
+* Traverse all children of 'start' node, and find first with
+* matching 'compatible' property.
+*/
+ for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+ len = OF_getprop_alloc(node, compatible, 1, compat);
+ if (len = 0) {
+ ret = ofw_bus_node_is_compatible(compat, len,
+ onecompat);
+ free(compat, M_OFWPROP);
+ if (ret != 0)
+ return (child);
+ }
+
+ ret = ofw_bus_find_compatible(child, onecompat);
+ if (ret != 0)
+ return (ret);
+ }
+ 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
Re: svn commit: r282736 - in head: . lib/libmd
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 05/11/15 02:40, Thomas Quinot wrote: Probably all the GCC based targets are, if I read this correctly. make -s -j8 buildworld TARGET=mips TARGET_ARCH=mips ... Sean, Can you try the attached patch? with it I was able to complete a MIPS build with the command above. Thomas. Yep, it looks like it DTRT here. Thanks! sean -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQF8BAEBCgBmBQJVUMz8XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kh60H/RyRdfvYNo0y+zlsOrI6Y3Pg 4ecvUAXtVxCCO6TrcovLumM8Svpcr09OIPii/HgDAKg6VBesfLP6O8DG61A/C0nh 7b1QFYh+sJug6l0X/RVoA7Z7uy3pFass2cTXkhO7tz1DlLhy8YNqYMSr+pAzgcda QkgLDs4MvB/iUUgx3yBkNJmxWbXpKrPC2Lki5O5xp3kTVB99V8NNO66QBtgNL+Q7 uh7Wk0CewZ3MGP4YbHzzA4GBYubjHkL98j7QWm/iv1tjxO0Glm0GwSGSAFy4MdG7 N3m4DuA0E8C+z4oQtoRxgPyvqJToXoBxQT+XmQ0+bFuWo13C1Q1umH7Ek2Uqaw8= =KyJd -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r282773 - head/sys/dev/ofw
Author: andrew Date: Mon May 11 15:47:55 2015 New Revision: 282773 URL: https://svnweb.freebsd.org/changeset/base/282773 Log: Add the ofw_bus_subr.h change missed in r282770. Modified: head/sys/dev/ofw/ofw_bus_subr.h Modified: head/sys/dev/ofw/ofw_bus_subr.h == --- head/sys/dev/ofw/ofw_bus_subr.h Mon May 11 14:53:07 2015 (r282772) +++ head/sys/dev/ofw/ofw_bus_subr.h Mon May 11 15:47:55 2015 (r282773) @@ -101,4 +101,7 @@ const struct ofw_compat_data * /* Helper routine for checking existence of a prop */ int ofw_bus_has_prop(device_t, const char *); +/* Helper to search for a child with a given compat prop */ +phandle_t ofw_bus_find_compatible(phandle_t, const char *); + #endif /* !_DEV_OFW_OFW_BUS_SUBR_H_ */ ___ 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: r282776 - head/sys/arm/include
Author: andrew Date: Mon May 11 18:52:06 2015 New Revision: 282776 URL: https://svnweb.freebsd.org/changeset/base/282776 Log: List both registers to use in the 64-bit atomic instructions. We will need these to build for Thumb-2. Modified: head/sys/arm/include/atomic.h Modified: head/sys/arm/include/atomic.h == --- head/sys/arm/include/atomic.h Mon May 11 17:49:07 2015 (r282775) +++ head/sys/arm/include/atomic.h Mon May 11 18:52:06 2015 (r282776) @@ -151,10 +151,10 @@ atomic_set_64(volatile uint64_t *p, uint __asm __volatile( 1: \n - ldrexd %[tmp], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n orr %Q[tmp], %Q[val]\n orr %R[tmp], %R[val]\n - strexd %[exf], %[tmp], [%[ptr]]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -204,10 +204,10 @@ atomic_clear_64(volatile uint64_t *p, ui __asm __volatile( 1: \n - ldrexd %[tmp], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n bic %Q[tmp], %Q[val]\n bic %R[tmp], %R[val]\n - strexd %[exf], %[tmp], [%[ptr]]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -263,13 +263,13 @@ atomic_cmpset_64(volatile uint64_t *p, u __asm __volatile( 1: \n - ldrexd %[tmp], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n teq %Q[tmp], %Q[cmpval]\n itee eq \n teqeq%R[tmp], %R[cmpval]\n movne%[ret], #0\n bne 2f\n - strexd %[ret], %[newval], [%[ptr]]\n + strexd %[ret], %Q[newval], %R[newval], [%[ptr]]\n teq %[ret], #0\n it ne\n bne 1b\n @@ -381,10 +381,10 @@ atomic_add_64(volatile uint64_t *p, uint __asm __volatile( 1: \n - ldrexd %[tmp], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n adds %Q[tmp], %Q[val]\n - adc %R[tmp], %R[val]\n - strexd %[exf], %[tmp], [%[ptr]]\n + adc %R[tmp], %R[tmp], %R[val]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -433,10 +433,10 @@ atomic_subtract_64(volatile uint64_t *p, __asm __volatile( 1: \n - ldrexd %[tmp], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n subs %Q[tmp], %Q[val]\n - sbc %R[tmp], %R[val]\n - strexd %[exf], %[tmp], [%[ptr]]\n + sbc %R[tmp], %R[tmp], %R[val]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -536,10 +536,10 @@ atomic_fetchadd_64(volatile uint64_t *p, __asm __volatile( 1: \n - ldrexd %[ret], [%[ptr]]\n + ldrexd %Q[tmp], %R[tmp], [%[ptr]]\n adds %Q[tmp], %Q[ret], %Q[val]\n adc %R[tmp], %R[ret], %R[val]\n - strexd %[exf], %[tmp], [%[ptr]]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -560,10 +560,10 @@ atomic_readandclear_64(volatile uint64_t __asm __volatile( 1: \n - ldrexd %[ret], [%[ptr]]\n + ldrexd %Q[ret], %R[ret], [%[ptr]]\n mov %Q[tmp], #0\n mov %R[tmp], #0\n - strexd %[exf], %[tmp], [%[ptr]]\n + strexd %[exf], %Q[tmp], %R[tmp], [%[ptr]]\n teq %[exf], #0\n it ne\n bne 1b\n @@ -587,7 +587,7 @@ atomic_load_64(volatile uint64_t *p) */ __asm __volatile( 1: \n - ldrexd %[ret], [%[ptr]]\n + ldrexd %Q[ret], %R[ret], [%[ptr]]\n clrex\n : [ret]=r (ret) : [ptr]r(p) @@ -618,8 +618,8 @@
Re: svn commit: r282672 - head/etc/rc.d
On May 11, 2015, at 12:18 PM, Brooks Davis bro...@freebsd.org wrote:
On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote:
On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org wrote:
Author: delphij
Date: Fri May 8 23:36:31 2015
New Revision: 282672
URL: https://svnweb.freebsd.org/changeset/base/282672
Log:
Always convert uuid to lower case.
MFC after:2 weeks
Modified:
head/etc/rc.d/hostid
Modified: head/etc/rc.d/hostid
==
--- head/etc/rc.d/hostidFri May 8 23:29:42 2015(r282671)
+++ head/etc/rc.d/hostidFri May 8 23:36:31 2015(r282672)
@@ -58,7 +58,7 @@ hostid_set()
valid_hostid()
{
-uuid=$1
+uuid=$(echo $1 | tr '[:upper:]' '[:lower:]')
tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps you
could use dd with conv=lcase instead?
Alterntively, a shell function ltr exists in rc.subr for this purpose.
ltr would not work in this situation, for multiple reasons.
1. ltr doesn’t support character classes
2. ltr is for replacing one or more characters (cannot be a class) with a
single string (of variable length, 0+).
In /etc/networks.subr you can see an example usage of ltr:
287 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l287
_punct=.-/+
288 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l288
ltr ${_if} ${_punct} '_' _if
The result of this is to take a value of (for example) foo.bar and replace
any occurrences of period, minus, forward slash, or plus with instead
a single underscore. The result is stuffed into the variable “_if” (over-
writing previous contents which may have contained aforementioned
characters replaced with underscore).
An attempt to use ltr in the below fashion:
ltr $string ‘[:lower:]’ ‘[:upper:]’ somevar
would surely fail.
While it is indeed *possible* to write a find/replace function in native-
shell that supports character classes, it would not be a small function.
The primary issue is that you need to know what the character that
matched the class and there aren’t any built-ins that provide this info.
For example:
case “$src” in *[[:lower:]]*)
will trigger when you have a lower-case character that needs conversion
to upper-case (or opposite if using *[[:upper:]]*) BUT you won’t know
what the character was that you matched (so how can you know which
upper-case character to supplant)?
The function will have to resort to complicated substring mechanics or
any other seldom known procedure.
I’ll have a noodle on it and see what I can come up with. It’s not exactly
immediately coming to me how to do this in any simple fashion while
maintaining efficiency (read: by not iterating over every single character
and also by not having a giant massive case statement with every letter
spelled out — coming up with a solution that embraces the use of the
character class I would believe to be more efficient).
—
Devin
___
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: r282672 - head/etc/rc.d
On 05/11/15 12:18, Brooks Davis wrote: On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote: On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org wrote: -uuid=$1 +uuid=$(echo $1 | tr '[:upper:]' '[:lower:]') tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps you could use dd with conv=lcase instead? Alterntively, a shell function ltr exists in rc.subr for this purpose. This only works with a single pattern at a time, though. Perhaps we need a new ldowncase shell function which iterates through the alphabet and invokes ltr for each letter? -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid ___ 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: r282778 - head/sys/arm/include
Author: andrew Date: Mon May 11 19:04:32 2015 New Revision: 282778 URL: https://svnweb.freebsd.org/changeset/base/282778 Log: Mark thumb entry points as such when building for thumb, otherwise mark them as arm. Modified: head/sys/arm/include/asm.h Modified: head/sys/arm/include/asm.h == --- head/sys/arm/include/asm.h Mon May 11 19:00:02 2015(r282777) +++ head/sys/arm/include/asm.h Mon May 11 19:04:32 2015(r282778) @@ -87,7 +87,13 @@ */ #defineGLOBAL(x) .global x -#define_LEENTRY(x) .type x,_ASM_TYPE_FUNCTION; x: +#ifdef __thumb__ +#define_FUNC_MODE .code 16; .thumb_func +#else +#define_FUNC_MODE .code 32 +#endif + +#define_LEENTRY(x) .type x,_ASM_TYPE_FUNCTION; _FUNC_MODE; x: #define_LEEND(x) /* nothing */ #define_EENTRY(x) GLOBAL(x); _LEENTRY(x) #define_EEND(x)_LEEND(x) ___ 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: r282672 - head/etc/rc.d
On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote:
On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org wrote:
Author: delphij
Date: Fri May 8 23:36:31 2015
New Revision: 282672
URL: https://svnweb.freebsd.org/changeset/base/282672
Log:
Always convert uuid to lower case.
MFC after:2 weeks
Modified:
head/etc/rc.d/hostid
Modified: head/etc/rc.d/hostid
==
--- head/etc/rc.d/hostidFri May 8 23:29:42 2015(r282671)
+++ head/etc/rc.d/hostidFri May 8 23:36:31 2015(r282672)
@@ -58,7 +58,7 @@ hostid_set()
valid_hostid()
{
-uuid=$1
+uuid=$(echo $1 | tr '[:upper:]' '[:lower:]')
tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps you
could use dd with conv=lcase instead?
Alterntively, a shell function ltr exists in rc.subr for this purpose.
-- Brooks
___
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: r282672 - head/etc/rc.d
On Sun, May 10, 2015 at 11:32:27PM +0200, Oliver Pinter wrote:
tr is in /usr/bin so this breaks systems with a separate /usr.
Perhaps you could use dd with conv=lcase instead?
Then these are affected too::
root@robot rc.d# grep -r -E '(awk| tr )' *
ftp-proxy: ps_pid=`ps ax -o pid= -o command= |
grep $cmd_string | grep -e $flag_string | grep -v grep | awk '{
print $1 }'`
growfs: rootdev=$(df / | tail -n 1 | awk '{ sub(/dev/, , $1); print $1 }')
growfs: rawdev=$(glabel status | awk '$1 == '$rootdev' {
print $3 }')
growfs: sysctl -b kern.geom.conftxt | awk '
jail: _j=$(echo $_j | tr /. _)
jail: _j=$(echo $1 | tr /. _)
jail: _j=$(echo $_j | tr /. _)
jail: _j=$(echo $_j | tr /. _)
jail: _j=$(echo $_j | tr /. _)
motd: awk '{if (NR == 1) {if ($1 == FreeBSD) {next} else {print
\n$0}} else {print}}' /etc/motd ${T}
ntpdate:ntpdate_hosts=`awk '
power_profile: awk '{ split($0, a, [/ ]); print a[1] }' -) 2 /dev/null`
power_profile: awk '{ split($0, a, [/ ]); print a[length(a) - 1] }'
-) 2 /dev/null`
sshd: local ALG=$(echo $alg | tr a-z A-Z)
syscons:for i in `kldstat | awk '$5 ~ _saver\.ko$ {
print $5 }'`; do
syslogd:for _s in `cat $sockfile | tr '\n' ' '` ; do
virecover: recfile=`awk
'/^X-vi-recover-path:/{print $2}' ${i}`
The awk is located in /usr/bin/awk too, and for e.g. the growfs should
running in the very first steps...
Except for growfs and power_profile, these already REQUIRE
mountcritremote or FILESYSTEMS (directly or indirectly), or critically
depend on software in /usr like /usr/sbin/ftp-proxy or /usr/sbin/jail.
The problem with growfs was explained elsewhere in the thread.
Although power_profile appears to have an appropriate REQUIRE line, it
is in fact started via devd, which happens fairly early.
--
Jilles Tjoelker
___
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: r282785 - head/release
Author: gjb
Date: Mon May 11 22:14:03 2015
New Revision: 282785
URL: https://svnweb.freebsd.org/changeset/base/282785
Log:
Add a new file, Makefile.mirrors, which is intended to replace
a 474-line kludge of a shell script to pre-create the directory
hierarchy on ftp-master.
This is not in any way connected to the build, and there is no
intention to do so. This only intent here is to try to make
things a little bit easier for me. But I've probably just made
things worse.
Sponsored by: The FreeBSD Foundation
Added:
head/release/Makefile.mirrors (contents, props changed)
Added: head/release/Makefile.mirrors
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/release/Makefile.mirrors Mon May 11 22:14:03 2015
(r282785)
@@ -0,0 +1,128 @@
+#
+# This Makefile helps create the directory structure on ftp-master,
+# making staging builds a bit more sane.
+#
+# You probably do not want to use this. Really.
+# You have been warned.
+#
+# $FreeBSD$
+#
+
+.include ${.CURDIR}/Makefile
+
+FTPDIR?= /ftp
+STAGE_TARGETS?=iso-images-stage
+
+# snapshot
+.if ${BRANCH} == STABLE || ${BRANCH} == CURRENT
+SNAPSHOT= 1
+TLD?= ${FTPDIR}/snapshots
+BUILDDATE!=date -j -f '%s' $$(stat -f %c
${.OBJDIR}/dist/base/bin/sh) +%Y%m%d
+. if ${TARGET} == arm ${TARGET_ARCH} == armv6
+. if !defined(BOARDNAME) || empty(BOARDNAME)
+BOARDNAME= ${KERNCONF}
+. endif
+_SNAP_SUFFIX:= -${BOARDNAME}-${BUILDDATE}
+. else # not arm/armv6
+_SNAP_SUFFIX:= -${BUILDDATE}
+. endif
+. for _D in /usr/bin /usr/local/bin
+. for _S in svnversion svnliteversion
+. if exists(${_D}/${_S})
+SVNVERSION?= ${_D}/${_S}
+. endif
+. endfor
+. endfor
+. if exists(${SVNVERSION}) !empty(SVNVERSION)
+SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile
+_SNAP_SUFFIX:= ${_SNAP_SUFFIX}-r${SVNREVISION}
+. endif
+.else
+# release
+SNAPSHOT=
+TLD?= ${FTPDIR}/releases
+.endif
+
+.if defined(WITH_VMIMAGES) !empty(WITH_VMIMAGES)
+STAGE_TARGETS+=vm-images-stage
+VM_DIR=
${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH}
+.endif
+
+CLEANFILES+= ${STAGE_TARGETS}
+CHECKSUM_FILES?= SHA256 MD5
+SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' '
+ISO_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}
+FTP_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/${REVISION}-${BRANCH}
+
+iso-images-stage:
+ mkdir -p ${ISO_DIR}
+ mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
+.for IMAGE in ${IMAGES}
+ cp -p ${.OBJDIR}/${IMAGE} ${ISO_DIR}/${OSRELEASE}-${IMAGE}
+. if exists(/R/${IMAGE}.xz)
+ cp -p ${.OBJDIR}/${IMAGE}.xz ${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
+. endif
+.endfor
+.if defined(SNAPSHOT) !empty(SNAPSHOT)
+. for IMAGE in ${IMAGES}
+ cd ${ISO_DIR} mv ${OSRELEASE}-${IMAGE} \
+ ${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
+ cd ${TLD}/ISO-IMAGES/${REVISION} \
+ ln -s \
+
../../${TARGET}/${TARGET_ARCH}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
+. endfor
+. for CHECKSUM in ${CHECKSUM_FILES}
+. if exists(${ISO_DIR}/CHECKSUM.${CHECKSUM})
+ rm -f ${ISO_DIR}/CHECKSUM.${CHECKSUM}
+. endif
+ cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
+ CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
+. endfor
+.else # !snapshot
+ cd ${TLD}/ISO-IMAGES/${REVISION} ln -s \
+ ../../${TARGET}/${TARGET_ARCH}/${OSRELEASE}-${IMAGE} .
+ cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
+ CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
+.endif
+.if exists(${.OBJDIR}/ftp)
+ mkdir -p ${FTP_DIR}
+ cp ${.OBJDIR}/ftp/*.txz ${.OBJDIR}/ftp/MANIFEST ${FTP_DIR}
+ cd ${TLD}/${TARGET} \
+ ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
+ ${REVISION}-${BRANCH}
+.endif
+
+vm-images-stage:
+ @true
+# mkdir -p ${VM_DIR}
+#.if defined(SNAPSHOT) !empty(SNAPSHOT)
+# mkdir -p ${VM_DIR}/${BUILDDATE}
+#. if exists(${VM_DIR}/Latest)
+# unlink ${VM_DIR}/Latest
+# cd ${VM_DIR} ln -s ${BUILDDATE} Latest
+#. endif
+#. for VMIMAGE in ${VMIMAGES}
+# cd /R/vmimages cp -p ${VMIMAGE}.xz \
+# ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}-${VMIMAGE}.xz
+# cd ${VM_DIR}/Latest ln -s \
+# ../${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}-${VMIMAGE}.xz \
+# ${OSRELEASE}-${VMIMAGE}.xz
+#. endfor
+#. for CHECKSUM in ${CHECKSUM_FILES}
+#. if exists(${VM_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM})
+# rm -f ${VM_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}
+#. endif
+# cd ${VM_DIR}/${BUILDDATE} ${CHECKSUM:tl} ${OSRELEASE}* \
+# CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
svn commit: r282777 - head/sys/arm/include
Author: andrew Date: Mon May 11 19:00:02 2015 New Revision: 282777 URL: https://svnweb.freebsd.org/changeset/base/282777 Log: Use the Thumb compliant version of the add instruction. We can only use add Rd, Rn, Rm from within an IT (if-then) block. Modified: head/sys/arm/include/asm.h Modified: head/sys/arm/include/asm.h == --- head/sys/arm/include/asm.h Mon May 11 18:52:06 2015(r282776) +++ head/sys/arm/include/asm.h Mon May 11 19:00:02 2015(r282777) @@ -126,7 +126,7 @@ ldr x, [x, got] #defineGOT_INIT(got,gotsym,pclabel) \ ldr got, gotsym;\ - pclabel: addgot, got, pc + pclabel: addgot, pc #ifdef __thumb__ #defineGOT_INITSYM(gotsym,pclabel) \ .align 2; \ ___ 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: r282779 - head/sys/arm/arm
Author: andrew
Date: Mon May 11 19:20:30 2015
New Revision: 282779
URL: https://svnweb.freebsd.org/changeset/base/282779
Log:
Add the kernel support for Thumb-2. It is only supported on ARMv7 as the
main ARMv6 target, the Raspberry Pi, doesn't support Thumb-2.
This as been tested with a Thumb-2 userland, however building one is
currently unsupported as there are known toolchain issues breaking some
binaries. Further work will also be needed to decide on the method of
selecting which instruction set to build for, and to benchmark both to
find how building everything as Thumb-2 will affect performance.
Relnotes: yes
Modified:
head/sys/arm/arm/exception.S
head/sys/arm/arm/machdep.c
head/sys/arm/arm/syscall.c
head/sys/arm/arm/undefined.c
head/sys/arm/arm/vm_machdep.c
Modified: head/sys/arm/arm/exception.S
==
--- head/sys/arm/arm/exception.SMon May 11 19:04:32 2015
(r282778)
+++ head/sys/arm/arm/exception.SMon May 11 19:20:30 2015
(r282779)
@@ -364,7 +364,6 @@ END(data_abort_entry)
* on exit (without transitioning back through the undefined mode stack).
*/
ASENTRY_NP(undefined_entry)
- sub lr, lr, #4 /* Adjust the lr. Transition to scv32 */
PUSHFRAMEINSVC /* mode stack, build trapframe there. */
adr lr, exception_exit /* Return from handler via standard */
mov r0, sp /* exception exit routine. Pass the */
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Mon May 11 19:04:32 2015(r282778)
+++ head/sys/arm/arm/machdep.c Mon May 11 19:20:30 2015(r282779)
@@ -87,6 +87,7 @@ __FBSDID($FreeBSD$);
#include vm/vm_page.h
#include vm/vm_pager.h
+#include machine/acle-compat.h
#include machine/armreg.h
#include machine/atags.h
#include machine/cpu.h
@@ -337,6 +338,13 @@ sendsig(catcher, ksi, mask)
tf-tf_pc = (register_t)catcher;
tf-tf_usr_sp = (register_t)fp;
tf-tf_usr_lr = (register_t)(PS_STRINGS - *(p-p_sysent-sv_szsigcode));
+ /* Set the mode to enter in the signal handler */
+#if __ARM_ARCH = 7
+ if ((register_t)catcher 1)
+ tf-tf_spsr |= PSR_T;
+ else
+ tf-tf_spsr = ~PSR_T;
+#endif
CTR3(KTR_SIG, sendsig: return td=%p pc=%#x sp=%#x, td, tf-tf_usr_lr,
tf-tf_usr_sp);
@@ -626,6 +634,10 @@ ptrace_single_step(struct thread *td)
struct proc *p;
int error;
+ /* TODO: This needs to be updated for Thumb-2 */
+ if ((td-td_frame-tf_spsr PSR_T) != 0)
+ return (EINVAL);
+
KASSERT(td-td_md.md_ptrace_instr == 0,
(Didn't clear single step));
p = td-td_proc;
@@ -649,6 +661,10 @@ ptrace_clear_single_step(struct thread *
{
struct proc *p;
+ /* TODO: This needs to be updated for Thumb-2 */
+ if ((td-td_frame-tf_spsr PSR_T) != 0)
+ return (EINVAL);
+
if (td-td_md.md_ptrace_instr) {
p = td-td_proc;
PROC_UNLOCK(p);
Modified: head/sys/arm/arm/syscall.c
==
--- head/sys/arm/arm/syscall.c Mon May 11 19:04:32 2015(r282778)
+++ head/sys/arm/arm/syscall.c Mon May 11 19:20:30 2015(r282779)
@@ -171,16 +171,7 @@ swi_handler(struct trapframe *frame)
td-td_frame = frame;
td-td_pticks = 0;
- /*
-* Make sure the program counter is correctly aligned so we
-* don't take an alignment fault trying to read the opcode.
-* XXX: Fix for Thumb mode
-*/
- if (__predict_false(((frame-tf_pc - INSN_SIZE) 3) != 0)) {
- call_trapsignal(td, SIGILL, 0);
- userret(td, frame);
- return;
- }
+
/*
* Enable interrupts if they were enabled before the exception.
* Since all syscalls *should* come from user mode it will always
Modified: head/sys/arm/arm/undefined.c
==
--- head/sys/arm/arm/undefined.cMon May 11 19:04:32 2015
(r282778)
+++ head/sys/arm/arm/undefined.cMon May 11 19:20:30 2015
(r282779)
@@ -86,6 +86,19 @@ __FBSDID($FreeBSD$);
#include machine/db_machdep.h
#endif
+#defineARM_COPROC_INSN(insn) (((insn) (1 27)) != 0)
+#defineARM_VFP_INSN(insn) insn) 0xfe00) == 0xf200)
|| \
+(((insn) 0xff10) == 0xf400))
+#defineARM_COPROC(insn)(((insn) 8) 0xf)
+
+#defineTHUMB_32BIT_INSN(insn) ((insn) = 0xe800)
+#defineTHUMB_COPROC_INSN(insn) (((insn) (3 26)) == (3 26))
+#defineTHUMB_COPROC_UNDEFINED(insn) (((insn) 0x3e 20) == 0)
+#define
svn commit: r282783 - in head/sys: conf dev/pci powerpc/mpc85xx
Author: jhibbits
Date: Mon May 11 20:58:05 2015
New Revision: 282783
URL: https://svnweb.freebsd.org/changeset/base/282783
Log:
Add a PCI bridge for the Freescale PCIe Root Complex
Summary:
The Freescale PCIe Root Complex shows up as a Processor class device, PowerPC
subclass, so the generic PCI code ignores it for a bridge. This adds support
for it.
As part of this, update the Freescale PCI hostbridge driver, to allow probing
beyond the root complex, instead of only allowing proper PCI-PCI bridges.
Reviewers: #powerpc, marcel, nwhitehorn
Reviewed By: nwhitehorn
Subscribers: imp
Differential Revision: https://reviews.freebsd.org/D2442
Relnotes: yes
Added:
head/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c (contents, props changed)
Modified:
head/sys/conf/files.powerpc
head/sys/dev/pci/pci_pci.c
head/sys/dev/pci/pcib_private.h
head/sys/powerpc/mpc85xx/pci_mpc85xx.c
Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Mon May 11 20:33:46 2015(r282782)
+++ head/sys/conf/files.powerpc Mon May 11 20:58:05 2015(r282783)
@@ -138,6 +138,7 @@ powerpc/mpc85xx/mpc85xx.c optionalmpc85
powerpc/mpc85xx/mpc85xx_gpio.c optionalmpc85xx gpio
powerpc/mpc85xx/platform_mpc85xx.c optionalmpc85xx
powerpc/mpc85xx/pci_mpc85xx.c optionalpci mpc85xx
+powerpc/mpc85xx/pci_mpc85xx_pcib.c optionalpci mpc85xx
powerpc/ofw/ofw_machdep.c standard
powerpc/ofw/ofw_pci.c optionalpci
powerpc/ofw/ofw_pcibus.c optionalpci
Modified: head/sys/dev/pci/pci_pci.c
==
--- head/sys/dev/pci/pci_pci.c Mon May 11 20:33:46 2015(r282782)
+++ head/sys/dev/pci/pci_pci.c Mon May 11 20:58:05 2015(r282783)
@@ -442,16 +442,7 @@ pcib_probe_windows(struct pcib_softc *sc
dev = sc-dev;
if (pci_clear_pcib) {
- pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1);
- pci_write_config(dev, PCIR_IOBASEH_1, 0x, 2);
- pci_write_config(dev, PCIR_IOLIMITL_1, 0, 1);
- pci_write_config(dev, PCIR_IOLIMITH_1, 0, 2);
- pci_write_config(dev, PCIR_MEMBASE_1, 0x, 2);
- pci_write_config(dev, PCIR_MEMLIMIT_1, 0, 2);
- pci_write_config(dev, PCIR_PMBASEL_1, 0x, 2);
- pci_write_config(dev, PCIR_PMBASEH_1, 0x, 4);
- pci_write_config(dev, PCIR_PMLIMITL_1, 0, 2);
- pci_write_config(dev, PCIR_PMLIMITH_1, 0, 4);
+ pcib_bridge_init(dev);
}
/* Determine if the I/O port window is implemented. */
@@ -1115,6 +1106,21 @@ pcib_resume(device_t dev)
return (bus_generic_resume(dev));
}
+void
+pcib_bridge_init(device_t dev)
+{
+ pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1);
+ pci_write_config(dev, PCIR_IOBASEH_1, 0x, 2);
+ pci_write_config(dev, PCIR_IOLIMITL_1, 0, 1);
+ pci_write_config(dev, PCIR_IOLIMITH_1, 0, 2);
+ pci_write_config(dev, PCIR_MEMBASE_1, 0x, 2);
+ pci_write_config(dev, PCIR_MEMLIMIT_1, 0, 2);
+ pci_write_config(dev, PCIR_PMBASEL_1, 0x, 2);
+ pci_write_config(dev, PCIR_PMBASEH_1, 0x, 4);
+ pci_write_config(dev, PCIR_PMLIMITL_1, 0, 2);
+ pci_write_config(dev, PCIR_PMLIMITH_1, 0, 4);
+}
+
int
pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
Modified: head/sys/dev/pci/pcib_private.h
==
--- head/sys/dev/pci/pcib_private.h Mon May 11 20:33:46 2015
(r282782)
+++ head/sys/dev/pci/pcib_private.h Mon May 11 20:58:05 2015
(r282783)
@@ -145,6 +145,7 @@ voidpcib_setup_secbus(device_t dev, st
#endif
intpcib_attach(device_t dev);
void pcib_attach_common(device_t dev);
+void pcib_bridge_init(device_t dev);
#ifdef NEW_PCIB
const char *pcib_child_name(device_t child);
#endif
Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c
==
--- head/sys/powerpc/mpc85xx/pci_mpc85xx.c Mon May 11 20:33:46 2015
(r282782)
+++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c Mon May 11 20:58:05 2015
(r282783)
@@ -570,10 +570,19 @@ fsl_pcib_init(struct fsl_pcib_softc *sc,
subclass = fsl_pcib_read_config(sc-sc_dev, bus, slot,
func, PCIR_SUBCLASS, 1);
+ /*
+* The PCI Root Complex comes up as a Processor/PowerPC,
+* but is a bridge.
+*/
/* Allow only proper PCI-PCI briges */
- if (class != PCIC_BRIDGE)
+
svn commit: r282780 - in head/sys/arm: arm include
Author: alc
Date: Mon May 11 19:55:01 2015
New Revision: 282780
URL: https://svnweb.freebsd.org/changeset/base/282780
Log:
Retire pmap_lazyfix(). This function only existed in the new armv6 pmap
because the i386 pmap on which the new armv6 pmap is based had it, and in
r281707 pmap_lazyfix() was removed from the i386 pmap.
Discussed with: kib
Submitted by: Michal Meloun (via Svatopluk Kraus)
Modified:
head/sys/arm/arm/mp_machdep.c
head/sys/arm/arm/pmap-v6-new.c
head/sys/arm/arm/swtch.S
head/sys/arm/include/pmap-v6.h
head/sys/arm/include/smp.h
Modified: head/sys/arm/arm/mp_machdep.c
==
--- head/sys/arm/arm/mp_machdep.c Mon May 11 19:20:30 2015
(r282779)
+++ head/sys/arm/arm/mp_machdep.c Mon May 11 19:55:01 2015
(r282780)
@@ -309,12 +309,6 @@ ipi_handler(void *arg)
CTR1(KTR_SMP, %s: IPI_TLB, __func__);
cpufuncs.cf_tlb_flushID();
break;
-#ifdef ARM_NEW_PMAP
- case IPI_LAZYPMAP:
- CTR1(KTR_SMP, %s: IPI_LAZYPMAP, __func__);
- pmap_lazyfix_action();
- break;
-#endif
default:
panic(Unknown IPI 0x%0x on cpu %d, ipi, curcpu);
}
Modified: head/sys/arm/arm/pmap-v6-new.c
==
--- head/sys/arm/arm/pmap-v6-new.c Mon May 11 19:20:30 2015
(r282779)
+++ head/sys/arm/arm/pmap-v6-new.c Mon May 11 19:55:01 2015
(r282780)
@@ -2166,104 +2166,6 @@ pmap_pinit(pmap_t pmap)
return (1);
}
-#ifdef SMP
-/*
- * Deal with a SMP shootdown of other users of the pmap that we are
- * trying to dispose of. This can be a bit hairy.
- */
-static cpuset_t *lazymask;
-static ttb_entry_t lazyttb;
-static volatile u_int lazywait;
-
-void
-pmap_lazyfix_action(void)
-{
-
-#ifdef COUNT_IPIS
- (*ipi_lazypmap_counts[PCPU_GET(cpuid)])++;
-#endif
- spinlock_enter();
- if (cp15_ttbr_get() == lazyttb) {
- cp15_ttbr_set(curthread-td_pcb-pcb_pagedir);
- }
- CPU_CLR_ATOMIC(PCPU_GET(cpuid), lazymask);
- atomic_store_rel_int(lazywait, 1);
- spinlock_exit();
-
-}
-
-static void
-pmap_lazyfix_self(u_int cpuid)
-{
-
- spinlock_enter();
- if (cp15_ttbr_get() == lazyttb) {
- cp15_ttbr_set(curthread-td_pcb-pcb_pagedir);
- }
- CPU_CLR_ATOMIC(cpuid, lazymask);
- spinlock_exit();
-}
-
-static void
-pmap_lazyfix(pmap_t pmap)
-{
- cpuset_t mymask, mask;
- u_int cpuid, spins;
- int lsb;
-
- mask = pmap-pm_active;
- while (!CPU_EMPTY(mask)) {
- spins = 5000;
-
- /* Find least significant set bit. */
- lsb = CPU_FFS(mask);
- MPASS(lsb != 0);
- lsb--;
- CPU_SETOF(lsb, mask);
- mtx_lock_spin(smp_ipi_mtx);
-
- lazyttb = pmap_ttb_get(pmap);
- cpuid = PCPU_GET(cpuid);
-
- /* Use a cpuset just for having an easy check. */
- CPU_SETOF(cpuid, mymask);
- if (!CPU_CMP(mask, mymask)) {
- lazymask = pmap-pm_active;
- pmap_lazyfix_self(cpuid);
- } else {
- atomic_store_rel_int((u_int *)lazymask,
- (u_int)pmap-pm_active);
- atomic_store_rel_int(lazywait, 0);
- ipi_selected(mask, IPI_LAZYPMAP);
- while (lazywait == 0) {
- if (--spins == 0)
- break;
- }
- }
- mtx_unlock_spin(smp_ipi_mtx);
- if (spins == 0)
- printf(%s: spun for 5000\n, __func__);
- mask = pmap-pm_active;
- }
-}
-#else /* SMP */
-/*
- * Cleaning up on uniprocessor is easy. For various reasons, we're
- * unlikely to have to even execute this code, including the fact
- * that the cleanup is deferred until the parent does a wait(2), which
- * means that another userland process has run.
- */
-static void
-pmap_lazyfix(pmap_t pmap)
-{
-
- if (!CPU_EMPTY(pmap-pm_active)) {
- cp15_ttbr_set(curthread-td_pcb-pcb_pagedir);
- CPU_ZERO(pmap-pm_active);
- }
-}
-#endif /* SMP */
-
#ifdef INVARIANTS
static boolean_t
pt2tab_user_is_empty(pt2_entry_t *tab)
@@ -2292,8 +2194,9 @@ pmap_release(pmap_t pmap)
pmap-pm_stats.resident_count));
KASSERT(pt2tab_user_is_empty(pmap-pm_pt2tab),
(%s: has allocated user PT2(s), __func__));
+ KASSERT(CPU_EMPTY(pmap-pm_active),
+ (%s: pmap %p is active on some CPU(s), __func__, pmap));
- pmap_lazyfix(pmap);
svn commit: r282782 - head/lib/libc/arm/sys
Author: andrew Date: Mon May 11 20:33:46 2015 New Revision: 282782 URL: https://svnweb.freebsd.org/changeset/base/282782 Log: Use the GOT_* macros to help simplify the code, these work with both pic and non-pic code, and to build for Thumb. Modified: head/lib/libc/arm/sys/brk.S head/lib/libc/arm/sys/sbrk.S Modified: head/lib/libc/arm/sys/brk.S == --- head/lib/libc/arm/sys/brk.S Mon May 11 20:26:35 2015(r282781) +++ head/lib/libc/arm/sys/brk.S Mon May 11 20:33:46 2015(r282782) @@ -53,16 +53,10 @@ _C_LABEL(minbrk): * Change the data segment size */ ENTRY(_brk) -#ifdef PIC /* Setup the GOT */ - ldr r3, .Lgot - add r3, pc, r3 -.L1: - ldr r1, .Lminbrk - ldr r1, [r3, r1] -#else - ldr r1, .Lminbrk -#endif + GOT_INIT(r3, .Lgot, .L1) + GOT_GET(r1, r3, .Lminbrk) + /* Get the minimum allowable brk address */ ldr r1, [r1] @@ -71,6 +65,7 @@ ENTRY(_brk) * if the address is below minbrk. */ cmp r0, r1 + it lt movlt r0, r1 mov r2, r0 SYSTRAP(break) @@ -90,10 +85,7 @@ ENTRY(_brk) RET .align 2 -#ifdef PIC -.Lgot: - .word _GLOBAL_OFFSET_TABLE_ - (.L1+4) -#endif + GOT_INITSYM(.Lgot, .L1) .Lminbrk: .word PIC_SYM(_C_LABEL(minbrk), GOT) .Lcurbrk: Modified: head/lib/libc/arm/sys/sbrk.S == --- head/lib/libc/arm/sys/sbrk.SMon May 11 20:26:35 2015 (r282781) +++ head/lib/libc/arm/sys/sbrk.SMon May 11 20:33:46 2015 (r282782) @@ -52,16 +52,10 @@ CURBRK: * Change the data segment size */ ENTRY(_sbrk) -#ifdef PIC /* Setup the GOT */ - ldr r3, .Lgot - add r3, pc, r3 -.L1: - ldr r2, .Lcurbrk - ldr r2, [r3, r2] -#else - ldr r2, .Lcurbrk -#endif + GOT_INIT(r3, .Lgot, .L1) + GOT_GET(r2, r3, .Lcurbrk) + /* Get the current brk address */ ldr r1, [r2] @@ -80,10 +74,7 @@ ENTRY(_sbrk) RET .align 0 -#ifdef PIC -.Lgot: - .word _GLOBAL_OFFSET_TABLE_ - (.L1+4) -#endif + GOT_INITSYM(.Lgot, .L1) .Lcurbrk: .word PIC_SYM(CURBRK, GOT) END(_sbrk) ___ 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: r282672 - head/etc/rc.d
On 05/11/2015 15:37, Devin Teske wrote:
On May 11, 2015, at 12:18 PM, Brooks Davis bro...@freebsd.org
mailto:bro...@freebsd.org wrote:
On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote:
On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org
mailto:delp...@freebsd.org wrote:
Author: delphij
Date: Fri May 8 23:36:31 2015
New Revision: 282672
URL: https://svnweb.freebsd.org/changeset/base/282672
Log:
Always convert uuid to lower case.
MFC after:2 weeks
Modified:
head/etc/rc.d/hostid
Modified: head/etc/rc.d/hostid
==
--- head/etc/rc.d/hostidFri May 8 23:29:42 2015(r282671)
+++ head/etc/rc.d/hostidFri May 8 23:36:31 2015(r282672)
@@ -58,7 +58,7 @@ hostid_set()
valid_hostid()
{
-uuid=$1
+uuid=$(echo $1 | tr '[:upper:]' '[:lower:]')
tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps you
could use dd with conv=lcase instead?
Alterntively, a shell function ltr exists in rc.subr for this purpose.
ltr would not work in this situation, for multiple reasons.
1. ltr doesn’t support character classes
2. ltr is for replacing one or more characters (cannot be a class) with a
single string (of variable length, 0+).
In /etc/networks.subr you can see an example usage of ltr:
287 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l287
_punct=.-/+
288 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l288
ltr ${_if} ${_punct} '_' _if
The result of this is to take a value of (for example) foo.bar and replace
any occurrences of period, minus, forward slash, or plus with instead
a single underscore. The result is stuffed into the variable “_if” (over-
writing previous contents which may have contained aforementioned
characters replaced with underscore).
An attempt to use ltr in the below fashion:
ltr $string ‘[:lower:]’ ‘[:upper:]’ somevar
would surely fail.
While it is indeed *possible* to write a find/replace function in native-
shell that supports character classes, it would not be a small function.
The primary issue is that you need to know what the character that
matched the class and there aren’t any built-ins that provide this info.
For example:
case “$src” in *[[:lower:]]*)
will trigger when you have a lower-case character that needs conversion
to upper-case (or opposite if using *[[:upper:]]*) BUT you won’t know
what the character was that you matched (so how can you know which
upper-case character to supplant)?
The function will have to resort to complicated substring mechanics or
any other seldom known procedure.
I’ll have a noodle on it and see what I can come up with. It’s not exactly
immediately coming to me how to do this in any simple fashion while
maintaining efficiency (read: by not iterating over every single character
and also by not having a giant massive case statement with every letter
spelled out — coming up with a solution that embraces the use of the
character class I would believe to be more efficient).
John Baldwin suggested dd conv=lcase, since dd is in /bin.
$ echo MixedCaseLetters | dd conv=lcase 2/dev/null
mixedcaseletters
$ type dd
dd is /bin/dd
Eric
___
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: r282672 - head/etc/rc.d
On May 11, 2015, at 12:44 PM, Eric van Gyzen vangy...@freebsd.org wrote:
On 05/11/2015 15:37, Devin Teske wrote:
On May 11, 2015, at 12:18 PM, Brooks Davis bro...@freebsd.org
mailto:bro...@freebsd.org wrote:
On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote:
On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org
mailto:delp...@freebsd.org wrote:
Author: delphij
Date: Fri May 8 23:36:31 2015
New Revision: 282672
URL: https://svnweb.freebsd.org/changeset/base/282672
Log:
Always convert uuid to lower case.
MFC after:2 weeks
Modified:
head/etc/rc.d/hostid
Modified: head/etc/rc.d/hostid
==
--- head/etc/rc.d/hostidFri May 8 23:29:42 2015(r282671)
+++ head/etc/rc.d/hostidFri May 8 23:36:31 2015(r282672)
@@ -58,7 +58,7 @@ hostid_set()
valid_hostid()
{
-uuid=$1
+uuid=$(echo $1 | tr '[:upper:]' '[:lower:]')
tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps
you could use dd with conv=lcase instead?
Alterntively, a shell function ltr exists in rc.subr for this purpose.
ltr would not work in this situation, for multiple reasons.
1. ltr doesn’t support character classes
2. ltr is for replacing one or more characters (cannot be a class) with a
single string (of variable length, 0+).
In /etc/networks.subr you can see an example usage of ltr:
287 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l287
_punct=.-/+
288 https://svnweb.freebsd.org/base/head/etc/network.subr?view=markup#l288
ltr ${_if} ${_punct} '_' _if
The result of this is to take a value of (for example) foo.bar and replace
any occurrences of period, minus, forward slash, or plus with instead
a single underscore. The result is stuffed into the variable “_if” (over-
writing previous contents which may have contained aforementioned
characters replaced with underscore).
An attempt to use ltr in the below fashion:
ltr $string ‘[:lower:]’ ‘[:upper:]’ somevar
would surely fail.
While it is indeed *possible* to write a find/replace function in native-
shell that supports character classes, it would not be a small function.
The primary issue is that you need to know what the character that
matched the class and there aren’t any built-ins that provide this info.
For example:
case “$src” in *[[:lower:]]*)
will trigger when you have a lower-case character that needs conversion
to upper-case (or opposite if using *[[:upper:]]*) BUT you won’t know
what the character was that you matched (so how can you know which
upper-case character to supplant)?
The function will have to resort to complicated substring mechanics or
any other seldom known procedure.
I’ll have a noodle on it and see what I can come up with. It’s not exactly
immediately coming to me how to do this in any simple fashion while
maintaining efficiency (read: by not iterating over every single character
and also by not having a giant massive case statement with every letter
spelled out — coming up with a solution that embraces the use of the
character class I would believe to be more efficient).
John Baldwin suggested dd conv=lcase, since dd is in /bin.
$ echo MixedCaseLetters | dd conv=lcase 2/dev/null
mixedcaseletters
$ type dd
dd is /bin/dd
Yeah, I have to say, this looks by far the simplest approach.
Even if I or Colin or someone else were to whip up a comprehensive
native shell function that does this, I can’t say that it would be chosen
necessarily over the dd approach (which itself is comprehensive but
may suffer the lag of pulling dd into memory — most significant when
say, running off of CD). Not knowing where the code is destined nor
how many times iteratively it could be passed over in a casual day,
it’s still probably likely that the dd approach is the best (unless you’re
doing it repetitively in a tight loop ;D).
—
Devin
___
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: r282781 - in stable/10: share/man/man9 sys/sys
Author: hiren
Date: Mon May 11 20:26:35 2015
New Revision: 282781
URL: https://svnweb.freebsd.org/changeset/base/282781
Log:
r281955 removed M_FLOWID which could cause problems for old drivers still
using
the field. It cannot be removed from stable/10 so restore it.
Change M_HASHTYPE_GET() and M_HASHTYPE_SET() to do the right thing when
M_FLOWID
exists.
Also bumping the FreeBSD version to note the fact that M_FLOWID is brought
back
in stable/10.
(Just a note that M_FLOWID has been removed from -head.)
Spotted by: np
Suggested by: hans
Reviewed by: hans, tuexen (earlier version)
Helped by:jhb, delphij, gjb
Sponsored by: Limelight Networks
Modified:
stable/10/share/man/man9/netisr.9
stable/10/sys/sys/mbuf.h
stable/10/sys/sys/param.h
Modified: stable/10/share/man/man9/netisr.9
==
--- stable/10/share/man/man9/netisr.9 Mon May 11 19:55:01 2015
(r282780)
+++ stable/10/share/man/man9/netisr.9 Mon May 11 20:26:35 2015
(r282781)
@@ -27,7 +27,7 @@
.\
.\ $FreeBSD$
.\
-.Dd January 11, 2015
+.Dd May 11, 2015
.Dt NETISR 9
.Os
.Sh NAME
@@ -126,13 +126,13 @@ MIB names, so should not contain whitesp
Protocol handler function that will be invoked on each packet received for
the protocol.
.It Vt netisr_m2flow_t Va nh_m2flow
-Optional protocol function to generate a flow ID and set a valid
-hashtype for packets that enter the
+Optional protocol function to generate a flow ID and set
+.Dv M_FLOWID
+for packets that do not enter
.Nm
with
-.Dv M_HASHTYPE_GET(m)
-equal to
-.Dv M_HASHTYPE_NONE .
+.Dv M_FLOWID
+defined.
Will be used only with
.Dv NETISR_POLICY_FLOW .
.It Vt netisr_m2cpuid_t Va nh_m2cpuid
Modified: stable/10/sys/sys/mbuf.h
==
--- stable/10/sys/sys/mbuf.hMon May 11 19:55:01 2015(r282780)
+++ stable/10/sys/sys/mbuf.hMon May 11 20:26:35 2015(r282781)
@@ -230,7 +230,7 @@ struct mbuf {
#defineM_MCAST 0x0020 /* send/received as link-level
multicast */
#defineM_PROMISC 0x0040 /* packet was not for us */
#defineM_VLANTAG 0x0080 /* ether_vtag is valid */
-#defineM_UNUSED_8 0x0100 /* --available-- */
+#defineM_FLOWID0x0100 /* deprecated: flowid is valid */
#defineM_NOFREE0x0200 /* do not free mbuf, embedded in
cluster */
#defineM_PROTO10x1000 /* protocol-specific */
@@ -257,7 +257,7 @@ struct mbuf {
* Flags preserved when copying m_pkthdr.
*/
#define M_COPYFLAGS \
-(M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG| \
+(M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG|M_FLOWID| \
M_PROTOFLAGS)
/*
@@ -265,7 +265,7 @@ struct mbuf {
*/
#defineM_FLAG_BITS \
\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY\5M_BCAST\6M_MCAST \
-\7M_PROMISC\10M_VLANTAG
+\7M_PROMISC\10M_VLANTAG\11M_FLOWID
#defineM_FLAG_PROTOBITS \
\15M_PROTO1\16M_PROTO2\17M_PROTO3\20M_PROTO4\21M_PROTO5 \
\22M_PROTO6\23M_PROTO7\24M_PROTO8\25M_PROTO9\26M_PROTO10 \
@@ -297,8 +297,16 @@ struct mbuf {
#defineM_HASHTYPE_OPAQUE 255 /* ordering, not
affinity */
#defineM_HASHTYPE_CLEAR(m) ((m)-m_pkthdr.rsstype = 0)
-#defineM_HASHTYPE_GET(m) ((m)-m_pkthdr.rsstype)
-#defineM_HASHTYPE_SET(m, v)((m)-m_pkthdr.rsstype = (v))
+/*
+ * Handle M_FLOWID for legacy drivers still using them.
+ */
+#defineM_HASHTYPE_GET(m) ((m-m_flags M_FLOWID) ?
M_HASHTYPE_OPAQUE \
+ : (m)-m_pkthdr.rsstype)
+#defineM_HASHTYPE_SET(m, v)do {\
+ if ((v) != M_HASHTYPE_NONE) \
+ m-m_flags |= M_FLOWID; \
+ (m)-m_pkthdr.rsstype = (v);\
+} while (0)
#defineM_HASHTYPE_TEST(m, v) (M_HASHTYPE_GET(m) == (v))
/*
Modified: stable/10/sys/sys/param.h
==
--- stable/10/sys/sys/param.h Mon May 11 19:55:01 2015(r282780)
+++ stable/10/sys/sys/param.h Mon May 11 20:26:35 2015(r282781)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1001514 /* Master, propagated to newvers */
+#define __FreeBSD_version 1001515 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
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: r282736 - in head: . lib/libmd
The libmd changes break pkg - so all packages.
http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/logs/pkg-1.5.2.log
CCLD pkg-static
/usr/lib/liblzma.a(check.o): In function `lzma_check_init':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0x5e):
undefined reference to `_libmd_SHA256_Init'
/usr/lib/liblzma.a(check.o): In function `lzma_check_update':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0xbf):
undefined reference to `_libmd_SHA256_Update'
/usr/lib/liblzma.a(check.o): In function `lzma_check_finish':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0x10d):
undefined reference to `_libmd_SHA256_Final'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** [pkg-static] Error code 1
Can you please just revert this and 282726 until they are working and
have a passing exp-run?
On 5/10/2015 4:21 PM, Thomas Quinot wrote:
Author: thomas
Date: Sun May 10 21:21:52 2015
New Revision: 282736
URL: https://svnweb.freebsd.org/changeset/base/282736
Log:
Unbreak build following rev. 282726
(Makefile.inc1): add dependency of xinstall on libmd to
avoid failure of parallel bootstrap.
(lib/libmd/*.h): do not redefine symbols if already
defined as macros (libcrypt uses the same sources internally,
redefining symbols with a prefix of its own).
Fixes build failures caused by previous change to libmd.
Reported by: ian
Pointy hat to: thomas
Modified:
head/Makefile.inc1
head/lib/libmd/md4.h
head/lib/libmd/md5.h
head/lib/libmd/ripemd.h
head/lib/libmd/sha.h
head/lib/libmd/sha256.h
head/lib/libmd/sha512.h
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1Sun May 10 21:05:32 2015(r282735)
+++ head/Makefile.inc1Sun May 10 21:21:52 2015(r282736)
@@ -1361,6 +1361,9 @@ _kerberos5_bootstrap_tools= \
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.endif
+# Rebuild up-to-date libmd for xinstall
+${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
+
bootstrap-tools: .PHONY
#Please document (add comment) why something is in 'bootstrap-tools'.
Modified: head/lib/libmd/md4.h
==
--- head/lib/libmd/md4.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/md4.h Sun May 10 21:21:52 2015(r282736)
@@ -38,14 +38,30 @@ __BEGIN_DECLS
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef MD4Init
#define MD4Init _libmd_MD4Init
+#endif
+#ifndef MD4Update
#define MD4Update_libmd_MD4Update
+#endif
+#ifndef MD4Pad
#define MD4Pad _libmd_MD4Pad
+#endif
+#ifndef MD4Final
#define MD4Final _libmd_MD4Final
+#endif
+#ifndef MD4End
#define MD4End _libmd_MD4End
+#endif
+#ifndef MD4File
#define MD4File _libmd_MD4File
+#endif
+#ifndef MD4FileChunk
#define MD4FileChunk _libmd_MD4FileChunk
+#endif
+#ifndef MD4Data
#define MD4Data _libmd_MD4Data
+#endif
void MD4Init(MD4_CTX *);
void MD4Update(MD4_CTX *, const void *, unsigned int);
Modified: head/lib/libmd/md5.h
==
--- head/lib/libmd/md5.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/md5.h Sun May 10 21:21:52 2015(r282736)
@@ -7,15 +7,33 @@
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef MD5Init
#define MD5Init _libmd_MD5Init
+#endif
+#ifndef MD5Update
#define MD5Update_libmd_MD5Update
+#endif
+#ifndef MD5Pad
#define MD5Pad _libmd_MD5Pad
+#endif
+#ifndef MD5Final
#define MD5Final _libmd_MD5Final
+#endif
+#ifndef MD5Transform
#define MD5Transform _libmd_MD5Transform
+#endif
+#ifndef MD5End
#define MD5End _libmd_MD5End
+#endif
+#ifndef MD5File
#define MD5File _libmd_MD5File
+#endif
+#ifndef MD5FileChunk
#define MD5FileChunk _libmd_MD5FileChunk
+#endif
+#ifndef MD5Data
#define MD5Data _libmd_MD5Data
+#endif
#endif
Modified: head/lib/libmd/ripemd.h
==
--- head/lib/libmd/ripemd.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/ripemd.h Sun May 10 21:21:52 2015(r282736)
@@ -84,17 +84,37 @@ __BEGIN_DECLS
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef RIPEMD160_Init
#define RIPEMD160_Init _libmd_RIPEMD160_Init
+#endif
+#ifndef RIPEMD160_Update
#define RIPEMD160_Update _libmd_RIPEMD160_Update
+#endif
+#ifndef
svn commit: r282786 - stable/10/sys/sys
Author: hiren
Date: Tue May 12 00:27:20 2015
New Revision: 282786
URL: https://svnweb.freebsd.org/changeset/base/282786
Log:
Fix r282781:
We should return OPAQUE from M_HASHTYPE_GET() if M_FLOWID is there and rsstype
is not set.
Submitted by: hans
Modified:
stable/10/sys/sys/mbuf.h
Modified: stable/10/sys/sys/mbuf.h
==
--- stable/10/sys/sys/mbuf.hMon May 11 22:14:03 2015(r282785)
+++ stable/10/sys/sys/mbuf.hTue May 12 00:27:20 2015(r282786)
@@ -300,8 +300,9 @@ struct mbuf {
/*
* Handle M_FLOWID for legacy drivers still using them.
*/
-#defineM_HASHTYPE_GET(m) ((m-m_flags M_FLOWID) ?
M_HASHTYPE_OPAQUE \
- : (m)-m_pkthdr.rsstype)
+#defineM_HASHTYPE_GET(m) (((m-m_flags M_FLOWID) \
+(m)-m_pkthdr.rsstype == M_HASHTYPE_NONE) ? M_HASHTYPE_OPAQUE : \
+(m)-m_pkthdr.rsstype)
#defineM_HASHTYPE_SET(m, v)do {\
if ((v) != M_HASHTYPE_NONE) \
m-m_flags |= M_FLOWID; \
___
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: r282787 - head/release
Author: gjb
Date: Tue May 12 00:27:52 2015
New Revision: 282787
URL: https://svnweb.freebsd.org/changeset/base/282787
Log:
Always use the 'make install' directory as the source for images.
For RE purposes, we use the default (/R within the chroot), so
this helps avoid copying files multiple times and xz(1)-compressing
additional times when not needed.
Again, this Makefile is not for general consumption.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:27:20 2015
(r282786)
+++ head/release/Makefile.mirrors Tue May 12 00:27:52 2015
(r282787)
@@ -11,6 +11,7 @@
.include ${.CURDIR}/Makefile
FTPDIR?= /ftp
+RELEASEDIR?= /R
STAGE_TARGETS?=iso-images-stage
# snapshot
@@ -57,12 +58,17 @@ FTP_DIR=${TLD}/${TARGET}/${TARGET_ARCH
iso-images-stage:
mkdir -p ${ISO_DIR}
mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
-.for IMAGE in ${IMAGES}
- cp -p ${.OBJDIR}/${IMAGE} ${ISO_DIR}/${OSRELEASE}-${IMAGE}
-. if exists(/R/${IMAGE}.xz)
- cp -p ${.OBJDIR}/${IMAGE}.xz ${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
+.if exists(${RELEASEDIR})
+ @# Assume we have images to copy.
+. for IMAGE in ${IMAGES}
+ cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE} \
+ ${ISO_DIR}/${OSRELEASE}-${IMAGE}
+. if exists(/R/${IMAGE}.xz)
+ cp -p ${RELEASEDIR}/${IMAGE}.xz \
+ ${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
. endif
-.endfor
+.endif
+
.if defined(SNAPSHOT) !empty(SNAPSHOT)
. for IMAGE in ${IMAGES}
cd ${ISO_DIR} mv ${OSRELEASE}-${IMAGE} \
@@ -84,9 +90,9 @@ iso-images-stage:
cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
.endif
-.if exists(${.OBJDIR}/ftp)
+.if exists(${RELEASEDIR}/ftp)
mkdir -p ${FTP_DIR}
- cp ${.OBJDIR}/ftp/*.txz ${.OBJDIR}/ftp/MANIFEST ${FTP_DIR}
+ cp ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
cd ${TLD}/${TARGET} \
ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
${REVISION}-${BRANCH}
___
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: r282788 - head/usr.sbin/bhyve
Author: neel
Date: Tue May 12 00:30:39 2015
New Revision: 282788
URL: https://svnweb.freebsd.org/changeset/base/282788
Log:
Allow configuration of the sector size advertised to the guest.
The default behavior is to infer the logical and physical sector sizes from
the block device backend. However older versions of Windows only work with
specific logical/physical combinations:
- Vista and Windows 7:512/512
- Windows 7 SP1: 512/512 or 512/4096
For this reason allow the sector size to be specified using the following
block device option: sectorsize=logical[/physical]
Reported by: Leon Dang (ld...@nahannisys.com)
Reviewed by: grehan
MFC after:2 weeks
Modified:
head/usr.sbin/bhyve/bhyve.8
head/usr.sbin/bhyve/block_if.c
Modified: head/usr.sbin/bhyve/bhyve.8
==
--- head/usr.sbin/bhyve/bhyve.8 Tue May 12 00:27:52 2015(r282787)
+++ head/usr.sbin/bhyve/bhyve.8 Tue May 12 00:30:39 2015(r282788)
@@ -193,8 +193,13 @@ format.
.Pp
Block storage devices:
.Bl -tag -width 10n
-.It Pa /filename Ns Oo , Ns Li nocache Oc Ns Oo , Ns Li direct Oc Ns Oo , Ns
Li ro Oc
-.It Pa /dev/xxx Ns Oo , Ns Ar nocache Oc Ns Oo , Ns Ar direct Oc Ns Oo , Ns Ar
ro Oc
+.It Pa /filename Ns Oo , Ns Ar block-device-options Oc
+.It Pa /dev/xxx Ns Oo , Ns Ar block-device-options Oc
+.El
+.Pp
+The
+.Ar block-device-options
+are:
.Bl -tag -width 8n
.It Li nocache
Open the file with
@@ -204,14 +209,10 @@ Open the file using
.Dv O_SYNC .
.It Li ro
Force the file to be opened read-only.
-.El
-.Pp
-The
-.Li nocache ,
-.Li direct ,
-and
-.Li ro
-options are not available for virtio block devices.
+.It Li sectorsize= Ns Ar logical Ns Oo / Ns Ar physical Oc
+Specify the logical and physical sector sizes of the emulated disk.
+The physical sector size is optional and is equal to the logical sector size
+if not explicitly specified.
.El
.Pp
TTY devices:
Modified: head/usr.sbin/bhyve/block_if.c
==
--- head/usr.sbin/bhyve/block_if.c Tue May 12 00:27:52 2015
(r282787)
+++ head/usr.sbin/bhyve/block_if.c Tue May 12 00:30:39 2015
(r282788)
@@ -392,16 +392,18 @@ blockif_open(const char *optstr, const c
{
char tname[MAXCOMLEN + 1];
char name[MAXPATHLEN];
- char *nopt, *xopts;
+ char *nopt, *xopts, *cp;
struct blockif_ctxt *bc;
struct stat sbuf;
struct diocgattr_arg arg;
off_t size, psectsz, psectoff;
int extra, fd, i, sectsz;
- int nocache, sync, ro, candelete, geom;
+ int nocache, sync, ro, candelete, geom, ssopt, pssopt;
pthread_once(blockif_once, blockif_init);
+ fd = -1;
+ ssopt = 0;
nocache = 0;
sync = 0;
ro = 0;
@@ -410,16 +412,25 @@ blockif_open(const char *optstr, const c
* The first element in the optstring is always a pathname.
* Optional elements follow
*/
- nopt = strdup(optstr);
- for (xopts = strtok(nopt, ,);
-xopts != NULL;
-xopts = strtok(NULL, ,)) {
- if (!strcmp(xopts, nocache))
+ nopt = xopts = strdup(optstr);
+ while (xopts != NULL) {
+ cp = strsep(xopts, ,);
+ if (cp == nopt) /* file or device pathname */
+ continue;
+ else if (!strcmp(cp, nocache))
nocache = 1;
- else if (!strcmp(xopts, sync))
+ else if (!strcmp(cp, sync) || !strcmp(cp, direct))
sync = 1;
- else if (!strcmp(xopts, ro))
+ else if (!strcmp(cp, ro))
ro = 1;
+ else if (sscanf(cp, sectorsize=%d/%d, ssopt, pssopt) == 2)
+ ;
+ else if (sscanf(cp, sectorsize=%d, ssopt) == 1)
+ pssopt = ssopt;
+ else {
+ fprintf(stderr, Invalid device option \%s\\n, cp);
+ goto err;
+ }
}
extra = 0;
@@ -437,13 +448,12 @@ blockif_open(const char *optstr, const c
if (fd 0) {
perror(Could not open backing file);
- return (NULL);
+ goto err;
}
if (fstat(fd, sbuf) 0) {
perror(Could not stat backing file);
-close(fd);
-return (NULL);
+ goto err;
}
/*
@@ -457,8 +467,7 @@ blockif_open(const char *optstr, const c
if (ioctl(fd, DIOCGMEDIASIZE, size) 0 ||
ioctl(fd, DIOCGSECTORSIZE, sectsz)) {
perror(Could not fetch dev blk/sector size);
- close(fd);
- return (NULL);
+ goto err;
}
svn commit: r282789 - head/release
Author: gjb
Date: Tue May 12 00:30:56 2015
New Revision: 282789
URL: https://svnweb.freebsd.org/changeset/base/282789
Log:
Temporarily 'rm -rf $FTPDIR' during additional testing.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:30:39 2015
(r282788)
+++ head/release/Makefile.mirrors Tue May 12 00:30:56 2015
(r282789)
@@ -55,6 +55,9 @@ SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,
ISO_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}
FTP_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/${REVISION}-${BRANCH}
+remove-old-bits:
+ rm -rf ${FTPDIR}
+
iso-images-stage:
mkdir -p ${ISO_DIR}
mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
@@ -130,5 +133,5 @@ vm-images-stage:
# ${VM_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
#.endif
-ftp-stage: ${STAGE_TARGETS}
+ftp-stage: remove-old-bits ${STAGE_TARGETS}
___
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: r282791 - head/release
Author: gjb
Date: Tue May 12 00:33:18 2015
New Revision: 282791
URL: https://svnweb.freebsd.org/changeset/base/282791
Log:
Sigh. Fix more syntax errors introduced by the last commit.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:32:28 2015
(r282790)
+++ head/release/Makefile.mirrors Tue May 12 00:33:18 2015
(r282791)
@@ -69,8 +69,8 @@ iso-images-stage:
. if exists(/R/${IMAGE}.xz)
cp -p ${RELEASEDIR}/${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
-. endfor
-. endif
+. endif
+. endfor
.endif
.if defined(SNAPSHOT) !empty(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: r282790 - head/release
Author: gjb
Date: Tue May 12 00:32:28 2015
New Revision: 282790
URL: https://svnweb.freebsd.org/changeset/base/282790
Log:
Fix a make(1) syntax error.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:30:56 2015
(r282789)
+++ head/release/Makefile.mirrors Tue May 12 00:32:28 2015
(r282790)
@@ -69,6 +69,7 @@ iso-images-stage:
. if exists(/R/${IMAGE}.xz)
cp -p ${RELEASEDIR}/${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
+. endfor
. endif
.endif
___
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: r282736 - in head: . lib/libmd
Note that r282775 depends on this so if these are reverted, r282775
should be reverted altogether.
On Mon, May 11, 2015 at 5:23 PM, Bryan Drewery bdrew...@freebsd.org wrote:
The libmd changes break pkg - so all packages.
http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/logs/pkg-1.5.2.log
CCLD pkg-static
/usr/lib/liblzma.a(check.o): In function `lzma_check_init':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0x5e):
undefined reference to `_libmd_SHA256_Init'
/usr/lib/liblzma.a(check.o): In function `lzma_check_update':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0xbf):
undefined reference to `_libmd_SHA256_Update'
/usr/lib/liblzma.a(check.o): In function `lzma_check_finish':
/usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contrib/xz/src/liblzma/check/check.c:(.text+0x10d):
undefined reference to `_libmd_SHA256_Final'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** [pkg-static] Error code 1
Can you please just revert this and 282726 until they are working and
have a passing exp-run?
On 5/10/2015 4:21 PM, Thomas Quinot wrote:
Author: thomas
Date: Sun May 10 21:21:52 2015
New Revision: 282736
URL: https://svnweb.freebsd.org/changeset/base/282736
Log:
Unbreak build following rev. 282726
(Makefile.inc1): add dependency of xinstall on libmd to
avoid failure of parallel bootstrap.
(lib/libmd/*.h): do not redefine symbols if already
defined as macros (libcrypt uses the same sources internally,
redefining symbols with a prefix of its own).
Fixes build failures caused by previous change to libmd.
Reported by: ian
Pointy hat to: thomas
Modified:
head/Makefile.inc1
head/lib/libmd/md4.h
head/lib/libmd/md5.h
head/lib/libmd/ripemd.h
head/lib/libmd/sha.h
head/lib/libmd/sha256.h
head/lib/libmd/sha512.h
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1Sun May 10 21:05:32 2015(r282735)
+++ head/Makefile.inc1Sun May 10 21:21:52 2015(r282736)
@@ -1361,6 +1361,9 @@ _kerberos5_bootstrap_tools= \
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.endif
+# Rebuild up-to-date libmd for xinstall
+${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
+
bootstrap-tools: .PHONY
#Please document (add comment) why something is in 'bootstrap-tools'.
Modified: head/lib/libmd/md4.h
==
--- head/lib/libmd/md4.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/md4.h Sun May 10 21:21:52 2015(r282736)
@@ -38,14 +38,30 @@ __BEGIN_DECLS
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef MD4Init
#define MD4Init _libmd_MD4Init
+#endif
+#ifndef MD4Update
#define MD4Update_libmd_MD4Update
+#endif
+#ifndef MD4Pad
#define MD4Pad _libmd_MD4Pad
+#endif
+#ifndef MD4Final
#define MD4Final _libmd_MD4Final
+#endif
+#ifndef MD4End
#define MD4End _libmd_MD4End
+#endif
+#ifndef MD4File
#define MD4File _libmd_MD4File
+#endif
+#ifndef MD4FileChunk
#define MD4FileChunk _libmd_MD4FileChunk
+#endif
+#ifndef MD4Data
#define MD4Data _libmd_MD4Data
+#endif
void MD4Init(MD4_CTX *);
void MD4Update(MD4_CTX *, const void *, unsigned int);
Modified: head/lib/libmd/md5.h
==
--- head/lib/libmd/md5.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/md5.h Sun May 10 21:21:52 2015(r282736)
@@ -7,15 +7,33 @@
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef MD5Init
#define MD5Init _libmd_MD5Init
+#endif
+#ifndef MD5Update
#define MD5Update_libmd_MD5Update
+#endif
+#ifndef MD5Pad
#define MD5Pad _libmd_MD5Pad
+#endif
+#ifndef MD5Final
#define MD5Final _libmd_MD5Final
+#endif
+#ifndef MD5Transform
#define MD5Transform _libmd_MD5Transform
+#endif
+#ifndef MD5End
#define MD5End _libmd_MD5End
+#endif
+#ifndef MD5File
#define MD5File _libmd_MD5File
+#endif
+#ifndef MD5FileChunk
#define MD5FileChunk _libmd_MD5FileChunk
+#endif
+#ifndef MD5Data
#define MD5Data _libmd_MD5Data
+#endif
#endif
Modified: head/lib/libmd/ripemd.h
==
--- head/lib/libmd/ripemd.h Sun May 10 21:05:32 2015(r282735)
+++ head/lib/libmd/ripemd.h Sun May 10 21:21:52 2015(r282736)
@@ -84,17 +84,37 @@ __BEGIN_DECLS
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef RIPEMD160_Init
#define RIPEMD160_Init
svn commit: r282793 - head/release
Author: gjb
Date: Tue May 12 00:46:32 2015
New Revision: 282793
URL: https://svnweb.freebsd.org/changeset/base/282793
Log:
Also copy CHECKSUM.{SHA256,MD5} files.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:39:01 2015
(r282792)
+++ head/release/Makefile.mirrors Tue May 12 00:46:32 2015
(r282793)
@@ -70,6 +70,10 @@ iso-images-stage:
cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
. endif
+. if exists(${RELEASEDIR}/CHECKSUM.${CHECKSUM})
+ cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM} \
+ ${ISO_DIR}/CHECKSUM.${CHECKSUM}
+. endif
. endfor
.endif
___
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: r282736 - in head: . lib/libmd
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 05/11/15 17:23, Bryan Drewery wrote: The libmd changes break pkg - so all packages. http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/ logs/pkg-1.5.2.log CCLD pkg-static /usr/lib/liblzma.a(check.o): In function `lzma_check_init': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0x5e): undefined reference to `_libmd_SHA256_Init' /usr/lib/liblzma.a(check.o): In function `lzma_check_update': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0xbf): undefined reference to `_libmd_SHA256_Update' /usr/lib/liblzma.a(check.o): In function `lzma_check_finish': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0x10d): undefined reference to `_libmd_SHA256_Final' cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [pkg-static] Error code 1 Can you please just revert this and 282726 until they are working and have a passing exp-run? Looks like this is because my change (r282775) which makes libmd a dependency of liblzma, while pkg didn't catch up with, and it's unrelated to libmd change. A quick hack would be: - --- src/Makefile.in.orig 2015-05-11 17:49:52.690333554 -0700 +++ src/Makefile.in 2015-05-11 17:50:03.427853585 -0700 @@ -617,7 +617,7 @@ $(top_builddir)/compat/libbsd_compat.la \ $(top_builddir)/external/libsbuf_static.la $(pkg_OBJECTS) \ @LIBJAIL_LIB@ @LDNS_LIBS@ @OS_LIBS@ -larchive -lz -lutil -lbz2 \ - - -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ + -lmd -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ $(am__append_3) DYNPROG = pkg @BUILD_STATIC_TRUE@pkg_static_LDFLAGS = -all-static But it would break earlier FreeBSD. Should I revert my change and request for a exp-run? Cheers, - -- Xin LI delp...@delphij.nethttps://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.1.2 (FreeBSD) iQIcBAEBCgAGBQJVUU76AAoJEJW2GBstM+nsg2cP/i/t3SB59mnwdoqQi72KQNA0 z+N4FGufh0ULnsOTtkW5M+iUhTLqPk64NHYlQd7MlqQEle5UZgmKj8db35j/UJjL r1b+ERwOIgg8415umMPUVnexwwwOngxGIcaa7moE1HTKz2SCuC1NAypuXmhqyQ9p It49A9MKhkNKt9sVbV2vfm8R6UA2T9suwjOxvyEpf0fihdp2XcbNZ3raL6yPTNoN O/nxeWL4O2UQju17nKKMsTLBqWeJCGrY1htwyvpR8kDi53UDAeyZUF3MOnj9jIa7 L4RJg38hjZlctV5UzOlz1ThbOCI4hsz9jaIEsN/OCAWsh+RLHTIA21w09KT8mnkn Ch8ARY0na9sWOLxbYgF2uqK/Y4Cv64P0W33Smd9WtqlX84FY+sm/FjEbAglmCD0d KhTBNYEL/I+Rn3fe9VfUHWAiW5QTT6CHGKdDcKpI63hFjrp2MoNmB18vRop/IQ/9 RihTuVaF25XOnbbW/K8L9yajZos0Mkrvz75nnmr5dG3uJljbPN0o3nzNAXqKa20c q8ld2cGrCs4WjJtJfLmdtTSN1kbeY74pTseq+DlIixlaDOcec7phY/qDRXrjCvy1 K5Upi2fUhYScuGzmz3MEP+SmtOn+2juPO+hWIXd3iP9Vtin3VYw8pUWttQsqWYvh XP2zfiUjGOMNs4kx1BMD =rz9u -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r282784 - head/usr.sbin/bhyve
Author: grehan
Date: Mon May 11 21:24:10 2015
New Revision: 282784
URL: https://svnweb.freebsd.org/changeset/base/282784
Log:
Handling indirect descriptors is a capability of the host and
not one that needs to be negotiated. Use the host capabilities
field and not the negotiated field when verifying that indirect
descriptors are supported.
Found with the Redhat Windows viostor driver, which clears
the indirect capability in the negotiated caps and then starts
using them.
Reported and tested by: Leon Dang (ld...@nahannisys.com)
MFC after: 2 weeks
Modified:
head/usr.sbin/bhyve/virtio.c
Modified: head/usr.sbin/bhyve/virtio.c
==
--- head/usr.sbin/bhyve/virtio.cMon May 11 20:58:05 2015
(r282783)
+++ head/usr.sbin/bhyve/virtio.cMon May 11 21:24:10 2015
(r282784)
@@ -316,7 +316,7 @@ vq_getchain(struct vqueue_info *vq, uint
if ((vdir-vd_flags VRING_DESC_F_INDIRECT) == 0) {
_vq_record(i, vdir, ctx, iov, n_iov, flags);
i++;
- } else if ((vs-vs_negotiated_caps
+ } else if ((vs-vs_vc-vc_hv_caps
VIRTIO_RING_F_INDIRECT_DESC) == 0) {
fprintf(stderr,
%s: descriptor has forbidden INDIRECT flag,
___
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: r282803 - in vendor/ficl/dist: . contrib contrib/xclasses doc doc/articles doc/graphics doc/source ficlplatform softcore softwords test
Author: pfg Date: Tue May 12 03:27:06 2015 New Revision: 282803 URL: https://svnweb.freebsd.org/changeset/base/282803 Log: Update to ficl 4.1.0 (latest release on sourceforge) Added: vendor/ficl/dist/Makefile (contents, props changed) vendor/ficl/dist/Makefile.ansi (contents, props changed) vendor/ficl/dist/bit.c (contents, props changed) vendor/ficl/dist/callback.c (contents, props changed) vendor/ficl/dist/compatibility.c (contents, props changed) vendor/ficl/dist/contrib/ vendor/ficl/dist/contrib/xclasses/ vendor/ficl/dist/contrib/xclasses/readme.txt (contents, props changed) vendor/ficl/dist/contrib/xclasses/xclasses.py (contents, props changed) vendor/ficl/dist/dictionary.c - copied, changed from r282801, vendor/ficl/dist/dict.c vendor/ficl/dist/doc/api.html (contents, props changed) vendor/ficl/dist/doc/articles/ vendor/ficl/dist/doc/articles/ficlddj.pdf (contents, props changed) vendor/ficl/dist/doc/articles/jwsforml.pdf (contents, props changed) vendor/ficl/dist/doc/articles/oo_in_c.html (contents, props changed) vendor/ficl/dist/doc/articles/sigplan9906.doc (contents, props changed) vendor/ficl/dist/doc/debugger.html (contents, props changed) vendor/ficl/dist/doc/dpans.html (contents, props changed) vendor/ficl/dist/doc/graphics/ vendor/ficl/dist/doc/graphics/4ring.gif (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.128.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.64.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl.4.96.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl_oop.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/ficl_top.jpg (contents, props changed) vendor/ficl/dist/doc/graphics/sourceforge.jpg (contents, props changed) vendor/ficl/dist/doc/license.html (contents, props changed) vendor/ficl/dist/doc/links.html (contents, props changed) vendor/ficl/dist/doc/locals.html (contents, props changed) vendor/ficl/dist/doc/oop.html (contents, props changed) vendor/ficl/dist/doc/parsesteps.html (contents, props changed) vendor/ficl/dist/doc/releases.html (contents, props changed) vendor/ficl/dist/doc/source/ vendor/ficl/dist/doc/source/api.ht vendor/ficl/dist/doc/source/debugger.ht vendor/ficl/dist/doc/source/dpans.ht vendor/ficl/dist/doc/source/ficl.ht vendor/ficl/dist/doc/source/generate.py (contents, props changed) vendor/ficl/dist/doc/source/index.ht vendor/ficl/dist/doc/source/license.ht vendor/ficl/dist/doc/source/links.ht vendor/ficl/dist/doc/source/locals.ht vendor/ficl/dist/doc/source/oop.ht vendor/ficl/dist/doc/source/parsesteps.ht vendor/ficl/dist/doc/source/releases.ht vendor/ficl/dist/doc/source/upgrading.ht vendor/ficl/dist/doc/upgrading.html (contents, props changed) vendor/ficl/dist/double.c - copied, changed from r282801, vendor/ficl/dist/math64.c vendor/ficl/dist/extras.c (contents, props changed) vendor/ficl/dist/ficlcompatibility.h (contents, props changed) vendor/ficl/dist/ficldll.def vendor/ficl/dist/ficldll.dsp vendor/ficl/dist/ficlexe.dsp vendor/ficl/dist/ficllib.dsp vendor/ficl/dist/ficllocal.h (contents, props changed) vendor/ficl/dist/ficlplatform/ vendor/ficl/dist/ficlplatform/alpha.h (contents, props changed) vendor/ficl/dist/ficlplatform/ansi.c (contents, props changed) vendor/ficl/dist/ficlplatform/ansi.h (contents, props changed) vendor/ficl/dist/ficlplatform/ficlexports.txt (contents, props changed) vendor/ficl/dist/ficlplatform/makedef.py (contents, props changed) vendor/ficl/dist/ficlplatform/unix.c (contents, props changed) vendor/ficl/dist/ficlplatform/unix.h (contents, props changed) vendor/ficl/dist/ficlplatform/win32.c (contents, props changed) vendor/ficl/dist/ficlplatform/win32.h (contents, props changed) vendor/ficl/dist/ficltokens.h (contents, props changed) vendor/ficl/dist/hash.c (contents, props changed) vendor/ficl/dist/lzcompress.c (contents, props changed) vendor/ficl/dist/lzuncompress.c (contents, props changed) vendor/ficl/dist/main.c (contents, props changed) vendor/ficl/dist/primitives.c - copied, changed from r282801, vendor/ficl/dist/words.c vendor/ficl/dist/softcore/ - copied from r282801, vendor/ficl/dist/softwords/ vendor/ficl/dist/softcore/ficl.fr vendor/ficl/dist/softcore/make.bat vendor/ficl/dist/softcore/makesoftcore.c (contents, props changed) vendor/ficl/dist/system.c - copied, changed from r282801, vendor/ficl/dist/ficl.c vendor/ficl/dist/utility.c (contents, props changed) vendor/ficl/dist/word.c (contents, props changed) Deleted: vendor/ficl/dist/dict.c vendor/ficl/dist/doc/Logo.jpg vendor/ficl/dist/doc/ficl1.ico vendor/ficl/dist/doc/ficl_debug.html vendor/ficl/dist/doc/ficl_guts.htm vendor/ficl/dist/doc/ficl_loc.html vendor/ficl/dist/doc/ficl_logo.jpg
svn commit: r282804 - in vendor/ficl/4.1.0: . contrib doc doc/articles doc/graphics doc/source ficlplatform softcore softwords test
Author: pfg Date: Tue May 12 03:29:50 2015 New Revision: 282804 URL: https://svnweb.freebsd.org/changeset/base/282804 Log: Tag ficl 4.1.0 Added: vendor/ficl/4.1.0/ - copied from r282801, vendor/ficl/dist/ vendor/ficl/4.1.0/Makefile - copied unchanged from r282803, vendor/ficl/dist/Makefile vendor/ficl/4.1.0/Makefile.ansi - copied unchanged from r282803, vendor/ficl/dist/Makefile.ansi vendor/ficl/4.1.0/bit.c - copied unchanged from r282803, vendor/ficl/dist/bit.c vendor/ficl/4.1.0/callback.c - copied unchanged from r282803, vendor/ficl/dist/callback.c vendor/ficl/4.1.0/compatibility.c - copied unchanged from r282803, vendor/ficl/dist/compatibility.c vendor/ficl/4.1.0/contrib/ - copied from r282803, vendor/ficl/dist/contrib/ vendor/ficl/4.1.0/dictionary.c - copied unchanged from r282803, vendor/ficl/dist/dictionary.c vendor/ficl/4.1.0/doc/api.html - copied unchanged from r282803, vendor/ficl/dist/doc/api.html vendor/ficl/4.1.0/doc/articles/ - copied from r282803, vendor/ficl/dist/doc/articles/ vendor/ficl/4.1.0/doc/debugger.html - copied unchanged from r282803, vendor/ficl/dist/doc/debugger.html vendor/ficl/4.1.0/doc/dpans.html - copied unchanged from r282803, vendor/ficl/dist/doc/dpans.html vendor/ficl/4.1.0/doc/graphics/ - copied from r282803, vendor/ficl/dist/doc/graphics/ vendor/ficl/4.1.0/doc/license.html - copied unchanged from r282803, vendor/ficl/dist/doc/license.html vendor/ficl/4.1.0/doc/links.html - copied unchanged from r282803, vendor/ficl/dist/doc/links.html vendor/ficl/4.1.0/doc/locals.html - copied unchanged from r282803, vendor/ficl/dist/doc/locals.html vendor/ficl/4.1.0/doc/oop.html - copied unchanged from r282803, vendor/ficl/dist/doc/oop.html vendor/ficl/4.1.0/doc/parsesteps.html - copied unchanged from r282803, vendor/ficl/dist/doc/parsesteps.html vendor/ficl/4.1.0/doc/releases.html - copied unchanged from r282803, vendor/ficl/dist/doc/releases.html vendor/ficl/4.1.0/doc/source/ - copied from r282803, vendor/ficl/dist/doc/source/ vendor/ficl/4.1.0/doc/upgrading.html - copied unchanged from r282803, vendor/ficl/dist/doc/upgrading.html vendor/ficl/4.1.0/double.c - copied unchanged from r282803, vendor/ficl/dist/double.c vendor/ficl/4.1.0/extras.c - copied unchanged from r282803, vendor/ficl/dist/extras.c vendor/ficl/4.1.0/ficlcompatibility.h - copied unchanged from r282803, vendor/ficl/dist/ficlcompatibility.h vendor/ficl/4.1.0/ficldll.def - copied unchanged from r282803, vendor/ficl/dist/ficldll.def vendor/ficl/4.1.0/ficldll.dsp - copied unchanged from r282803, vendor/ficl/dist/ficldll.dsp vendor/ficl/4.1.0/ficlexe.dsp - copied unchanged from r282803, vendor/ficl/dist/ficlexe.dsp vendor/ficl/4.1.0/ficllib.dsp - copied unchanged from r282803, vendor/ficl/dist/ficllib.dsp vendor/ficl/4.1.0/ficllocal.h - copied unchanged from r282803, vendor/ficl/dist/ficllocal.h vendor/ficl/4.1.0/ficlplatform/ - copied from r282803, vendor/ficl/dist/ficlplatform/ vendor/ficl/4.1.0/ficltokens.h - copied unchanged from r282803, vendor/ficl/dist/ficltokens.h vendor/ficl/4.1.0/hash.c - copied unchanged from r282803, vendor/ficl/dist/hash.c vendor/ficl/4.1.0/lzcompress.c - copied unchanged from r282803, vendor/ficl/dist/lzcompress.c vendor/ficl/4.1.0/lzuncompress.c - copied unchanged from r282803, vendor/ficl/dist/lzuncompress.c vendor/ficl/4.1.0/main.c - copied unchanged from r282803, vendor/ficl/dist/main.c vendor/ficl/4.1.0/primitives.c - copied unchanged from r282803, vendor/ficl/dist/primitives.c vendor/ficl/4.1.0/softcore/ - copied from r282803, vendor/ficl/dist/softcore/ vendor/ficl/4.1.0/system.c - copied unchanged from r282803, vendor/ficl/dist/system.c vendor/ficl/4.1.0/utility.c - copied unchanged from r282803, vendor/ficl/dist/utility.c vendor/ficl/4.1.0/word.c - copied unchanged from r282803, vendor/ficl/dist/word.c Replaced: vendor/ficl/4.1.0/Makefile.linux - copied unchanged from r282803, vendor/ficl/dist/Makefile.linux vendor/ficl/4.1.0/ReadMe.txt - copied unchanged from r282803, vendor/ficl/dist/ReadMe.txt vendor/ficl/4.1.0/doc/favicon.ico - copied unchanged from r282803, vendor/ficl/dist/doc/favicon.ico vendor/ficl/4.1.0/doc/ficl.html - copied unchanged from r282803, vendor/ficl/dist/doc/ficl.html vendor/ficl/4.1.0/doc/index.html - copied unchanged from r282803, vendor/ficl/dist/doc/index.html vendor/ficl/4.1.0/ficl.dsw - copied unchanged from r282803, vendor/ficl/dist/ficl.dsw vendor/ficl/4.1.0/ficl.h - copied unchanged from r282803, vendor/ficl/dist/ficl.h vendor/ficl/4.1.0/fileaccess.c - copied unchanged from r282803, vendor/ficl/dist/fileaccess.c vendor/ficl/4.1.0/float.c - copied unchanged from r282803, vendor/ficl/dist/float.c
svn commit: r282805 - in head: sbin/ifconfig sys/netinet6
Author: hrs
Date: Tue May 12 03:31:57 2015
New Revision: 282805
URL: https://svnweb.freebsd.org/changeset/base/282805
Log:
- Remove ND6_IFF_IGNORELOOP. This functionality was useless in practice
because a link where looped back NS messages are permanently observed
does not work with either NDP or ARP for IPv4.
- draft-ietf-6man-enhanced-dad is now RFC 7527.
Discussed with: hiren
MFC after:3 days
Modified:
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifconfig.8
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_nbr.c
Modified: head/sbin/ifconfig/af_inet6.c
==
--- head/sbin/ifconfig/af_inet6.c Tue May 12 03:29:50 2015
(r282804)
+++ head/sbin/ifconfig/af_inet6.c Tue May 12 03:31:57 2015
(r282805)
@@ -486,8 +486,6 @@ static struct cmd inet6_cmds[] = {
DEF_CMD(-no_prefer_iface,-ND6_IFF_NO_PREFER_IFACE,setnd6flags),
DEF_CMD(no_dad, ND6_IFF_NO_DAD, setnd6flags),
DEF_CMD(-no_dad, -ND6_IFF_NO_DAD,setnd6flags),
- DEF_CMD(ignoreloop, ND6_IFF_IGNORELOOP, setnd6flags),
- DEF_CMD(-ignoreloop, -ND6_IFF_IGNORELOOP,setnd6flags),
DEF_CMD_ARG(pltime, setip6pltime),
DEF_CMD_ARG(vltime, setip6vltime),
DEF_CMD(eui64,0, setip6eui64),
Modified: head/sbin/ifconfig/ifconfig.8
==
--- head/sbin/ifconfig/ifconfig.8 Tue May 12 03:29:50 2015
(r282804)
+++ head/sbin/ifconfig/ifconfig.8 Tue May 12 03:31:57 2015
(r282805)
@@ -28,7 +28,7 @@
.\ From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
.\ $FreeBSD$
.\
-.Dd March 6, 2015
+.Dd May 12, 2015
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -692,15 +692,6 @@ Set a flag to disable Duplicate Address
.It Cm -no_dad
Clear a flag
.Cm no_dad .
-.It Cm ignoreloop
-Set a flag to disable loopback detection in Enhanced Duplicate Address
-Detection Algorithm.
-When this flag is set,
-Duplicate Address Detection will stop in a finite number of probings
-even if a loopback configuration is detected.
-.It Cm -ignoreloop
-Clear a flag
-.Cm ignoreloop .
.El
.Pp
The following parameters are specific for IPv6 addresses.
Modified: head/sys/netinet6/nd6.h
==
--- head/sys/netinet6/nd6.h Tue May 12 03:29:50 2015(r282804)
+++ head/sys/netinet6/nd6.h Tue May 12 03:31:57 2015(r282805)
@@ -87,8 +87,7 @@ struct nd_ifinfo {
#define ND6_IFF_AUTO_LINKLOCAL 0x20
#defineND6_IFF_NO_RADR 0x40
#define ND6_IFF_NO_PREFER_IFACE0x80 /* XXX: not related to ND. */
-#define ND6_IFF_IGNORELOOP 0x100
-#define ND6_IFF_NO_DAD 0x200
+#define ND6_IFF_NO_DAD 0x100
#defineND6_CREATE LLE_CREATE
#defineND6_EXCLUSIVE LLE_EXCLUSIVE
Modified: head/sys/netinet6/nd6_nbr.c
==
--- head/sys/netinet6/nd6_nbr.c Tue May 12 03:29:50 2015(r282804)
+++ head/sys/netinet6/nd6_nbr.c Tue May 12 03:31:57 2015(r282805)
@@ -1445,10 +1445,9 @@ nd6_dad_timer(struct dadq *dp)
dp-dad_ns_lcount 0
dp-dad_ns_lcount dp-dad_loopbackprobe) {
/*
-* A looped back probe is detected,
-* Sec. 4.1 in draft-ietf-6man-enhanced-dad-13
-* requires transmission of additional probes until
-* the loopback condition becomes clear.
+* Sec. 4.1 in RFC 7527 requires transmission of
+* additional probes until the loopback condition
+* becomes clear when a looped back probe is detected.
*/
log(LOG_ERR, %s: a looped back NS message is
detected during DAD for %s.
@@ -1457,16 +1456,6 @@ nd6_dad_timer(struct dadq *dp)
ip6_sprintf(ip6buf, IFA_IN6(ifa)));
dp-dad_loopbackprobe = dp-dad_ns_lcount;
/*
-* An interface with IGNORELOOP is one which a
-* loopback is permanently expected while regular
-* traffic works. In that case, stop DAD after
-* MAX_MULTICAST_SOLICIT number of NS messages
-* regardless of the number of received loopback NS
-* by increasing dad_loopbackprobe in advance.
-*/
- if (ND_IFINFO(ifa-ifa_ifp)-flags ND6_IFF_IGNORELOOP)
- dp-dad_loopbackprobe += V_nd6_mmaxtries;
-
svn commit: r282806 - head/sys/net
Author: hrs Date: Tue May 12 03:35:45 2015 New Revision: 282806 URL: https://svnweb.freebsd.org/changeset/base/282806 Log: Fix a panic when VIMAGE is enabled. Spotted by: Nikos Vassiliadis Modified: head/sys/net/if_bridge.c Modified: head/sys/net/if_bridge.c == --- head/sys/net/if_bridge.cTue May 12 03:31:57 2015(r282805) +++ head/sys/net/if_bridge.cTue May 12 03:35:45 2015(r282806) @@ -3065,9 +3065,11 @@ bridge_state_change(struct ifnet *ifp, i discarding }; + CURVNET_SET(ifp-if_vnet); if (V_log_stp) log(LOG_NOTICE, %s: state changed to %s on %s\n, sc-sc_ifp-if_xname, stpstates[state], ifp-if_xname); + CURVNET_RESTORE(); } /* ___ 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: r282807 - stable/10/sys/netinet6
Author: hrs Date: Tue May 12 03:49:18 2015 New Revision: 282807 URL: https://svnweb.freebsd.org/changeset/base/282807 Log: MFC r274223 (by glebius): Remove VNET_SYSCTL_ARG(). The generic sysctl(9) code handles that. A panic could occur by sysctl -a when using VIMAGE-enabled stable/10 kernel after r262734 because of this missing MFC. Modified: stable/10/sys/netinet6/in6_proto.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet6/in6_proto.c == --- stable/10/sys/netinet6/in6_proto.c Tue May 12 03:35:45 2015 (r282806) +++ stable/10/sys/netinet6/in6_proto.c Tue May 12 03:49:18 2015 (r282807) @@ -474,8 +474,6 @@ sysctl_ip6_temppltime(SYSCTL_HANDLER_ARG int error = 0; int old; - VNET_SYSCTL_ARG(req, arg1); - error = SYSCTL_OUT(req, arg1, sizeof(int)); if (error || !req-newptr) return (error); @@ -495,8 +493,6 @@ sysctl_ip6_tempvltime(SYSCTL_HANDLER_ARG int error = 0; int old; - VNET_SYSCTL_ARG(req, arg1); - error = SYSCTL_OUT(req, arg1, sizeof(int)); if (error || !req-newptr) return (error); ___ 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: r282795 - head/release
Author: gjb
Date: Tue May 12 00:58:17 2015
New Revision: 282795
URL: https://svnweb.freebsd.org/changeset/base/282795
Log:
Provide the correct path to the checksum file.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:55:28 2015
(r282794)
+++ head/release/Makefile.mirrors Tue May 12 00:58:17 2015
(r282795)
@@ -93,7 +93,7 @@ iso-images-stage:
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
cd ${ISO_DIR} \
ln -s \
-
../../${TARGET}/${TARGET_ARCH}/${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
+
../../${TARGET}/${TARGET_ARCH}/CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
. endfor
.else # !snapshot
cd ${TLD}/ISO-IMAGES/${REVISION} ln -s \
___
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: r282796 - head/release
Author: gjb
Date: Tue May 12 01:04:02 2015
New Revision: 282796
URL: https://svnweb.freebsd.org/changeset/base/282796
Log:
Fix more path variables.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:58:17 2015
(r282795)
+++ head/release/Makefile.mirrors Tue May 12 01:04:02 2015
(r282796)
@@ -91,7 +91,7 @@ iso-images-stage:
. endif
cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
- cd ${ISO_DIR} \
+ cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
../../${TARGET}/${TARGET_ARCH}/CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
. endfor
___
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: r282799 - head/release
Author: gjb
Date: Tue May 12 01:27:58 2015
New Revision: 282799
URL: https://svnweb.freebsd.org/changeset/base/282799
Log:
Avoid polluting the filesystem when not necessary.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 01:20:27 2015
(r282798)
+++ head/release/Makefile.mirrors Tue May 12 01:27:58 2015
(r282799)
@@ -14,8 +14,8 @@
.include ${.CURDIR}/Makefile
-FTPDIR?= /ftp
RELEASEDIR?= /R
+FTPDIR?= ${RELEASEDIR}/ftp-stage
STAGE_TARGETS?=iso-images-stage
# 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: r282792 - head/release
Author: gjb
Date: Tue May 12 00:39:01 2015
New Revision: 282792
URL: https://svnweb.freebsd.org/changeset/base/282792
Log:
Fix a few incorrect variables and/or hard-coded paths.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:33:18 2015
(r282791)
+++ head/release/Makefile.mirrors Tue May 12 00:39:01 2015
(r282792)
@@ -66,8 +66,8 @@ iso-images-stage:
. for IMAGE in ${IMAGES}
cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE} \
${ISO_DIR}/${OSRELEASE}-${IMAGE}
-. if exists(/R/${IMAGE}.xz)
- cp -p ${RELEASEDIR}/${IMAGE}.xz \
+. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
+ cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
. endif
. endfor
___
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: r282794 - head/release
Author: gjb
Date: Tue May 12 00:55:28 2015
New Revision: 282794
URL: https://svnweb.freebsd.org/changeset/base/282794
Log:
Also symlink the CHECKSUM.{SHA256,MD5} files.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 00:46:32 2015
(r282793)
+++ head/release/Makefile.mirrors Tue May 12 00:55:28 2015
(r282794)
@@ -91,6 +91,9 @@ iso-images-stage:
. endif
cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
+ cd ${ISO_DIR} \
+ ln -s \
+
../../${TARGET}/${TARGET_ARCH}/${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
. endfor
.else # !snapshot
cd ${TLD}/ISO-IMAGES/${REVISION} ln -s \
___
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: r282797 - head/release
Author: gjb
Date: Tue May 12 01:14:21 2015
New Revision: 282797
URL: https://svnweb.freebsd.org/changeset/base/282797
Log:
Fix more paths to the actual files.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue May 12 01:04:02 2015
(r282796)
+++ head/release/Makefile.mirrors Tue May 12 01:14:21 2015
(r282797)
@@ -83,7 +83,7 @@ iso-images-stage:
${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
-
../../${TARGET}/${TARGET_ARCH}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
+
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
. endfor
. for CHECKSUM in ${CHECKSUM_FILES}
. if exists(${ISO_DIR}/CHECKSUM.${CHECKSUM})
@@ -93,11 +93,11 @@ iso-images-stage:
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
cd ${TLD}/ISO-IMAGES/${REVISION} \
ln -s \
-
../../${TARGET}/${TARGET_ARCH}/CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
+
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
. endfor
.else # !snapshot
cd ${TLD}/ISO-IMAGES/${REVISION} ln -s \
- ../../${TARGET}/${TARGET_ARCH}/${OSRELEASE}-${IMAGE} .
+
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE} .
cd ${ISO_DIR} ${CHECKSUM:tl} ${OSRELEASE}* \
CHECKSUM.${CHECKSUM}-${REVISION}-${BRANCH}-${SNAP_SUFFIX}
.endif
___
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: r282736 - in head: . lib/libmd
On 5/11/2015 7:53 PM, Xin Li wrote: On 05/11/15 17:23, Bryan Drewery wrote: The libmd changes break pkg - so all packages. http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/ logs/pkg-1.5.2.log CCLD pkg-static /usr/lib/liblzma.a(check.o): In function `lzma_check_init': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0x5e): undefined reference to `_libmd_SHA256_Init' /usr/lib/liblzma.a(check.o): In function `lzma_check_update': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0xbf): undefined reference to `_libmd_SHA256_Update' /usr/lib/liblzma.a(check.o): In function `lzma_check_finish': /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr ib/xz/src/liblzma/check/check.c:(.text+0x10d): undefined reference to `_libmd_SHA256_Final' cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [pkg-static] Error code 1 Can you please just revert this and 282726 until they are working and have a passing exp-run? Looks like this is because my change (r282775) which makes libmd a dependency of liblzma, while pkg didn't catch up with, and it's unrelated to libmd change. A quick hack would be: --- src/Makefile.in.orig 2015-05-11 17:49:52.690333554 -0700 +++ src/Makefile.in 2015-05-11 17:50:03.427853585 -0700 @@ -617,7 +617,7 @@ $(top_builddir)/compat/libbsd_compat.la \ $(top_builddir)/external/libsbuf_static.la $(pkg_OBJECTS) \ @LIBJAIL_LIB@ @LDNS_LIBS@ @OS_LIBS@ -larchive -lz -lutil -lbz2 \ - -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ + -lmd -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ $(am__append_3) DYNPROG = pkg @BUILD_STATIC_TRUE@pkg_static_LDFLAGS = -all-static But it would break earlier FreeBSD. Should I revert my change and request for a exp-run? Please. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
svn commit: r282798 - head/release
Author: gjb Date: Tue May 12 01:20:27 2015 New Revision: 282798 URL: https://svnweb.freebsd.org/changeset/base/282798 Log: After the last influx of commits, and a REALLY BIG WARNING to the top of the file. Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.mirrors Modified: head/release/Makefile.mirrors == --- head/release/Makefile.mirrors Tue May 12 01:14:21 2015 (r282797) +++ head/release/Makefile.mirrors Tue May 12 01:20:27 2015 (r282798) @@ -5,6 +5,10 @@ # You probably do not want to use this. Really. # You have been warned. # +# Seriously. +# +# Don't use this unless you know why you're using it. +# # $FreeBSD$ # ___ 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: r282808 - head/lib/liblzma
Author: delphij
Date: Tue May 12 05:42:13 2015
New Revision: 282808
URL: https://svnweb.freebsd.org/changeset/base/282808
Log:
Revert r282775 for now. The added dependency would cause problems for
e.g. ports-mgmt/pkg and we would like to do an exp-build.
Requested by: bdrewery
Modified:
head/lib/liblzma/Makefile
head/lib/liblzma/Symbol.map
head/lib/liblzma/config.h
Modified: head/lib/liblzma/Makefile
==
--- head/lib/liblzma/Makefile Tue May 12 03:49:18 2015(r282807)
+++ head/lib/liblzma/Makefile Tue May 12 05:42:13 2015(r282808)
@@ -77,7 +77,8 @@ SRCS+=common.c \
.PATH: ${LZMADIR}/check
SRCS+= check.c \
crc32_table.c \
- crc64_table.c
+ crc64_table.c \
+ sha256.c
.if defined(MACHINE_ARCH) ${MACHINE_ARCH} == i386
SRCS+= crc32_x86.S \
crc64_x86.S
@@ -145,7 +146,7 @@ CFLAGS+=-DHAVE_CONFIG_H \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
-LIBADD+= md pthread
+LIBADD+= pthread
VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
Modified: head/lib/liblzma/Symbol.map
==
--- head/lib/liblzma/Symbol.map Tue May 12 03:49:18 2015(r282807)
+++ head/lib/liblzma/Symbol.map Tue May 12 05:42:13 2015(r282808)
@@ -180,6 +180,9 @@ XZprivate_1.0 {
lzma_raw_coder_memusage;
lzma_raw_decoder_init;
lzma_raw_encoder_init;
+ lzma_sha256_finish;
+ lzma_sha256_init;
+ lzma_sha256_update;
lzma_simple_arm_decoder_init;
lzma_simple_arm_encoder_init;
lzma_simple_armthumb_decoder_init;
Modified: head/lib/liblzma/config.h
==
--- head/lib/liblzma/config.h Tue May 12 03:49:18 2015(r282807)
+++ head/lib/liblzma/config.h Tue May 12 05:42:13 2015(r282808)
@@ -203,13 +203,16 @@
/* #undef HAVE_SHA256INIT */
/* Define to 1 if the system has the type `SHA256_CTX'. */
-#define HAVE_SHA256_CTX 1
+/* FreeBSD - disabled libmd SHA256 for now */
+/* #undef HAVE_SHA256_CTX */
/* Define to 1 if you have the sha256.h header file. */
-#define HAVE_SHA256_H 1
+/* FreeBSD - disabled libmd SHA256 for now */
+/* #undef HAVE_SHA256_H */
/* Define to 1 if you have the `SHA256_Init' function. */
-#define HAVE_SHA256_INIT 1
+/* FreeBSD - disabled libmd SHA256 for now */
+/* #undef HAVE_SHA256_INIT */
/* Define to 1 if the system has the type `SHA2_CTX'. */
/* #undef HAVE_SHA2_CTX */
___
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: r282672 - head/etc/rc.d
On 11 May 2015 at 12:18, Brooks Davis bro...@freebsd.org wrote:
On Sun, May 10, 2015 at 03:45:48PM -0400, John Baldwin wrote:
On May 8, 2015, at 19:36, Xin LI delp...@freebsd.org wrote:
Author: delphij
Date: Fri May 8 23:36:31 2015
New Revision: 282672
URL: https://svnweb.freebsd.org/changeset/base/282672
Log:
Always convert uuid to lower case.
MFC after:2 weeks
Modified:
head/etc/rc.d/hostid
Modified: head/etc/rc.d/hostid
==
--- head/etc/rc.d/hostidFri May 8 23:29:42 2015(r282671)
+++ head/etc/rc.d/hostidFri May 8 23:36:31 2015(r282672)
@@ -58,7 +58,7 @@ hostid_set()
valid_hostid()
{
-uuid=$1
+uuid=$(echo $1 | tr '[:upper:]' '[:lower:]')
tr is in /usr/bin so this breaks systems with a separate /usr. Perhaps you
could use dd with conv=lcase instead?
Alterntively, a shell function ltr exists in rc.subr for this purpose.
Why does the hostid need to be lowercase in the first place?
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
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: r282800 - vendor/ficl
Author: pfg Date: Tue May 12 02:28:15 2015 New Revision: 282800 URL: https://svnweb.freebsd.org/changeset/base/282800 Log: Revert r282768, r282769: Reset ficl - it will be reimported cleanly from 3.0.3. Deleted: vendor/ficl/ Modified: Directory Properties: vendor/ (props changed) ___ 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: r282801 - in vendor/ficl: . dist dist/doc dist/softwords dist/test
Author: pfg Date: Tue May 12 02:36:33 2015 New Revision: 282801 URL: https://svnweb.freebsd.org/changeset/base/282801 Log: Bring ficl to the vendor area. We currently use ficl3 in ~sys/boot/ficl but it has a bunch of local changes. WWW: http://ficl.sourceforge.net/ Discussed with: dteske, mr Added: vendor/ficl/ vendor/ficl/dist/ vendor/ficl/dist/Makefile.linux (contents, props changed) vendor/ficl/dist/ReadMe.txt (contents, props changed) vendor/ficl/dist/dict.c (contents, props changed) vendor/ficl/dist/doc/ vendor/ficl/dist/doc/Logo.jpg (contents, props changed) vendor/ficl/dist/doc/favicon.ico (contents, props changed) vendor/ficl/dist/doc/ficl.html (contents, props changed) vendor/ficl/dist/doc/ficl1.ico (contents, props changed) vendor/ficl/dist/doc/ficl_debug.html (contents, props changed) vendor/ficl/dist/doc/ficl_guts.htm vendor/ficl/dist/doc/ficl_loc.html (contents, props changed) vendor/ficl/dist/doc/ficl_logo.jpg (contents, props changed) vendor/ficl/dist/doc/ficl_oop.html (contents, props changed) vendor/ficl/dist/doc/ficl_oop.jpg (contents, props changed) vendor/ficl/dist/doc/ficl_parse.html (contents, props changed) vendor/ficl/dist/doc/ficl_rel.html (contents, props changed) vendor/ficl/dist/doc/ficl_top.jpg (contents, props changed) vendor/ficl/dist/doc/ficlddj.PDF (contents, props changed) vendor/ficl/dist/doc/ficlheader.js vendor/ficl/dist/doc/index.html (contents, props changed) vendor/ficl/dist/doc/jwsforml.PDF (contents, props changed) vendor/ficl/dist/doc/oo_in_c.html (contents, props changed) vendor/ficl/dist/doc/primer.txt (contents, props changed) vendor/ficl/dist/doc/sigplan9906.doc (contents, props changed) vendor/ficl/dist/doc/skey.gif (contents, props changed) vendor/ficl/dist/ficl.c (contents, props changed) vendor/ficl/dist/ficl.dsp vendor/ficl/dist/ficl.dsw vendor/ficl/dist/ficl.h (contents, props changed) vendor/ficl/dist/fileaccess.c (contents, props changed) vendor/ficl/dist/float.c (contents, props changed) vendor/ficl/dist/math64.c (contents, props changed) vendor/ficl/dist/math64.h (contents, props changed) vendor/ficl/dist/prefix.c (contents, props changed) vendor/ficl/dist/search.c (contents, props changed) vendor/ficl/dist/softcore.c (contents, props changed) vendor/ficl/dist/softwords/ vendor/ficl/dist/softwords/classes.fr vendor/ficl/dist/softwords/ficlclass.fr vendor/ficl/dist/softwords/ficllocal.fr vendor/ficl/dist/softwords/fileaccess.fr vendor/ficl/dist/softwords/forml.fr vendor/ficl/dist/softwords/ifbrack.fr vendor/ficl/dist/softwords/jhlocal.fr vendor/ficl/dist/softwords/makefile (contents, props changed) vendor/ficl/dist/softwords/marker.fr vendor/ficl/dist/softwords/oo.fr vendor/ficl/dist/softwords/oo.fr.bak vendor/ficl/dist/softwords/prefix.fr vendor/ficl/dist/softwords/softcore.bat vendor/ficl/dist/softwords/softcore.fr vendor/ficl/dist/softwords/softcore.pl (contents, props changed) vendor/ficl/dist/softwords/softcore.py (contents, props changed) vendor/ficl/dist/softwords/softcore.py.bat vendor/ficl/dist/softwords/string.fr vendor/ficl/dist/softwords/win32.fr vendor/ficl/dist/stack.c (contents, props changed) vendor/ficl/dist/sysdep.c (contents, props changed) vendor/ficl/dist/sysdep.h (contents, props changed) vendor/ficl/dist/test/ vendor/ficl/dist/test/asm68k.4th vendor/ficl/dist/test/core.fr vendor/ficl/dist/test/fib.fr vendor/ficl/dist/test/ficltest.fr vendor/ficl/dist/test/ooptest.fr vendor/ficl/dist/test/prefix.fr vendor/ficl/dist/test/sarray.fr vendor/ficl/dist/test/testcase.fr vendor/ficl/dist/test/tester.fr vendor/ficl/dist/test/vocab.fr vendor/ficl/dist/testmain.c (contents, props changed) vendor/ficl/dist/tools.c (contents, props changed) vendor/ficl/dist/unix.c (contents, props changed) vendor/ficl/dist/vm.c (contents, props changed) vendor/ficl/dist/win32.c (contents, props changed) vendor/ficl/dist/words.c (contents, props changed) Added: vendor/ficl/dist/Makefile.linux == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ficl/dist/Makefile.linux Tue May 12 02:36:33 2015 (r282801) @@ -0,0 +1,52 @@ +OBJECTS= dict.o ficl.o fileaccess.o float.o math64.o prefix.o search.o softcore.o stack.o sysdep.o tools.o unix.o vm.o words.o +HEADERS= ficl.h math64.h sysdep.h +# +# Flags for shared library +TARGET= -Dlinux # riscos MOTO_CPU32 +SHFLAGS = -fPIC +CFLAGS= -O -c $(SHFLAGS) $(TARGET) +CC=gcc +LIB = ar cr +RANLIB = ranlib + +MAJOR = 3 +MINOR = 0.1 + +ficl: testmain.o ficl.h sysdep.h libficl.a + $(CC) testmain.o -o ficl -L. -lficl -lm + +lib: libficl.so.$(MAJOR).$(MINOR) + +# static library build +libficl.a: $(OBJECTS) + $(LIB) libficl.a $(OBJECTS) +
svn commit: r282802 - vendor/ficl/3.0.3
Author: pfg Date: Tue May 12 02:38:48 2015 New Revision: 282802 URL: https://svnweb.freebsd.org/changeset/base/282802 Log: Tag ficl 3.0.3 Added: vendor/ficl/3.0.3/ - copied from r282801, vendor/ficl/dist/ ___ 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: r282774 - head/lib/libmd
Author: thomas
Date: Mon May 11 16:45:33 2015
New Revision: 282774
URL: https://svnweb.freebsd.org/changeset/base/282774
Log:
Unbreak MIPS build following rev. 282726
Introduce further adjustments to the renaming of libmd
symbols: make sure that we do not generate dangling weak
aliases, as this causes build failures on MIPS.
Tested by:sbruno
Modified:
head/lib/libmd/Makefile
head/lib/libmd/md4c.c
head/lib/libmd/md5c.c
head/lib/libmd/mdXhl.c
head/lib/libmd/rmd160c.c
head/lib/libmd/sha1c.c
head/lib/libmd/sha256c.c
head/lib/libmd/sha512c.c
Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Mon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/Makefile Mon May 11 16:45:33 2015(r282774)
@@ -42,7 +42,13 @@ CLEANFILES+= md[245]hl.c md[245].ref md[
sha0.ref sha0hl.c sha1.ref sha1hl.c shadriver \
sha256.ref sha256hl.c sha512.ref sha512hl.c
-CFLAGS+= -I${.CURDIR}
+# Define WEAK_REFS to provide weak aliases for libmd symbols
+#
+# Note that the same sources are also used internally by libcrypt,
+# in which case:
+# * macros are used to rename symbols to libcrypt internal names
+# * no weak aliases are generated
+CFLAGS+= -I${.CURDIR} -DWEAK_REFS
.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
.if exists(${MACHINE_ARCH}/sha.S)
Modified: head/lib/libmd/md4c.c
==
--- head/lib/libmd/md4c.c Mon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/md4c.c Mon May 11 16:45:33 2015(r282774)
@@ -291,6 +291,11 @@ unsigned int len;
(((UINT4)input[j+2]) 16) | (((UINT4)input[j+3]) 24);
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MD4Init
__weak_reference(_libmd_MD4Init, MD4Init);
#undef MD4Update
@@ -299,3 +304,4 @@ __weak_reference(_libmd_MD4Update, MD4Up
__weak_reference(_libmd_MD4Pad, MD4Pad);
#undef MD4Final
__weak_reference(_libmd_MD4Final, MD4Final);
+#endif
Modified: head/lib/libmd/md5c.c
==
--- head/lib/libmd/md5c.c Mon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/md5c.c Mon May 11 16:45:33 2015(r282774)
@@ -336,6 +336,11 @@ MD5Transform (state, block)
memset ((void *)x, 0, sizeof (x));
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MD5Init
__weak_reference(_libmd_MD5Init, MD5Init);
#undef MD5Update
@@ -346,3 +351,4 @@ __weak_reference(_libmd_MD5Pad, MD5Pad);
__weak_reference(_libmd_MD5Final, MD5Final);
#undef MD5Transform
__weak_reference(_libmd_MD5Transform, MD5Transform);
+#endif
Modified: head/lib/libmd/mdXhl.c
==
--- head/lib/libmd/mdXhl.c Mon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/mdXhl.c Mon May 11 16:45:33 2015(r282774)
@@ -97,6 +97,11 @@ MDXData (const void *data, unsigned int
return (MDXEnd(ctx, buf));
}
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef MDXEnd
__weak_reference(_libmd_MDXEnd, MDXEnd);
#undef MDXFile
@@ -105,3 +110,4 @@ __weak_reference(_libmd_MDXFile, MDXFile
__weak_reference(_libmd_MDXFileChunk, MDXFileChunk);
#undef MDXData
__weak_reference(_libmd_MDXData, MDXData);
+#endif
Modified: head/lib/libmd/rmd160c.c
==
--- head/lib/libmd/rmd160c.cMon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/rmd160c.cMon May 11 16:45:33 2015(r282774)
@@ -546,6 +546,11 @@ unsigned long *l;
}
#endif
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+ activated in the context of compiling these sources for internal
+ use in libcrypt.
+ */
#undef RIPEMD160_Init
__weak_reference(_libmd_RIPEMD160_Init, RIPEMD160_Init);
#undef RIPEMD160_Update
@@ -558,3 +563,4 @@ __weak_reference(_libmd_RIPEMD160_Transf
__weak_reference(_libmd_RMD160_version, RMD160_version);
#undef ripemd160_block
__weak_reference(_libmd_ripemd160_block, ripemd160_block);
+#endif
Modified: head/lib/libmd/sha1c.c
==
--- head/lib/libmd/sha1c.c Mon May 11 15:47:55 2015(r282773)
+++ head/lib/libmd/sha1c.c Mon May 11 16:45:33 2015(r282774)
@@ -488,7 +488,11 @@ SHA_CTX *c;
/* memset((char
svn commit: r282775 - head/lib/liblzma
Author: delphij
Date: Mon May 11 17:49:07 2015
New Revision: 282775
URL: https://svnweb.freebsd.org/changeset/base/282775
Log:
Revert r281372, it's no longer needed after r282726 (fix for PR 199119) as the
symbol conflict between libmd and libcrypto have been solved.
Modified:
head/lib/liblzma/Makefile
head/lib/liblzma/Symbol.map
head/lib/liblzma/config.h
Modified: head/lib/liblzma/Makefile
==
--- head/lib/liblzma/Makefile Mon May 11 16:45:33 2015(r282774)
+++ head/lib/liblzma/Makefile Mon May 11 17:49:07 2015(r282775)
@@ -77,8 +77,7 @@ SRCS+=common.c \
.PATH: ${LZMADIR}/check
SRCS+= check.c \
crc32_table.c \
- crc64_table.c \
- sha256.c
+ crc64_table.c
.if defined(MACHINE_ARCH) ${MACHINE_ARCH} == i386
SRCS+= crc32_x86.S \
crc64_x86.S
@@ -146,7 +145,7 @@ CFLAGS+=-DHAVE_CONFIG_H \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
-LIBADD+= pthread
+LIBADD+= md pthread
VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
Modified: head/lib/liblzma/Symbol.map
==
--- head/lib/liblzma/Symbol.map Mon May 11 16:45:33 2015(r282774)
+++ head/lib/liblzma/Symbol.map Mon May 11 17:49:07 2015(r282775)
@@ -180,9 +180,6 @@ XZprivate_1.0 {
lzma_raw_coder_memusage;
lzma_raw_decoder_init;
lzma_raw_encoder_init;
- lzma_sha256_finish;
- lzma_sha256_init;
- lzma_sha256_update;
lzma_simple_arm_decoder_init;
lzma_simple_arm_encoder_init;
lzma_simple_armthumb_decoder_init;
Modified: head/lib/liblzma/config.h
==
--- head/lib/liblzma/config.h Mon May 11 16:45:33 2015(r282774)
+++ head/lib/liblzma/config.h Mon May 11 17:49:07 2015(r282775)
@@ -203,16 +203,13 @@
/* #undef HAVE_SHA256INIT */
/* Define to 1 if the system has the type `SHA256_CTX'. */
-/* FreeBSD - disabled libmd SHA256 for now */
-/* #undef HAVE_SHA256_CTX */
+#define HAVE_SHA256_CTX 1
/* Define to 1 if you have the sha256.h header file. */
-/* FreeBSD - disabled libmd SHA256 for now */
-/* #undef HAVE_SHA256_H */
+#define HAVE_SHA256_H 1
/* Define to 1 if you have the `SHA256_Init' function. */
-/* FreeBSD - disabled libmd SHA256 for now */
-/* #undef HAVE_SHA256_INIT */
+#define HAVE_SHA256_INIT 1
/* Define to 1 if the system has the type `SHA2_CTX'. */
/* #undef HAVE_SHA2_CTX */
___
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: r282736 - in head: . lib/libmd
* Sean Bruno, 2015-05-11 : Yep, it looks like it DTRT here. Thanks! Thanks for your feedback! Patch committed as rev. 282774. Thomas. ___ 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
