svn commit: r312404 - head/usr.bin/sed
Author: delphij
Date: Thu Jan 19 08:01:35 2017
New Revision: 312404
URL: https://svnweb.freebsd.org/changeset/base/312404
Log:
Use S_ISREG instead of manual & (also it's better to compare the
result from & and the pattern instead of just assuming it's one bit
value).
Pointed out by Tianjie Mao .
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D4827
Modified:
head/usr.bin/sed/main.c
Modified: head/usr.bin/sed/main.c
==
--- head/usr.bin/sed/main.c Thu Jan 19 07:29:52 2017(r312403)
+++ head/usr.bin/sed/main.c Thu Jan 19 08:01:35 2017(r312404)
@@ -391,7 +391,7 @@ mf_fgets(SPACE *sp, enum e_spflag spflag
if (inplace != NULL) {
if (lstat(fname, &sb) != 0)
err(1, "%s", fname);
- if (!(sb.st_mode & S_IFREG))
+ if (!S_ISREG(sb.st_mode))
errx(1, "%s: %s %s", fname,
"in-place editing only",
"works for regular files");
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312395 - head/sbin/devd
On Wed, Jan 18, 2017 at 9:24 PM, Alan Somers wrote:
> Author: asomers
> Date: Wed Jan 18 20:24:37 2017
> New Revision: 312395
> URL: https://svnweb.freebsd.org/changeset/base/312395
>
> Log:
> Fix several Coverity CIDs in devd
>
>
Hi,
this break buildworld for mips arch:
--- devd.o ---
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc: In
function 'void event_loop()':
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: expected type-specifier
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: expected unqualified-id before 'e'
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: expected `)' before 'e'
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: expected `{' before 'e'
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: 'e' was not declared in this scope
/usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
error: expected `;' before ')' token
--- all_subdir_sbin/hastd ---
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312407 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 13:35:14 2017
New Revision: 312407
URL: https://svnweb.freebsd.org/changeset/base/312407
Log:
Remove unused union member, fifos on tmpfs are implemented in common code.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 11:17:09 2017(r312406)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 13:35:14 2017(r312407)
@@ -259,12 +259,6 @@ struct tmpfs_node {
vm_object_t tn_aobj;
}tn_reg;
-
- /* Valid when tn_type = VFIFO */
- struct tn_fifo {
- fo_rdwr_t *tn_fo_read;
- fo_rdwr_t *tn_fo_write;
- }tn_fifo;
}tn_spec;
};
LIST_HEAD(tmpfs_node_list, tmpfs_node);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312408 - head/sys/arm/ti/cpsw
Author: loos
Date: Thu Jan 19 14:05:49 2017
New Revision: 312408
URL: https://svnweb.freebsd.org/changeset/base/312408
Log:
The port number and the to_port_en flag are valid only on SOP descriptor.
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/sys/arm/ti/cpsw/if_cpsw.c
Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==
--- head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 19 13:35:14 2017
(r312407)
+++ head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 19 14:05:49 2017
(r312408)
@@ -1800,13 +1800,8 @@ cpswp_tx_enqueue(struct cpswp_softc *sc)
struct cpsw_cpdma_bd bd;
struct cpsw_slot *first_new_slot, *last, *last_old_slot, *next, *slot;
struct mbuf *m0;
- int error, flags, nsegs, seg, added = 0, padlen;
+ int error, nsegs, seg, added = 0, padlen;
- flags = 0;
- if (sc->swsc->dualemac) {
- flags = CPDMA_BD_TO_PORT |
- ((sc->unit + 1) & CPDMA_BD_PORT_MASK);
- }
/* Pull pending packets from IF queue and prep them for DMA. */
last = NULL;
first_new_slot = NULL;
@@ -1884,7 +1879,11 @@ cpswp_tx_enqueue(struct cpswp_softc *sc)
bd.bufoff = 0;
bd.buflen = segs[0].ds_len;
bd.pktlen = m_length(slot->mbuf, NULL) + padlen;
- bd.flags = CPDMA_BD_SOP | CPDMA_BD_OWNER | flags;
+ bd.flags = CPDMA_BD_SOP | CPDMA_BD_OWNER;
+ if (sc->swsc->dualemac) {
+ bd.flags |= CPDMA_BD_TO_PORT;
+ bd.flags |= ((sc->unit + 1) & CPDMA_BD_PORT_MASK);
+ }
for (seg = 1; seg < nsegs; ++seg) {
/* Save the previous buffer (which isn't EOP) */
cpsw_cpdma_write_bd(sc->swsc, slot, &bd);
@@ -1902,7 +1901,7 @@ cpswp_tx_enqueue(struct cpswp_softc *sc)
bd.bufoff = 0;
bd.buflen = segs[seg].ds_len;
bd.pktlen = 0;
- bd.flags = CPDMA_BD_OWNER | flags;
+ bd.flags = CPDMA_BD_OWNER;
}
/* Save the final buffer. */
if (padlen <= 0)
@@ -1924,7 +1923,7 @@ cpswp_tx_enqueue(struct cpswp_softc *sc)
bd.bufoff = 0;
bd.buflen = padlen;
bd.pktlen = 0;
- bd.flags = CPDMA_BD_EOP | CPDMA_BD_OWNER | flags;
+ bd.flags = CPDMA_BD_EOP | CPDMA_BD_OWNER;
cpsw_cpdma_write_bd(sc->swsc, slot, &bd);
++nsegs;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312409 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 14:27:37 2017
New Revision: 312409
URL: https://svnweb.freebsd.org/changeset/base/312409
Log:
Style fixes and comment updates.
Edit comments which explain no longer relevant details, and add
locking annotations to the struct tmpfs_node members.
Tested by:pho (as part of the larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vfsops.c
head/sys/fs/tmpfs/tmpfs_vnops.c
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 14:05:49 2017(r312408)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 14:27:37 2017(r312409)
@@ -80,8 +80,10 @@ struct tmpfs_dirent {
uint32_ttd_hash;
u_int td_namelen;
- /* Pointer to the node this entry refers to. In case this field
-* is NULL, the node is a whiteout. */
+ /*
+* Pointer to the node this entry refers to. In case this field
+* is NULL, the node is a whiteout.
+*/
struct tmpfs_node * td_node;
union {
@@ -94,21 +96,24 @@ struct tmpfs_dirent {
} ud;
};
-/* A directory in tmpfs holds a list of directory entries, which in
- * turn point to other files (which can be directories themselves).
+/*
+ * A directory in tmpfs holds a collection of directory entries, which
+ * in turn point to other files (which can be directories themselves).
*
- * In tmpfs, this list is managed by a RB-Tree, whose head is defined by
- * the struct tmpfs_dir type.
+ * In tmpfs, this collection is managed by a RB-Tree, whose head is
+ * defined by the struct tmpfs_dir type.
*
* It is important to notice that directories do not have entries for . and
* .. as other file systems do. These can be generated when requested
* based on information available by other means, such as the pointer to
* the node itself in the former case or the pointer to the parent directory
* in the latter case. This is done to simplify tmpfs's code and, more
- * importantly, to remove redundancy. */
+ * importantly, to remove redundancy.
+ */
RB_HEAD(tmpfs_dir, tmpfs_dirent);
-/* Each entry in a directory has a cookie that identifies it. Cookies
+/*
+ * Each entry in a directory has a cookie that identifies it. Cookies
* supersede offsets within directories because, given how tmpfs stores
* directories in memory, there is no such thing as an offset.
*
@@ -139,51 +144,65 @@ RB_HEAD(tmpfs_dir, tmpfs_dirent);
* a particular type. The code must be careful to only access those
* attributes that are actually allowed by the node's type.
*
- *
* Below is the key of locks used to protected the fields in the following
* structures.
- *
+ * (v) vnode lock in exclusive mode
+ * (vi) vnode lock in exclusive mode, or vnode lock in shared vnode and
+ * tn_interlock
+ * (i) tn_interlock
+ * (m) tmpfs_mount allnode_lock
+ * (c) stable after creation
*/
struct tmpfs_node {
- /* Doubly-linked list entry which links all existing nodes for a
-* single file system. This is provided to ease the removal of
-* all nodes during the unmount operation. */
- LIST_ENTRY(tmpfs_node) tn_entries;
+ /*
+* Doubly-linked list entry which links all existing nodes for
+* a single file system. This is provided to ease the removal
+* of all nodes during the unmount operation, and to support
+* the implementation of VOP_VNTOCNP().
+*/
+ LIST_ENTRY(tmpfs_node) tn_entries; /* (m) */
- /* The node's type. Any of 'VBLK', 'VCHR', 'VDIR', 'VFIFO',
+ /*
+* The node's type. Any of 'VBLK', 'VCHR', 'VDIR', 'VFIFO',
* 'VLNK', 'VREG' and 'VSOCK' is allowed. The usage of vnode
* types instead of a custom enumeration is to make things simpler
-* and faster, as we do not need to convert between two types. */
- enum vtype tn_type;
+* and faster, as we do not need to convert between two types.
+*/
+ enum vtype tn_type;/* (c) */
/* Node identifier. */
- ino_t tn_id;
+ ino_t tn_id; /* (c) */
- /* Node's internal status. This is used by several file system
+ /*
+* Node's internal status. This is used by several file system
* operations to do modifications to the node in a delayed
-* fashion. */
- int tn_status;
+* fashion.
+*/
+ int tn_status; /* (vi) */
#defineTMPFS_NODE_ACCESSED (1 << 1)
#defineTMPFS_NODE_MODIFIED (1 << 2)
#defineTMPFS_NODE_CHANGED (1 << 3)
- /* The node size. It does
svn commit: r312410 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 14:49:55 2017
New Revision: 312410
URL: https://svnweb.freebsd.org/changeset/base/312410
Log:
Rework some tmpfs lock assertions.
Remove TMPFS_ASSERT_ELOCKED(). Its claims are already stated by other
asserts nearby and by VFS guarantees.
Change TMPFS_ASSERT_LOCKED() and one inlined place to use
ASSERT_VOP_(E)LOCKED() instead of hand-rolled imprecise asserts.
Tested by:pho (as part of the larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vnops.c
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 14:27:37 2017(r312409)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 14:49:55 2017(r312410)
@@ -309,19 +309,10 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
#define TMPFS_ASSERT_LOCKED(node) do { \
MPASS(node != NULL);\
MPASS(node->tn_vnode != NULL); \
- if (!VOP_ISLOCKED(node->tn_vnode) &&\
- !mtx_owned(TMPFS_NODE_MTX(node))) \
- panic("tmpfs: node is not locked: %p", node); \
- } while (0)
-#define TMPFS_ASSERT_ELOCKED(node) do {
\
- MPASS((node) != NULL); \
- MPASS((node)->tn_vnode != NULL);\
- mtx_assert(TMPFS_NODE_MTX(node), MA_OWNED); \
- ASSERT_VOP_LOCKED((node)->tn_vnode, "tmpfs"); \
+ ASSERT_VOP_LOCKED(node->tn_vnode, "tmpfs assert"); \
} while (0)
#else
#define TMPFS_ASSERT_LOCKED(node) (void)0
-#define TMPFS_ASSERT_ELOCKED(node) (void)0
#endif
#define TMPFS_VNODE_ALLOCATING 1
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==
--- head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 14:27:37 2017
(r312409)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 14:49:55 2017
(r312410)
@@ -669,7 +669,7 @@ tmpfs_alloc_file(struct vnode *dvp, stru
struct tmpfs_node *node;
struct tmpfs_node *parent;
- MPASS(VOP_ISLOCKED(dvp));
+ ASSERT_VOP_ELOCKED(dvp, "tmpfs_alloc_file");
MPASS(cnp->cn_flags & HASBUF);
tmp = VFS_TO_TMPFS(dvp->v_mount);
Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==
--- head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 14:27:37 2017
(r312409)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 14:49:55 2017
(r312410)
@@ -,7 +,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
/* No vnode should be allocated for this entry from this point */
TMPFS_NODE_LOCK(node);
- TMPFS_ASSERT_ELOCKED(node);
node->tn_links--;
node->tn_dir.tn_parent = NULL;
node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
@@ -1120,7 +1119,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
TMPFS_NODE_UNLOCK(node);
TMPFS_NODE_LOCK(dnode);
- TMPFS_ASSERT_ELOCKED(dnode);
dnode->tn_links--;
dnode->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
TMPFS_NODE_MODIFIED;
@@ -1274,7 +1272,6 @@ tmpfs_reclaim(struct vop_reclaim_args *v
cache_purge(vp);
TMPFS_NODE_LOCK(node);
- TMPFS_ASSERT_ELOCKED(node);
tmpfs_free_vp(vp);
/* If the node referenced by this vnode was deleted by the user,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312411 - head/sys/arm/ti/cpsw
Author: loos
Date: Thu Jan 19 14:58:55 2017
New Revision: 312411
URL: https://svnweb.freebsd.org/changeset/base/312411
Log:
Handle the set capabilities ioctl, letting the hardware checksum be
disabled (Hi netmap!).
Only remove the CRC bytes from packets when the hardware tell us to do so.
Fixes the 'discard frame w/o leading ethernet header' issues.
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/sys/arm/ti/cpsw/if_cpsw.c
head/sys/arm/ti/cpsw/if_cpswreg.h
Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==
--- head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 19 14:49:55 2017
(r312410)
+++ head/sys/arm/ti/cpsw/if_cpsw.c Thu Jan 19 14:58:55 2017
(r312411)
@@ -1395,6 +1395,16 @@ cpswp_ioctl(struct ifnet *ifp, u_long co
ifr = (struct ifreq *)data;
switch (command) {
+ case SIOCSIFCAP:
+ changed = ifp->if_capenable ^ ifr->ifr_reqcap;
+ if (changed & IFCAP_HWCSUM) {
+ if ((ifr->ifr_reqcap & changed) & IFCAP_HWCSUM)
+ ifp->if_capenable |= IFCAP_HWCSUM;
+ else
+ ifp->if_capenable &= ~IFCAP_HWCSUM;
+ }
+ error = 0;
+ break;
case SIOCSIFFLAGS:
CPSW_PORT_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
@@ -1632,15 +1642,22 @@ cpsw_rx_dequeue(struct cpsw_softc *sc)
/* TODO: track SOP/EOP bits to assemble a full mbuf
out of received fragments. */
slot->mbuf->m_data += bd.bufoff;
- slot->mbuf->m_len = bd.pktlen - 4;
- slot->mbuf->m_pkthdr.len = bd.pktlen - 4;
- slot->mbuf->m_flags |= M_PKTHDR;
- slot->mbuf->m_pkthdr.rcvif = psc->ifp;
+ slot->mbuf->m_len = bd.buflen;
+ if (bd.flags & CPDMA_BD_SOP) {
+ slot->mbuf->m_pkthdr.len = bd.pktlen;
+ slot->mbuf->m_pkthdr.rcvif = psc->ifp;
+ slot->mbuf->m_flags |= M_PKTHDR;
+ }
+ slot->mbuf->m_next = NULL;
slot->mbuf->m_nextpkt = NULL;
+ if (bd.flags & CPDMA_BD_PASS_CRC)
+ m_adj(slot->mbuf, -ETHER_CRC_LEN);
if ((psc->ifp->if_capenable & IFCAP_RXCSUM) != 0) {
/* check for valid CRC by looking into pkt_err[5:4] */
- if ((bd.flags & CPDMA_BD_PKT_ERR_MASK) == 0) {
+ if ((bd.flags &
+ (CPDMA_BD_SOP | CPDMA_BD_PKT_ERR_MASK)) ==
+ CPDMA_BD_SOP) {
slot->mbuf->m_pkthdr.csum_flags |=
CSUM_IP_CHECKED;
slot->mbuf->m_pkthdr.csum_flags |=
CSUM_IP_VALID;
slot->mbuf->m_pkthdr.csum_data = 0x;
Modified: head/sys/arm/ti/cpsw/if_cpswreg.h
==
--- head/sys/arm/ti/cpsw/if_cpswreg.h Thu Jan 19 14:49:55 2017
(r312410)
+++ head/sys/arm/ti/cpsw/if_cpswreg.h Thu Jan 19 14:58:55 2017
(r312411)
@@ -191,6 +191,7 @@
#define CPDMA_BD_OWNER (1 << 13)
#define CPDMA_BD_EOQ (1 << 12)
#define CPDMA_BD_TDOWNCMPLT(1 << 11)
+#define CPDMA_BD_PASS_CRC (1 << 10)
#define CPDMA_BD_PKT_ERR_MASK (3 << 4)
#define CPDMA_BD_TO_PORT (1 << 4)
#define CPDMA_BD_PORT_MASK 3
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312412 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 15:06:18 2017
New Revision: 312412
URL: https://svnweb.freebsd.org/changeset/base/312412
Log:
Protect macro argument.
Requested by: hselasky
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 14:58:55 2017(r312411)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 15:06:18 2017(r312412)
@@ -307,9 +307,9 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
#ifdef INVARIANTS
#define TMPFS_ASSERT_LOCKED(node) do { \
- MPASS(node != NULL);\
- MPASS(node->tn_vnode != NULL); \
- ASSERT_VOP_LOCKED(node->tn_vnode, "tmpfs assert"); \
+ MPASS((node) != NULL); \
+ MPASS((node)->tn_vnode != NULL);\
+ ASSERT_VOP_LOCKED((node)->tn_vnode, "tmpfs assert");\
} while (0)
#else
#define TMPFS_ASSERT_LOCKED(node) (void)0
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312414 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 16:01:36 2017
New Revision: 312414
URL: https://svnweb.freebsd.org/changeset/base/312414
Log:
Rename tmpfs_mount member allnode_lock to include namespace prefix.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_vfsops.c
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 15:27:53 2017(r312413)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 16:01:36 2017(r312414)
@@ -150,7 +150,7 @@ RB_HEAD(tmpfs_dir, tmpfs_dirent);
* (vi) vnode lock in exclusive mode, or vnode lock in shared vnode and
* tn_interlock
* (i) tn_interlock
- * (m) tmpfs_mount allnode_lock
+ * (m) tmpfs_mount tm_allnode_lock
* (c) stable after creation
*/
struct tmpfs_node {
@@ -370,7 +370,7 @@ struct tmpfs_mount {
struct tmpfs_node_list tm_nodes_used;
/* All node lock to protect the node list and tmp_pages_used. */
- struct mtx allnode_lock;
+ struct mtx tm_allnode_lock;
/* Zones used to store file system meta data, per tmpfs mount. */
uma_zone_t tm_dirent_pool;
@@ -379,8 +379,9 @@ struct tmpfs_mount {
/* Read-only status. */
int tm_ronly;
};
-#define TMPFS_LOCK(tm) mtx_lock(&(tm)->allnode_lock)
-#define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->allnode_lock)
+#defineTMPFS_LOCK(tm) mtx_lock(&(tm)->tm_allnode_lock)
+#defineTMPFS_UNLOCK(tm) mtx_unlock(&(tm)->tm_allnode_lock)
+#defineTMPFS_MP_ASSERT_LOCKED(tm) mtx_assert(&(tm)->tm_allnode_lock,
MA_OWNED)
/*
* This structure maps a file identifier to a tmpfs node. Used by the
Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==
--- head/sys/fs/tmpfs/tmpfs_vfsops.cThu Jan 19 15:27:53 2017
(r312413)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.cThu Jan 19 16:01:36 2017
(r312414)
@@ -219,7 +219,7 @@ tmpfs_mount(struct mount *mp)
tmp = (struct tmpfs_mount *)malloc(sizeof(struct tmpfs_mount),
M_TMPFSMNT, M_WAITOK | M_ZERO);
- mtx_init(&tmp->allnode_lock, "tmpfs allnode lock", NULL, MTX_DEF);
+ mtx_init(&tmp->tm_allnode_lock, "tmpfs allnode lock", NULL, MTX_DEF);
tmp->tm_nodes_max = nodes_max;
tmp->tm_nodes_inuse = 0;
tmp->tm_maxfilesize = maxfilesize > 0 ? maxfilesize : OFF_MAX;
@@ -227,7 +227,7 @@ tmpfs_mount(struct mount *mp)
tmp->tm_pages_max = pages;
tmp->tm_pages_used = 0;
- tmp->tm_ino_unr = new_unrhdr(2, INT_MAX, &tmp->allnode_lock);
+ tmp->tm_ino_unr = new_unrhdr(2, INT_MAX, &tmp->tm_allnode_lock);
tmp->tm_dirent_pool = uma_zcreate("TMPFS dirent",
sizeof(struct tmpfs_dirent), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, 0);
@@ -316,7 +316,7 @@ tmpfs_unmount(struct mount *mp, int mntf
uma_zdestroy(tmp->tm_node_pool);
delete_unrhdr(tmp->tm_ino_unr);
- mtx_destroy(&tmp->allnode_lock);
+ mtx_destroy(&tmp->tm_allnode_lock);
MPASS(tmp->tm_pages_used == 0);
MPASS(tmp->tm_nodes_inuse == 0);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307319 - in head/sys/netinet: . tcp_stacks
On Fri, Oct 14, 2016 at 02:57:43PM +, Jonathan T. Looney wrote: > Author: jtl > Date: Fri Oct 14 14:57:43 2016 > New Revision: 307319 > URL: https://svnweb.freebsd.org/changeset/base/307319 > > Log: > The code currently resets the keepalive timer each time a packet is > received on a TCP session that has entered the ESTABLISHED state. This > results in a lot of calls to reset the keepalive timer. > > This patch changes the behavior so we set the keepalive timer for the > keepalive idle time (TP_KEEPIDLE). When the keepalive timer fires, it will > first check to see if the session has been idle for TP_KEEPIDLE ticks. If > not, it will reschedule the keepalive timer for the time the session will > have been idle for TP_KEEPIDLE ticks. > > For a session with regular communication, the keepalive timer should fire > approximately once every TP_KEEPIDLE ticks. For sessions with irregular > communication, the keepalive timer might fire more often. But, the > disruption from a periodic keepalive timer should be less than the regular > cost of resetting the keepalive timer on every packet. > > (FWIW, this change saved approximately 1.73% of the busy CPU cycles on a > particular test system with a heavy TCP output load. Of course, the > actual impact is very specific to the particular hardware and workload.) > > Reviewed by:gallatin, rrs > MFC after: 2 weeks > Sponsored by: Netflix > Differential Revision: https://reviews.freebsd.org/D8243 Some issus exist? ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312416 - head/sys/ufs/ffs
Author: cem
Date: Thu Jan 19 16:46:05 2017
New Revision: 312416
URL: https://svnweb.freebsd.org/changeset/base/312416
Log:
ffs_vnops: Simplify extattr access
As suggested in r167010, use the structure type and macros to access and
modify UFS2 extended attributes. Add assertions that pointers are
aligned in places where we now access the data through a structure
pointer, instead of character-by-character.
PR: 216127
Reported by: dewayne at heuristicsystems.com.au
Reviewed by: kib@
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D9225
Modified:
head/sys/ufs/ffs/ffs_vnops.c
Modified: head/sys/ufs/ffs/ffs_vnops.c
==
--- head/sys/ufs/ffs/ffs_vnops.cThu Jan 19 16:07:52 2017
(r312415)
+++ head/sys/ufs/ffs/ffs_vnops.cThu Jan 19 16:46:05 2017
(r312416)
@@ -100,6 +100,9 @@ __FBSDID("$FreeBSD$");
#include "opt_directio.h"
#include "opt_ffs.h"
+#defineALIGNED_TO(ptr, s) \
+ (((uintptr_t)(ptr) & (_Alignof(s) - 1)) == 0)
+
#ifdef DIRECTIO
extern int ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone);
#endif
@@ -1100,46 +1103,30 @@ ffs_extwrite(struct vnode *vp, struct ui
* the length of the EA, and possibly the pointer to the entry and to the data.
*/
static int
-ffs_findextattr(u_char *ptr, u_int length, int nspace, const char *name,
u_char **eap, u_char **eac)
+ffs_findextattr(u_char *ptr, u_int length, int nspace, const char *name,
+struct extattr **eapp, u_char **eac)
{
- u_char *p, *pe, *pn, *p0;
- int eapad1, eapad2, ealength, ealen, nlen;
- uint32_t ul;
+ struct extattr *eap, *eaend;
+ size_t nlen;
- pe = ptr + length;
nlen = strlen(name);
-
- for (p = ptr; p < pe; p = pn) {
- p0 = p;
- bcopy(p, &ul, sizeof(ul));
- pn = p + ul;
+ KASSERT(ALIGNED_TO(ptr, struct extattr), ("unaligned"));
+ eap = (struct extattr *)ptr;
+ eaend = (struct extattr *)(ptr + length);
+ for (; eap < eaend; eap = EXTATTR_NEXT(eap)) {
/* make sure this entry is complete */
- if (pn > pe)
+ if (EXTATTR_NEXT(eap) > eaend)
break;
- p += sizeof(uint32_t);
- if (*p != nspace)
- continue;
- p++;
- eapad2 = *p++;
- if (*p != nlen)
- continue;
- p++;
- if (bcmp(p, name, nlen))
+ if (eap->ea_namespace != nspace || eap->ea_namelength != nlen
+ || memcmp(eap->ea_name, name, nlen) != 0)
continue;
- ealength = sizeof(uint32_t) + 3 + nlen;
- eapad1 = 8 - (ealength % 8);
- if (eapad1 == 8)
- eapad1 = 0;
- ealength += eapad1;
- ealen = ul - ealength - eapad2;
- p += nlen + eapad1;
- if (eap != NULL)
- *eap = p0;
+ if (eapp != NULL)
+ *eapp = eap;
if (eac != NULL)
- *eac = p;
- return (ealen);
+ *eac = EXTATTR_CONTENT(eap);
+ return (EXTATTR_CONTENT_SIZE(eap));
}
- return(-1);
+ return (-1);
}
static int
@@ -1380,9 +1367,11 @@ vop_deleteextattr {
{
struct inode *ip;
struct fs *fs;
- uint32_t ealength, ul;
- int ealen, olen, eapad1, eapad2, error, i, easize;
- u_char *eae, *p;
+ struct extattr *eap;
+ uint32_t ul;
+ int olen, error, i, easize;
+ u_char *eae;
+ void *tmp;
ip = VTOI(ap->a_vp);
fs = ITOFS(ip);
@@ -1413,39 +1402,30 @@ vop_deleteextattr {
if (error)
return (error);
- ealength = eapad1 = ealen = eapad2 = 0;
-
+ /* CEM: delete could be done in-place instead */
eae = malloc(ip->i_ea_len, M_TEMP, M_WAITOK);
bcopy(ip->i_ea_area, eae, ip->i_ea_len);
easize = ip->i_ea_len;
olen = ffs_findextattr(eae, easize, ap->a_attrnamespace, ap->a_name,
- &p, NULL);
+ &eap, NULL);
if (olen == -1) {
/* delete but nonexistent */
free(eae, M_TEMP);
ffs_close_ea(ap->a_vp, 0, ap->a_cred, ap->a_td);
- return(ENOATTR);
+ return (ENOATTR);
}
- bcopy(p, &ul, sizeof ul);
- i = p - eae + ul;
- if (ul != ealength) {
- bcopy(p + ul, p + ealength, easize - i);
- easize += (ealength - ul);
- }
- if (easize > NXADDR * fs->fs_bsize) {
- free(eae, M_TEMP);
- ffs_close_ea(ap->a_vp, 0, ap->a_cred, ap->a_td);
- if (ip->i_ea_ar
svn commit: r312417 - head/sbin/devd
Author: asomers
Date: Thu Jan 19 16:59:55 2017
New Revision: 312417
URL: https://svnweb.freebsd.org/changeset/base/312417
Log:
Fix build of devd with GCC 4.2
Reported by: olivier
Pointy-hat-to:asomers
MFC after:27 days
X-MFC-with: 312395
Sponsored by: Spectra Logic Corp
Modified:
head/sbin/devd/devd.cc
Modified: head/sbin/devd/devd.cc
==
--- head/sbin/devd/devd.cc Thu Jan 19 16:46:05 2017(r312416)
+++ head/sbin/devd/devd.cc Thu Jan 19 16:59:55 2017(r312417)
@@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include "devd.h" /* C compatible definitions */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312395 - head/sbin/devd
On Thu, Jan 19, 2017 at 2:24 AM, Olivier Cochard-Labbé
wrote:
> On Wed, Jan 18, 2017 at 9:24 PM, Alan Somers wrote:
>>
>> Author: asomers
>> Date: Wed Jan 18 20:24:37 2017
>> New Revision: 312395
>> URL: https://svnweb.freebsd.org/changeset/base/312395
>>
>> Log:
>> Fix several Coverity CIDs in devd
>>
>
>
> Hi,
>
> this break buildworld for mips arch:
>
>
> --- devd.o ---
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc: In
> function 'void event_loop()':
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: expected type-specifier
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: expected unqualified-id before 'e'
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: expected `)' before 'e'
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: expected `{' before 'e'
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: 'e' was not declared in this scope
> /usr/local/poudriere/jails/head-mips32/usr/src/sbin/devd/devd.cc:1066:
> error: expected `;' before ')' token
> --- all_subdir_sbin/hastd ---
Sorry for the breakage. Should be fixed in r312417.
-Alan
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312418 - head/lib/libc/x86/sys
Author: ngie
Date: Thu Jan 19 17:03:45 2017
New Revision: 312418
URL: https://svnweb.freebsd.org/changeset/base/312418
Log:
Conditionalize hyperv support in gettimeofday(2) based on MK_HYPERV
The effect at runtime is negligible as the hyperv timer isn't available
except when hyperv is loaded.
This is a prerequisite for conditionalizing the header build/install out
of the build
MFC after:3 weeks
Reviewed by: sephe
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D9242
Modified:
head/lib/libc/x86/sys/Makefile.inc
head/lib/libc/x86/sys/__vdso_gettc.c
Modified: head/lib/libc/x86/sys/Makefile.inc
==
--- head/lib/libc/x86/sys/Makefile.inc Thu Jan 19 16:59:55 2017
(r312417)
+++ head/lib/libc/x86/sys/Makefile.inc Thu Jan 19 17:03:45 2017
(r312418)
@@ -4,3 +4,7 @@
SRCS+= \
__vdso_gettc.c
+
+.if ${MK_HYPERV} != "no"
+CFLAGS+= -DWANT_HYPERV
+.endif
Modified: head/lib/libc/x86/sys/__vdso_gettc.c
==
--- head/lib/libc/x86/sys/__vdso_gettc.cThu Jan 19 16:59:55 2017
(r312417)
+++ head/lib/libc/x86/sys/__vdso_gettc.cThu Jan 19 17:03:45 2017
(r312418)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#ifdef __amd64__
+#ifdef WANT_HYPERV
#include
#endif
#include "libc_private.h"
@@ -158,7 +158,7 @@ __vdso_init_hpet(uint32_t u)
munmap((void *)new_map, PAGE_SIZE);
}
-#ifdef __amd64__
+#ifdef WANT_HYPERV
#define HYPERV_REFTSC_DEVPATH "/dev/" HYPERV_REFTSC_DEVNAME
@@ -217,7 +217,7 @@ __vdso_hyperv_tsc(struct hyperv_reftsc *
return (ENOSYS);
}
-#endif /* __amd64__ */
+#endif /* WANT_HYPERV */
#pragma weak __vdso_gettc
int
@@ -246,7 +246,7 @@ __vdso_gettc(const struct vdso_timehands
return (ENOSYS);
*tc = *(volatile uint32_t *)(map + HPET_MAIN_COUNTER);
return (0);
-#ifdef __amd64__
+#ifdef WANT_HYPERV
case VDSO_TH_ALGO_X86_HVTSC:
if (hyperv_ref_tsc == NULL)
__vdso_init_hyperv_tsc();
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312419 - head/share/man/man4
Author: ngie
Date: Thu Jan 19 17:09:11 2017
New Revision: 312419
URL: https://svnweb.freebsd.org/changeset/base/312419
Log:
Add manpage for mlx4ib(4)
This manpage isn't differentiated from mlx4en except where necessary,
replacing eth/ETH with ib/IB.
Eventually the manpages will be split and the common bits be placed
in a manpage named "mlx4.4".
MFC after:3 weeks
Reviewed by: hselasky
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D9241
Added:
head/share/man/man4/mlx4ib.4
- copied, changed from r312391, head/share/man/man4/mlx4en.4
Modified:
head/share/man/man4/Makefile
head/share/man/man4/mlx4en.4
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileThu Jan 19 17:03:45 2017
(r312418)
+++ head/share/man/man4/MakefileThu Jan 19 17:09:11 2017
(r312419)
@@ -889,6 +889,10 @@ MAN+= iscsi_initiator.4
MAN+= iser.4
.endif
+.if ${MK_OFED} != "no"
+MAN+= mlx4ib.4
+.endif
+
.if ${MK_TESTS} != "no"
ATF=${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc
Modified: head/share/man/man4/mlx4en.4
==
--- head/share/man/man4/mlx4en.4Thu Jan 19 17:03:45 2017
(r312418)
+++ head/share/man/man4/mlx4en.4Thu Jan 19 17:09:11 2017
(r312419)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 30, 2016
+.Dd January 18, 2017
.Dt MLX4EN 4
.Os
.Sh NAME
@@ -81,6 +81,7 @@ If an issue is identified with this driv
email all the specific information related to the issue to
.Aq Mt freebsd-driv...@mellanox.com .
.Sh SEE ALSO
+.Xr mlx4ib 4 ,
.Xr ifconfig 8
.Sh HISTORY
The
Copied and modified: head/share/man/man4/mlx4ib.4 (from r312391,
head/share/man/man4/mlx4en.4)
==
--- head/share/man/man4/mlx4en.4Wed Jan 18 17:55:49 2017
(r312391, copy source)
+++ head/share/man/man4/mlx4ib.4Thu Jan 19 17:09:11 2017
(r312419)
@@ -24,11 +24,11 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 30, 2016
-.Dt MLX4EN 4
+.Dd January 18, 2017
+.Dt MLX4IB 4
.Os
.Sh NAME
-.Nm mlx4en
+.Nm mlx4ib
.Nd "Mellanox ConnectX-3 10GbE/40GbE network adapter driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
@@ -37,20 +37,20 @@ kernel configuration file:
.Bd -ragged -offset indent
.Cd "options COMPAT_LINUXKPI"
.Cd "device mlx4"
-.Cd "device mlx4en"
+.Cd "device mlx4ib"
.Ed
.Pp
To load the driver as a module at run-time,
run the following command as root:
.Bd -literal -offset indent
-kldload mlx4en
+kldload mlx4ib
.Ed
.Pp
To load the driver as a
module at boot time, place the following lines in
.Xr loader.conf 5 :
.Bd -literal -offset indent
-mlx4en_load="YES"
+mlx4ib_load="YES"
.Ed
.Sh DESCRIPTION
Mellanox ConnectX adapter cards with Virtual Protocol Interconnect
@@ -68,9 +68,9 @@ driver supports the following network ad
.Pp
.Bl -bullet -compact
.It
-Mellanox ConnectX-2 (ETH)
+Mellanox ConnectX-2 (IB)
.It
-Mellanox ConnectX-3 (ETH)
+Mellanox ConnectX-3 (IB)
.El
.Sh SUPPORT
For general information and support,
@@ -81,6 +81,7 @@ If an issue is identified with this driv
email all the specific information related to the issue to
.Aq Mt freebsd-driv...@mellanox.com .
.Sh SEE ALSO
+.Xr mlx4en 4 ,
.Xr ifconfig 8
.Sh HISTORY
The
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312422 - head/lib/libc/x86/sys
Author: ngie
Date: Thu Jan 19 18:07:24 2017
New Revision: 312422
URL: https://svnweb.freebsd.org/changeset/base/312422
Log:
Only conditionally add in hyperv support if we're building amd64
This unbreaks the build because the assembly is written for x64.
MFC after:3 weeks
X-MFC with: r312418
Pointyhat to: ngie
Reported by: Jenkins (i386 job)
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libc/x86/sys/Makefile.inc
Modified: head/lib/libc/x86/sys/Makefile.inc
==
--- head/lib/libc/x86/sys/Makefile.inc Thu Jan 19 17:58:08 2017
(r312421)
+++ head/lib/libc/x86/sys/Makefile.inc Thu Jan 19 18:07:24 2017
(r312422)
@@ -5,6 +5,6 @@
SRCS+= \
__vdso_gettc.c
-.if ${MK_HYPERV} != "no"
+.if ${MACHINE_CPUARCH} == "amd64" && ${MK_HYPERV} != "no"
CFLAGS+= -DWANT_HYPERV
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312423 - head/share/man/man5
Author: kib Date: Thu Jan 19 18:26:06 2017 New Revision: 312423 URL: https://svnweb.freebsd.org/changeset/base/312423 Log: Refresh tmpfs(5) man page. Provide more useful explanation of features and quirks. Reviewed by: emaste, vangyzen Sponsored by: The FreeBSD Foundation MFC after:1 week Differential revision:https://reviews.freebsd.org/D9211 Modified: head/share/man/man5/tmpfs.5 Modified: head/share/man/man5/tmpfs.5 == --- head/share/man/man5/tmpfs.5 Thu Jan 19 18:07:24 2017(r312422) +++ head/share/man/man5/tmpfs.5 Thu Jan 19 18:26:06 2017(r312423) @@ -1,7 +1,12 @@ .\"- .\" Copyright (c) 2007 Xin LI +.\" Copyright (c) 2017 The FreeBSD Foundation, Inc. .\" All rights reserved. .\" +.\" Part of this documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -49,12 +54,12 @@ .\" .\" $FreeBSD$ .\" -.Dd April 23, 2012 +.Dd January 17, 2017 .Dt TMPFS 5 .Os .Sh NAME .Nm tmpfs -.Nd "efficient memory file system" +.Nd "in-memory file system" .Sh SYNOPSIS To compile this driver into the kernel, place the following line in your @@ -72,17 +77,40 @@ tmpfs_load="YES" .Sh DESCRIPTION The .Nm -driver will permit the -.Fx -kernel to access +driver implements in-memory, or .Tn tmpfs -file systems. +file system. +The filesystem stores both file metadata and data in main memory. +This allows very fast and low latency accesses to the data. +The data is volatile. +An umount or system reboot invalidates it. +These properties make the filesystem's mounts suitable for fast +scratch storage, e.g. +.Pa /tmp . +.Pp +If the system becomes low on memory and swap is configured (see +.Xr swapon 8 ), +file data may be written to the swap space, freeing memory +for other needs. +The current implementation never swaps out metadata, including +the directory content. +Keep this in mind when planning the mount limits, especially when expecting +to place many small files on a tmpfs mount. +.Pp +When a file from a tmpfs mount is mmaped (see +.Xr mmap 2 ) +into the process address space, the swap VM object which manages the file +pages is used to implement mapping and to avoid double-copying of +the file data. +This quirk causes process inspection tools, like +.Xr procstat 1 , +to report anonymous memory mappings instead of file mappings. .Sh OPTIONS The following options are available when mounting .Nm file systems: -.Bl -tag -width indent +.Bl -tag -width "It Cm maxfilesize" .It Cm gid Specifies the group ID of the root inode of the file system. Defaults to the mount point's GID. @@ -114,11 +142,15 @@ memory file system: .Pp .Dl "mount -t tmpfs tmpfs /tmp" .Sh SEE ALSO +.Xr procstat 1 , .Xr nmount 2 , +.Xr mmap 2 , .Xr unmount 2 , .Xr fstab 5 , .Xr mdmfs 8 , -.Xr mount 8 +.Xr mount 8 , +.Xr swapinfo 8 , +.Xr swapon 8 .Sh HISTORY The .Nm @@ -130,7 +162,7 @@ The .Nm kernel implementation was written by .An Julio M. Merino Vidal Aq Mt j...@netbsd.org -as a Google SoC project. +as a Google Summer of Code project. .Pp .An Rohit Jalan and others ported it from @@ -140,5 +172,3 @@ to .Pp This manual page was written by .An Xin LI Aq Mt delp...@freebsd.org . -.Sh BUGS -Some file system mount time options may not be well-supported. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312424 - head/sys/dev/usb/controller
Author: hselasky
Date: Thu Jan 19 18:33:27 2017
New Revision: 312424
URL: https://svnweb.freebsd.org/changeset/base/312424
Log:
Fix problem with suspend and resume when using Skylake chipsets. Make
sure the XHCI controller is reset after halting it. The problem is
clearly a BIOS bug as the suspend and resume is failing without
loading the XHCI driver. The same happens when using Linux and the
XHCI driver is not loaded.
Submitted by: Yanko Yankulov
PR: 216261
MFC after:1 week
Modified:
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/controller/xhci.h
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/usb/controller/xhci.c
==
--- head/sys/dev/usb/controller/xhci.c Thu Jan 19 18:26:06 2017
(r312423)
+++ head/sys/dev/usb/controller/xhci.c Thu Jan 19 18:33:27 2017
(r312424)
@@ -347,6 +347,7 @@ xhci_start_controller(struct xhci_softc
struct usb_page_search buf_res;
struct xhci_hw_root *phwr;
struct xhci_dev_ctx_addr *pdctxa;
+ usb_error_t err;
uint64_t addr;
uint32_t temp;
uint16_t i;
@@ -358,22 +359,9 @@ xhci_start_controller(struct xhci_softc
sc->sc_command_ccs = 1;
sc->sc_command_idx = 0;
- /* Reset controller */
- XWRITE4(sc, oper, XHCI_USBCMD, XHCI_CMD_HCRST);
-
- for (i = 0; i != 100; i++) {
- usb_pause_mtx(NULL, hz / 100);
- temp = (XREAD4(sc, oper, XHCI_USBCMD) & XHCI_CMD_HCRST) |
- (XREAD4(sc, oper, XHCI_USBSTS) & XHCI_STS_CNR);
- if (!temp)
- break;
- }
-
- if (temp) {
- device_printf(sc->sc_bus.parent, "Controller "
- "reset timeout.\n");
- return (USB_ERR_IOERROR);
- }
+ err = xhci_reset_controller(sc);
+ if (err)
+ return (err);
/* set up number of device slots */
DPRINTF("CONFIG=0x%08x -> 0x%08x\n",
@@ -521,6 +509,33 @@ xhci_halt_controller(struct xhci_softc *
}
usb_error_t
+xhci_reset_controller(struct xhci_softc *sc)
+{
+ uint32_t temp = 0;
+ uint16_t i;
+
+ DPRINTF("\n");
+
+ /* Reset controller */
+ XWRITE4(sc, oper, XHCI_USBCMD, XHCI_CMD_HCRST);
+
+ for (i = 0; i != 100; i++) {
+ usb_pause_mtx(NULL, hz / 100);
+ temp = (XREAD4(sc, oper, XHCI_USBCMD) & XHCI_CMD_HCRST) |
+ (XREAD4(sc, oper, XHCI_USBSTS) & XHCI_STS_CNR);
+ if (!temp)
+ break;
+ }
+
+ if (temp) {
+ device_printf(sc->sc_bus.parent, "Controller "
+ "reset timeout.\n");
+ return (USB_ERR_IOERROR);
+ }
+ return (0);
+}
+
+usb_error_t
xhci_init(struct xhci_softc *sc, device_t self, uint8_t dma32)
{
uint32_t temp;
@@ -671,10 +686,12 @@ xhci_set_hw_power_sleep(struct usb_bus *
case USB_HW_POWER_SUSPEND:
DPRINTF("Stopping the XHCI\n");
xhci_halt_controller(sc);
+ xhci_reset_controller(sc);
break;
case USB_HW_POWER_SHUTDOWN:
DPRINTF("Stopping the XHCI\n");
xhci_halt_controller(sc);
+ xhci_reset_controller(sc);
break;
case USB_HW_POWER_RESUME:
DPRINTF("Starting the XHCI\n");
Modified: head/sys/dev/usb/controller/xhci.h
==
--- head/sys/dev/usb/controller/xhci.h Thu Jan 19 18:26:06 2017
(r312423)
+++ head/sys/dev/usb/controller/xhci.h Thu Jan 19 18:33:27 2017
(r312424)
@@ -525,6 +525,7 @@ struct xhci_softc {
uint8_txhci_use_polling(void);
usb_error_t xhci_halt_controller(struct xhci_softc *);
+usb_error_t xhci_reset_controller(struct xhci_softc *);
usb_error_t xhci_init(struct xhci_softc *, device_t, uint8_t);
usb_error_t xhci_start_controller(struct xhci_softc *);
void xhci_interrupt(struct xhci_softc *);
Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c Thu Jan 19 18:26:06 2017
(r312423)
+++ head/sys/dev/usb/controller/xhci_pci.c Thu Jan 19 18:33:27 2017
(r312424)
@@ -348,6 +348,7 @@ xhci_pci_detach(device_t self)
usb_callout_drain(&sc->sc_callout);
xhci_halt_controller(sc);
+ xhci_reset_controller(sc);
pci_disable_busmaster(self);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312425 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 18:38:58 2017
New Revision: 312425
URL: https://svnweb.freebsd.org/changeset/base/312425
Log:
Make tmpfs directory cursor available outside tmpfs_subr.c.
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_subr.c
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 18:33:27 2017(r312424)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 18:38:58 2017(r312425)
@@ -394,6 +394,11 @@ struct tmpfs_fid {
unsigned long tf_gen;
};
+struct tmpfs_dir_cursor {
+ struct tmpfs_dirent *tdc_current;
+ struct tmpfs_dirent *tdc_tree;
+};
+
#ifdef _KERNEL
/*
* Prototypes for tmpfs_subr.c.
@@ -438,6 +443,10 @@ void tmpfs_itimes(struct vnode *, const
void tmpfs_set_status(struct tmpfs_node *node, int status);
void tmpfs_update(struct vnode *);
inttmpfs_truncate(struct vnode *, off_t);
+struct tmpfs_dirent *tmpfs_dir_first(struct tmpfs_node *dnode,
+ struct tmpfs_dir_cursor *dc);
+struct tmpfs_dirent *tmpfs_dir_next(struct tmpfs_node *dnode,
+ struct tmpfs_dir_cursor *dc);
/*
* Convenience macros to simplify some logical expressions.
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==
--- head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 18:33:27 2017
(r312424)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 18:38:58 2017
(r312425)
@@ -62,11 +62,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-struct tmpfs_dir_cursor {
- struct tmpfs_dirent *tdc_current;
- struct tmpfs_dirent *tdc_tree;
-};
-
SYSCTL_NODE(_vfs, OID_AUTO, tmpfs, CTLFLAG_RW, 0, "tmpfs file system");
static long tmpfs_pages_reserved = TMPFS_PAGES_MINRESERVED;
@@ -724,7 +719,7 @@ tmpfs_alloc_file(struct vnode *dvp, stru
return (0);
}
-static struct tmpfs_dirent *
+struct tmpfs_dirent *
tmpfs_dir_first(struct tmpfs_node *dnode, struct tmpfs_dir_cursor *dc)
{
struct tmpfs_dirent *de;
@@ -738,7 +733,7 @@ tmpfs_dir_first(struct tmpfs_node *dnode
return (dc->tdc_current);
}
-static struct tmpfs_dirent *
+struct tmpfs_dirent *
tmpfs_dir_next(struct tmpfs_node *dnode, struct tmpfs_dir_cursor *dc)
{
struct tmpfs_dirent *de;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312426 - head/sys/kern
Author: avg Date: Thu Jan 19 18:46:41 2017 New Revision: 312426 URL: https://svnweb.freebsd.org/changeset/base/312426 Log: fix a thread preemption regression in schedulers introduced in r270423 Commit r270423 fixed a regression in sched_yield() that was introduced in earlier changes. Unfortunately, at the same time it introduced an new regression. The problem is that SWT_RELINQUISH (6), like all other SWT_* constants and unlike SW_* flags, is not a bit flag. So, (flags & SWT_RELINQUISH) is true in cases where that was not really indended, for example, with SWT_OWEPREEMPT (2) and SWT_REMOTEPREEMPT (11). A straight forward fix would be to use (flags & SW_TYPE_MASK) == SWT_RELINQUISH, but my impression is that the switch types are designed mostly for gathering statistics, not for influencing scheduling decisions. So, I decided that it would be better to check for SW_PREEMPT flag instead. That's also the same flag that was checked before r239157. I double-checked how that flag is used and I am confident that the flag is set only in the places where we really have the preemption: - critical_exit + td_owepreempt - sched_preempt in the ULE scheduler - sched_preempt in the 4BSD scheduler Reviewed by: kib, mav MFC after:4 days Sponsored by: Panzura Differential Revision: https://reviews.freebsd.org/D9230 Modified: head/sys/kern/sched_4bsd.c head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_4bsd.c == --- head/sys/kern/sched_4bsd.c Thu Jan 19 18:38:58 2017(r312425) +++ head/sys/kern/sched_4bsd.c Thu Jan 19 18:46:41 2017(r312426) @@ -968,8 +968,8 @@ sched_switch(struct thread *td, struct t sched_load_rem(); td->td_lastcpu = td->td_oncpu; - preempted = !((td->td_flags & TDF_SLICEEND) || - (flags & SWT_RELINQUISH)); + preempted = (td->td_flags & TDF_SLICEEND) == 0 && + (flags & SW_PREEMPT) != 0; td->td_flags &= ~(TDF_NEEDRESCHED | TDF_SLICEEND); td->td_owepreempt = 0; td->td_oncpu = NOCPU; Modified: head/sys/kern/sched_ule.c == --- head/sys/kern/sched_ule.c Thu Jan 19 18:38:58 2017(r312425) +++ head/sys/kern/sched_ule.c Thu Jan 19 18:46:41 2017(r312426) @@ -1898,8 +1898,8 @@ sched_switch(struct thread *td, struct t ts->ts_rltick = ticks; td->td_lastcpu = td->td_oncpu; td->td_oncpu = NOCPU; - preempted = !((td->td_flags & TDF_SLICEEND) || - (flags & SWT_RELINQUISH)); + preempted = (td->td_flags & TDF_SLICEEND) == 0 && + (flags & SW_PREEMPT) != 0; td->td_flags &= ~(TDF_NEEDRESCHED | TDF_SLICEEND); td->td_owepreempt = 0; if (!TD_IS_IDLETHREAD(td)) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312427 - head/sys/dev/e1000
Author: erj
Date: Thu Jan 19 18:52:38 2017
New Revision: 312427
URL: https://svnweb.freebsd.org/changeset/base/312427
Log:
e1000: Add support for Kaby Lake generation i219 (4) and i219 (5) devices
MFC after:1 week
Sponsored by: Intel Corporation
Modified:
head/sys/dev/e1000/e1000_82575.c
head/sys/dev/e1000/e1000_82575.h
head/sys/dev/e1000/e1000_defines.h
head/sys/dev/e1000/e1000_ich8lan.c
head/sys/dev/e1000/if_em.c
Modified: head/sys/dev/e1000/e1000_82575.c
==
--- head/sys/dev/e1000/e1000_82575.cThu Jan 19 18:46:41 2017
(r312426)
+++ head/sys/dev/e1000/e1000_82575.cThu Jan 19 18:52:38 2017
(r312427)
@@ -101,7 +101,6 @@ static s32 e1000_validate_nvm_checksum_w
u16 offset);
static s32 e1000_validate_nvm_checksum_i350(struct e1000_hw *hw);
static s32 e1000_update_nvm_checksum_i350(struct e1000_hw *hw);
-static void e1000_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value);
static void e1000_clear_vfta_i350(struct e1000_hw *hw);
static void e1000_i2c_start(struct e1000_hw *hw);
Modified: head/sys/dev/e1000/e1000_82575.h
==
--- head/sys/dev/e1000/e1000_82575.hThu Jan 19 18:46:41 2017
(r312426)
+++ head/sys/dev/e1000/e1000_82575.hThu Jan 19 18:52:38 2017
(r312427)
@@ -493,6 +493,7 @@ enum e1000_promisc_type {
void e1000_vfta_set_vf(struct e1000_hw *, u16, bool);
void e1000_rlpml_set_vf(struct e1000_hw *, u16);
s32 e1000_promisc_set_vf(struct e1000_hw *, enum e1000_promisc_type type);
+void e1000_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value);
u16 e1000_rxpbs_adjust_82580(u32 data);
s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data);
s32 e1000_set_eee_i350(struct e1000_hw *hw, bool adv1G, bool adv100M);
Modified: head/sys/dev/e1000/e1000_defines.h
==
--- head/sys/dev/e1000/e1000_defines.h Thu Jan 19 18:46:41 2017
(r312426)
+++ head/sys/dev/e1000/e1000_defines.h Thu Jan 19 18:52:38 2017
(r312427)
@@ -469,6 +469,8 @@
#define ETHERNET_FCS_SIZE 4
#define MAX_JUMBO_FRAME_SIZE 0x3F00
+/* The datasheet maximum supported RX size is 9.5KB (9728 bytes) */
+#define MAX_RX_JUMBO_FRAME_SIZE0x2600
#define E1000_TX_PTR_GAP 0x1F
/* Extended Configuration Control and Size */
Modified: head/sys/dev/e1000/e1000_ich8lan.c
==
--- head/sys/dev/e1000/e1000_ich8lan.c Thu Jan 19 18:46:41 2017
(r312426)
+++ head/sys/dev/e1000/e1000_ich8lan.c Thu Jan 19 18:52:38 2017
(r312427)
@@ -243,8 +243,7 @@ static bool e1000_phy_is_accessible_pchl
if (ret_val)
return FALSE;
out:
- if ((hw->mac.type == e1000_pch_lpt) ||
- (hw->mac.type == e1000_pch_spt)) {
+ if (hw->mac.type >= e1000_pch_lpt) {
/* Only unforce SMBus if ME is not active */
if (!(E1000_READ_REG(hw, E1000_FWSM) &
E1000_ICH_FWSM_FW_VALID)) {
@@ -641,7 +640,7 @@ static s32 e1000_init_nvm_params_ich8lan
nvm->type = e1000_nvm_flash_sw;
- if (hw->mac.type == e1000_pch_spt) {
+ if (hw->mac.type >= e1000_pch_spt) {
/* in SPT, gfpreg doesn't exist. NVM size is taken from the
* STRAP register. This is because in SPT the GbE Flash region
* is no longer accessed through the flash registers. Instead,
@@ -701,7 +700,7 @@ static s32 e1000_init_nvm_params_ich8lan
/* Function Pointers */
nvm->ops.acquire= e1000_acquire_nvm_ich8lan;
nvm->ops.release= e1000_release_nvm_ich8lan;
- if (hw->mac.type == e1000_pch_spt) {
+ if (hw->mac.type >= e1000_pch_spt) {
nvm->ops.read = e1000_read_nvm_spt;
nvm->ops.update = e1000_update_nvm_checksum_spt;
} else {
@@ -815,8 +814,7 @@ static s32 e1000_init_mac_params_ich8lan
break;
}
- if ((mac->type == e1000_pch_lpt) ||
- (mac->type == e1000_pch_spt)) {
+ if (mac->type >= e1000_pch_lpt) {
mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
mac->ops.rar_set = e1000_rar_set_pch_lpt;
mac->ops.setup_physical_interface =
e1000_setup_copper_link_pch_lpt;
@@ -1576,9 +1574,7 @@ static s32 e1000_check_for_copper_link_i
* aggressive resulting in many collisions. To avoid this, increase
* the IPG and reduce Rx latency in the PHY.
*/
- if (((hw->mac.type == e1000_pch2lan) ||
-(hw->mac.type == e1000_pch_lpt) ||
-(hw->mac.type == e1000_pch_spt)) && link) {
+ if ((hw->mac.type >= e1000_pch2lan) && link) {
svn commit: r312428 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 19:15:21 2017
New Revision: 312428
URL: https://svnweb.freebsd.org/changeset/base/312428
Log:
Refcount tmpfs nodes and mount structures.
On dotdot lookup and fhtovp operations, it is possible for the file
represented by tmpfs node to be removed after the thread calculated
the pointer. In this case, tmpfs_alloc_vp() accesses freed memory.
Introduce the reference count on the nodes. The allnodes list from
tmpfs mount owns 1 reference, and threads performing unlocked
operations on the node, add one transient reference. Similarly, since
struct tmpfs_mount maintains the list where nodes are enlisted,
refcount it by one reference from struct mount and one reference from
each node on the list. Both nodes and tmpfs_mounts are removed when
refcount goes to zero.
Note that this means that nodes and tmpfs_mounts might survive some
time after the node is deleted or tmpfs_unmount() finished. The
tmpfs_alloc_vp() in these cases returns error either due to node
removal (tn_nlinks == 0) or because of insmntque1(9) error.
Tested by:pho (as part of larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vfsops.c
head/sys/fs/tmpfs/tmpfs_vnops.c
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 18:52:38 2017(r312427)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 19:15:21 2017(r312428)
@@ -158,9 +158,11 @@ struct tmpfs_node {
* Doubly-linked list entry which links all existing nodes for
* a single file system. This is provided to ease the removal
* of all nodes during the unmount operation, and to support
-* the implementation of VOP_VNTOCNP().
+* the implementation of VOP_VNTOCNP(). tn_attached is false
+* when the node is removed from list and unlocked.
*/
LIST_ENTRY(tmpfs_node) tn_entries; /* (m) */
+ booltn_attached;/* (m) */
/*
* The node's type. Any of 'VBLK', 'VCHR', 'VDIR', 'VFIFO',
@@ -231,6 +233,9 @@ struct tmpfs_node {
*/
int tn_vpstate; /* (i) */
+ /* Transient refcounter on this node. */
+ u_int tn_refcount;/* (m) + (i) */
+
/* misc data field for different tn_type node */
union {
/* Valid when tn_type == VBLK || tn_type == VCHR. */
@@ -360,6 +365,9 @@ struct tmpfs_mount {
/* Number of nodes currently that are in use. */
ino_t tm_nodes_inuse;
+ /* Refcounter on this struct tmpfs_mount. */
+ uint64_ttm_refcount;
+
/* maximum representable file size */
u_int64_t tm_maxfilesize;
@@ -404,10 +412,14 @@ struct tmpfs_dir_cursor {
* Prototypes for tmpfs_subr.c.
*/
+void tmpfs_ref_node(struct tmpfs_node *node);
+void tmpfs_ref_node_locked(struct tmpfs_node *node);
inttmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *, enum vtype,
uid_t uid, gid_t gid, mode_t mode, struct tmpfs_node *,
char *, dev_t, struct tmpfs_node **);
void tmpfs_free_node(struct tmpfs_mount *, struct tmpfs_node *);
+bool tmpfs_free_node_locked(struct tmpfs_mount *, struct tmpfs_node *, bool);
+void tmpfs_free_tmp(struct tmpfs_mount *);
inttmpfs_alloc_dirent(struct tmpfs_mount *, struct tmpfs_node *,
const char *, u_int, struct tmpfs_dirent **);
void tmpfs_free_dirent(struct tmpfs_mount *, struct tmpfs_dirent *);
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==
--- head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 18:52:38 2017
(r312427)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 19:15:21 2017
(r312428)
@@ -131,6 +131,26 @@ tmpfs_pages_check_avail(struct tmpfs_mou
return (1);
}
+void
+tmpfs_ref_node(struct tmpfs_node *node)
+{
+
+ TMPFS_NODE_LOCK(node);
+ tmpfs_ref_node_locked(node);
+ TMPFS_NODE_UNLOCK(node);
+}
+
+void
+tmpfs_ref_node_locked(struct tmpfs_node *node)
+{
+
+ TMPFS_NODE_ASSERT_LOCKED(node);
+ KASSERT(node->tn_refcount > 0, ("node %p zero refcount", node));
+ KASSERT(node->tn_refcount < UINT_MAX, ("node %p refcount %u", node,
+ node->tn_refcount));
+ node->tn_refcount++;
+}
+
/*
* Allocates a new node of type 'type' inside the 'tmp' mount point, with
* its owner set to 'uid', its group to 'gid' and its mode set to 'mode',
@@ -205,6 +225,7 @@ tmpfs_alloc_node(struct mount *mp, struc
nnode->tn_gid = gid;
nnode->tn_mode = mode;
nnode->tn_id = alloc_unr(tmp->tm_ino_unr);
+ nnode->tn_refcount = 1;
/* Type-specific initialization. */
svn commit: r312429 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 19:25:42 2017
New Revision: 312429
URL: https://svnweb.freebsd.org/changeset/base/312429
Log:
VNON nodes cannot exist.
Tested by:pho (as part of larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/fs/tmpfs/tmpfs_subr.c
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==
--- head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 19:15:21 2017
(r312428)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 19:25:42 2017
(r312429)
@@ -332,11 +332,6 @@ tmpfs_free_node_locked(struct tmpfs_moun
TMPFS_UNLOCK(tmp);
switch (node->tn_type) {
- case VNON:
- /* Do not do anything. VNON is provided to let the
-* allocation routine clean itself easily by avoiding
-* duplicating code in it. */
- /* FALLTHROUGH */
case VBLK:
/* FALLTHROUGH */
case VCHR:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312430 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 19:29:13 2017
New Revision: 312430
URL: https://svnweb.freebsd.org/changeset/base/312430
Log:
Implement VOP_VPTOCNP() for tmpfs.
For directories, node->tn_spec.tn_dir.tn_parent pointer to the parent
is used. For non-directories, the implementation is naive, all
directory nodes are scanned to find a dirent linking the specified
node. This can be significantly improved by maintaining tn_parent for
all nodes, later.
Tested by:pho (as part of larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/fs/tmpfs/tmpfs_vnops.c
Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==
--- head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 19:25:42 2017
(r312429)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 19:29:13 2017
(r312430)
@@ -1406,6 +1406,132 @@ tmpfs_whiteout(struct vop_whiteout_args
}
}
+static int
+tmpfs_vptocnp_dir(struct tmpfs_node *tn, struct tmpfs_node *tnp,
+struct tmpfs_dirent **pde)
+{
+ struct tmpfs_dir_cursor dc;
+ struct tmpfs_dirent *de;
+
+ for (de = tmpfs_dir_first(tnp, &dc); de != NULL;
+de = tmpfs_dir_next(tnp, &dc)) {
+ if (de->td_node == tn) {
+ *pde = de;
+ return (0);
+ }
+ }
+ return (ENOENT);
+}
+
+static int
+tmpfs_vptocnp_fill(struct vnode *vp, struct tmpfs_node *tn,
+struct tmpfs_node *tnp, char *buf, int *buflen, struct vnode **dvp)
+{
+ struct tmpfs_dirent *de;
+ int error, i;
+
+ error = vn_vget_ino_gen(vp, tmpfs_vn_get_ino_alloc, tnp, LK_SHARED,
+ dvp);
+ if (error != 0)
+ return (error);
+ error = tmpfs_vptocnp_dir(tn, tnp, &de);
+ if (error == 0) {
+ i = *buflen;
+ i -= de->td_namelen;
+ if (i < 0) {
+ error = ENOMEM;
+ } else {
+ bcopy(de->ud.td_name, buf + i, de->td_namelen);
+ *buflen = i;
+ }
+ }
+ if (error == 0) {
+ if (vp != *dvp)
+ VOP_UNLOCK(*dvp, 0);
+ } else {
+ if (vp != *dvp)
+ vput(*dvp);
+ else
+ vrele(vp);
+ }
+ return (error);
+}
+
+static int
+tmpfs_vptocnp(struct vop_vptocnp_args *ap)
+{
+ struct vnode *vp, **dvp;
+ struct tmpfs_node *tn, *tnp, *tnp1;
+ struct tmpfs_dirent *de;
+ struct tmpfs_mount *tm;
+ char *buf;
+ int *buflen;
+ int error;
+
+ vp = ap->a_vp;
+ dvp = ap->a_vpp;
+ buf = ap->a_buf;
+ buflen = ap->a_buflen;
+
+ tm = VFS_TO_TMPFS(vp->v_mount);
+ tn = VP_TO_TMPFS_NODE(vp);
+ if (tn->tn_type == VDIR) {
+ tnp = tn->tn_dir.tn_parent;
+ if (tnp == NULL)
+ return (ENOENT);
+ tmpfs_ref_node(tnp);
+ error = tmpfs_vptocnp_fill(vp, tn, tn->tn_dir.tn_parent, buf,
+ buflen, dvp);
+ tmpfs_free_node(tm, tnp);
+ return (error);
+ }
+restart:
+ TMPFS_LOCK(tm);
+ LIST_FOREACH_SAFE(tnp, &tm->tm_nodes_used, tn_entries, tnp1) {
+ if (tnp->tn_type != VDIR)
+ continue;
+ TMPFS_NODE_LOCK(tnp);
+ tmpfs_ref_node_locked(tnp);
+
+ /*
+* tn_vnode cannot be instantiated while we hold the
+* node lock, so the directory cannot be changed while
+* we iterate over it. Do this to avoid instantiating
+* vnode for directories which cannot point to our
+* node.
+*/
+ error = tnp->tn_vnode == NULL ? tmpfs_vptocnp_dir(tn, tnp,
+ &de) : 0;
+
+ if (error == 0) {
+ TMPFS_NODE_UNLOCK(tnp);
+ TMPFS_UNLOCK(tm);
+ error = tmpfs_vptocnp_fill(vp, tn, tnp, buf, buflen,
+ dvp);
+ if (error == 0) {
+ tmpfs_free_node(tm, tnp);
+ return (0);
+ }
+ if ((vp->v_iflag & VI_DOOMED) != 0) {
+ tmpfs_free_node(tm, tnp);
+ return (ENOENT);
+ }
+ TMPFS_LOCK(tm);
+ TMPFS_NODE_LOCK(tnp);
+ }
+ if (tmpfs_free_node_locked(tm, tnp, false)) {
+ goto restart;
+ } else {
+ KASSERT(tnp->tn_refcount > 0,
+ ("node %p refcount zero", tnp));
+ tnp1 = LIST_NEXT(tnp, tn_entrie
svn commit: r312432 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 19:46:49 2017
New Revision: 312432
URL: https://svnweb.freebsd.org/changeset/base/312432
Log:
Add mount option for tmpfs(5) to not use namecache.
The option "nonc" disables using of namecache for the created mount,
by default namecache is used. The rationale for the option is that
namecache duplicates the information which is already kept in memory
by tmpfs. Since it believed that namecache scales better than tmpfs,
or will scale better, do not enable the option by default. On the
other hand, smaller machines may benefit from lesser namecache
pressure.
Discussed with: mjg
Tested by:pho (as part of larger patch)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vfsops.c
head/sys/fs/tmpfs/tmpfs_vnops.c
head/sys/fs/tmpfs/tmpfs_vnops.h
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 19:46:15 2017(r312431)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 19:46:49 2017(r312432)
@@ -385,7 +385,9 @@ struct tmpfs_mount {
uma_zone_t tm_node_pool;
/* Read-only status. */
- int tm_ronly;
+ booltm_ronly;
+ /* Do not use namecache. */
+ booltm_nonc;
};
#defineTMPFS_LOCK(tm) mtx_lock(&(tm)->tm_allnode_lock)
#defineTMPFS_UNLOCK(tm) mtx_unlock(&(tm)->tm_allnode_lock)
@@ -530,4 +532,11 @@ VP_TO_TMPFS_DIR(struct vnode *vp)
return (node);
}
+static inline bool
+tmpfs_use_nc(struct vnode *vp)
+{
+
+ return (!(VFS_TO_TMPFS(vp->v_mount)->tm_nonc));
+}
+
#endif /* _FS_TMPFS_TMPFS_H_ */
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==
--- head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 19:46:15 2017
(r312431)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Thu Jan 19 19:46:49 2017
(r312432)
@@ -591,7 +591,8 @@ loop:
TMPFS_NODE_UNLOCK(node);
/* Get a new vnode and associate it with our node. */
- error = getnewvnode("tmpfs", mp, &tmpfs_vnodeop_entries, &vp);
+ error = getnewvnode("tmpfs", mp, VFS_TO_TMPFS(mp)->tm_nonc ?
+ &tmpfs_vnodeop_nonc_entries : &tmpfs_vnodeop_entries, &vp);
if (error != 0)
goto unlock;
MPASS(vp != NULL);
Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==
--- head/sys/fs/tmpfs/tmpfs_vfsops.cThu Jan 19 19:46:15 2017
(r312431)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.cThu Jan 19 19:46:49 2017
(r312432)
@@ -79,7 +79,7 @@ static void tmpfs_susp_clean(struct moun
static const char *tmpfs_opts[] = {
"from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export",
- "union", NULL
+ "union", "nonc", NULL
};
static const char *tmpfs_updateopts[] = {
@@ -138,6 +138,7 @@ tmpfs_mount(struct mount *mp)
struct tmpfs_node *root;
struct thread *td = curthread;
int error;
+ bool nonc;
/* Size counters. */
u_quad_t pages;
off_t nodes_max, size_max, maxfilesize;
@@ -186,6 +187,7 @@ tmpfs_mount(struct mount *mp)
size_max = 0;
if (vfs_getopt_size(mp->mnt_optnew, "maxfilesize", &maxfilesize) != 0)
maxfilesize = 0;
+ nonc = vfs_getopt(mp->mnt_optnew, "nonc", NULL, NULL) == 0;
/* Do not allow mounts if we do not have enough memory to preserve
* the minimum reserved pages. */
@@ -236,6 +238,7 @@ tmpfs_mount(struct mount *mp)
sizeof(struct tmpfs_node), tmpfs_node_ctor, tmpfs_node_dtor,
tmpfs_node_init, tmpfs_node_fini, UMA_ALIGN_PTR, 0);
tmp->tm_ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
+ tmp->tm_nonc = nonc;
/* Allocate the root node. */
error = tmpfs_alloc_node(mp, tmp, VDIR, root_uid, root_gid,
Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==
--- head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 19:46:15 2017
(r312431)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c Thu Jan 19 19:46:49 2017
(r312432)
@@ -76,11 +76,8 @@ tmpfs_vn_get_ino_alloc(struct mount *mp,
}
static int
-tmpfs_lookup(struct vop_cachedlookup_args *v)
+tmpfs_lookup1(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
{
- struct vnode *dvp = v->a_dvp;
- struct vnode **vpp = v->a_vpp;
- struct componentname *cnp = v->a_cnp;
struct tmpfs_dirent *de;
struct tmpfs_node *dnode, *pnode;
struct tmpfs_mount *tm;
@@ -213,7 +210,7 @@ tmpfs_lookup(struct vop_cachedlookup_arg
* request was for creation, as it does not improve timings on
svn commit: r312434 - head/sys/sys
Author: sbruno
Date: Thu Jan 19 19:58:08 2017
New Revision: 312434
URL: https://svnweb.freebsd.org/changeset/base/312434
Log:
Adjust gtaskqueue startup again so that we catch the !SMP case and
users that choose not to use EARLY_AP_STARTUP.
There is still an initialization issue/panic with !SMP and !EARLY_AP_STARTUP
that we have yet to resolve.
Submitted by: bde
Modified:
head/sys/sys/gtaskqueue.h
Modified: head/sys/sys/gtaskqueue.h
==
--- head/sys/sys/gtaskqueue.h Thu Jan 19 19:47:32 2017(r312433)
+++ head/sys/sys/gtaskqueue.h Thu Jan 19 19:58:08 2017(r312434)
@@ -81,7 +81,7 @@ int taskqgroup_adjust(struct taskqgroup
extern struct taskqgroup *qgroup_##name
-#ifdef EARLY_AP_STARTUP
+#if (!defined(SMP) || defined(EARLY_AP_STARTUP))
#define TASKQGROUP_DEFINE(name, cnt, stride) \
\
struct taskqgroup *qgroup_##name; \
@@ -95,7 +95,7 @@ taskqgroup_define_##name(void *arg)
\
SYSINIT(taskqgroup_##name, SI_SUB_INIT_IF, SI_ORDER_FIRST, \
taskqgroup_define_##name, NULL)
-#else
+#else /* SMP && !EARLY_AP_STARTUP */
#define TASKQGROUP_DEFINE(name, cnt, stride) \
\
struct taskqgroup *qgroup_##name; \
@@ -104,6 +104,15 @@ static void
\
taskqgroup_define_##name(void *arg)\
{ \
qgroup_##name = taskqgroup_create(#name); \
+ /* Adjustment will be null unless smp_cpus == 1. */ \
+ /* \
+* XXX this was intended to fix the smp_cpus == 1 case, but \
+* doesn't actually work for that. It gives thes same strange \
+* panic as adjustment at SI_SUB_INIT_IF:SI_ORDER_ANY for a \
+* device that works with a pure UP kernel. \
+*/ \
+ /* XXX this code is common now, so should not be ifdefed. */\
+ taskqgroup_adjust(qgroup_##name, (cnt), (stride)); \
} \
\
SYSINIT(taskqgroup_##name, SI_SUB_INIT_IF, SI_ORDER_FIRST, \
@@ -112,14 +121,18 @@ SYSINIT(taskqgroup_##name, SI_SUB_INIT_I
static void\
taskqgroup_adjust_##name(void *arg)\
{ \
+ /* \
+* Adjustment when smp_cpus > 1 only works accidentally \
+* (when there is no device interrupt before adjustment). \
+*/ \
taskqgroup_adjust(qgroup_##name, (cnt), (stride)); \
} \
\
-SYSINIT(taskqgroup_adj_##name, SI_SUB_INIT_IF, SI_ORDER_ANY, \
+SYSINIT(taskqgroup_adj_##name, SI_SUB_SMP, SI_ORDER_ANY, \
taskqgroup_adjust_##name, NULL);\
- \
-struct __hack
-#endif
+
+#endif /* !SMP || EARLY_AP_STARTUP */
+
TASKQGROUP_DECLARE(net);
#endif /* !_SYS_GTASKQUEUE_H_ */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312435 - head/sys/fs/tmpfs
Author: kib
Date: Thu Jan 19 20:03:26 2017
New Revision: 312435
URL: https://svnweb.freebsd.org/changeset/base/312435
Log:
Remove mistakenly merged field.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/fs/tmpfs/tmpfs.h
Modified: head/sys/fs/tmpfs/tmpfs.h
==
--- head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 19:58:08 2017(r312434)
+++ head/sys/fs/tmpfs/tmpfs.h Thu Jan 19 20:03:26 2017(r312435)
@@ -347,8 +347,6 @@ struct tmpfs_mount {
*/
struct tmpfs_node * tm_root;
- struct mount * tm_mnt;
-
/*
* Maximum number of possible nodes for this file system; set
* during mount time. We need a hard limit on the maximum number
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312437 - in head/sys/dev: mpr mps
Author: scottl
Date: Thu Jan 19 21:47:50 2017
New Revision: 312437
URL: https://svnweb.freebsd.org/changeset/base/312437
Log:
Rework the debug print API. Event printing no longer gets special handling.
All of the printing from the tables file now has wrappers so that the
handling is cleaner and it's possible to print something out (say, during
development) without having to fight the global debug flags. This re-org
will also make it easier to have the tables be compiled out at build time
if desired.
Other than fixing some minor bugs, there are no user-visible changes from
this change
Sponsored by: Netflix, Inc.
Differential Revision:D9238
Modified:
head/sys/dev/mpr/mpr_sas.c
head/sys/dev/mpr/mpr_table.c
head/sys/dev/mpr/mpr_table.h
head/sys/dev/mpr/mprvar.h
head/sys/dev/mps/mps_sas.c
head/sys/dev/mps/mps_table.c
head/sys/dev/mps/mps_table.h
head/sys/dev/mps/mpsvar.h
Modified: head/sys/dev/mpr/mpr_sas.c
==
--- head/sys/dev/mpr/mpr_sas.c Thu Jan 19 20:44:29 2017(r312436)
+++ head/sys/dev/mpr/mpr_sas.c Thu Jan 19 21:47:50 2017(r312437)
@@ -349,7 +349,7 @@ mprsas_log_command(struct mpr_command *c
sbuf_printf(&sb, "SMID %u ", cm->cm_desc.Default.SMID);
sbuf_vprintf(&sb, fmt, ap);
sbuf_finish(&sb);
- mpr_dprint_field(cm->cm_sc, level, "%s", sbuf_data(&sb));
+ mpr_print_field(cm->cm_sc, "%s", sbuf_data(&sb));
va_end(ap);
}
Modified: head/sys/dev/mpr/mpr_table.c
==
--- head/sys/dev/mpr/mpr_table.cThu Jan 19 20:44:29 2017
(r312436)
+++ head/sys/dev/mpr/mpr_table.cThu Jan 19 21:47:50 2017
(r312437)
@@ -197,27 +197,26 @@ mpr_describe_devinfo(uint32_t devinfo, c
}
void
-mpr_print_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts)
+_mpr_print_iocfacts(struct mpr_softc *sc, MPI2_IOC_FACTS_REPLY *facts)
{
-
MPR_PRINTFIELD_START(sc, "IOCFacts");
MPR_PRINTFIELD(sc, facts, MsgVersion, 0x%x);
MPR_PRINTFIELD(sc, facts, HeaderVersion, 0x%x);
MPR_PRINTFIELD(sc, facts, IOCNumber, %d);
MPR_PRINTFIELD(sc, facts, IOCExceptions, 0x%x);
MPR_PRINTFIELD(sc, facts, MaxChainDepth, %d);
- mpr_dprint_field(sc, MPR_XINFO, "WhoInit: %s\n",
+ mpr_print_field(sc, "WhoInit: %s\n",
mpr_describe_table(mpr_whoinit_names, facts->WhoInit));
MPR_PRINTFIELD(sc, facts, NumberOfPorts, %d);
MPR_PRINTFIELD(sc, facts, MaxMSIxVectors, %d);
MPR_PRINTFIELD(sc, facts, RequestCredit, %d);
MPR_PRINTFIELD(sc, facts, ProductID, 0x%x);
- mpr_dprint_field(sc, MPR_XINFO, "IOCCapabilities: %b\n",
+ mpr_print_field(sc, "IOCCapabilities: %b\n",
facts->IOCCapabilities, "\20" "\3ScsiTaskFull" "\4DiagTrace"
"\5SnapBuf" "\6ExtBuf" "\7EEDP" "\10BiDirTarg" "\11Multicast"
"\14TransRetry" "\15IR" "\16EventReplay" "\17RaidAccel"
"\20MSIXIndex" "\21HostDisc");
- mpr_dprint_field(sc, MPR_XINFO, "FWVersion= %d-%d-%d-%d\n",
+ mpr_print_field(sc, "FWVersion= %d-%d-%d-%d\n",
facts->FWVersion.Struct.Major,
facts->FWVersion.Struct.Minor,
facts->FWVersion.Struct.Unit,
@@ -227,7 +226,7 @@ mpr_print_iocfacts(struct mpr_softc *sc,
MPR_PRINTFIELD(sc, facts, MaxTargets, %d);
MPR_PRINTFIELD(sc, facts, MaxSasExpanders, %d);
MPR_PRINTFIELD(sc, facts, MaxEnclosures, %d);
- mpr_dprint_field(sc, MPR_XINFO, "ProtocolFlags: %b\n",
+ mpr_print_field(sc, "ProtocolFlags: %b\n",
facts->ProtocolFlags, "\20" "\1ScsiTarg" "\2ScsiInit");
MPR_PRINTFIELD(sc, facts, HighPriorityCredit, %d);
MPR_PRINTFIELD(sc, facts, MaxReplyDescriptorPostQueueDepth, %d);
@@ -238,7 +237,7 @@ mpr_print_iocfacts(struct mpr_softc *sc,
}
void
-mpr_print_portfacts(struct mpr_softc *sc, MPI2_PORT_FACTS_REPLY *facts)
+_mpr_print_portfacts(struct mpr_softc *sc, MPI2_PORT_FACTS_REPLY *facts)
{
MPR_PRINTFIELD_START(sc, "PortFacts");
@@ -248,24 +247,24 @@ mpr_print_portfacts(struct mpr_softc *sc
}
void
-mpr_print_event(struct mpr_softc *sc, MPI2_EVENT_NOTIFICATION_REPLY *event)
+_mpr_print_event(struct mpr_softc *sc, MPI2_EVENT_NOTIFICATION_REPLY *event)
{
- MPR_EVENTFIELD_START(sc, "EventReply");
- MPR_EVENTFIELD(sc, event, EventDataLength, %d);
- MPR_EVENTFIELD(sc, event, AckRequired, %d);
- mpr_dprint_field(sc, MPR_EVENT, "Event: %s (0x%x)\n",
+ MPR_PRINTFIELD_START(sc, "EventReply");
+ MPR_PRINTFIELD(sc, event, EventDataLength, %d);
+ MPR_PRINTFIELD(sc, event, AckRequired, %d);
+ mpr_print_field(sc, "Event: %s (0x%x)\n",
mpr_describe_table(mpr_event_names, event->Event), event->Event);
- MPR_EVENTFIELD(sc, event, EventContext, 0x%x);
+ MPR_PRINTFIELD(sc, event,
svn commit: r312438 - in head/sys/contrib/dev/acpica: . common compiler components/debugger components/disassembler components/dispatcher components/events components/executer components/hardware c...
Author: jkim Date: Thu Jan 19 22:07:21 2017 New Revision: 312438 URL: https://svnweb.freebsd.org/changeset/base/312438 Log: Merge ACPICA 20170119. Modified: head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/common/acfileio.c head/sys/contrib/dev/acpica/common/acgetline.c head/sys/contrib/dev/acpica/common/adfile.c head/sys/contrib/dev/acpica/common/adisasm.c head/sys/contrib/dev/acpica/common/adwalk.c head/sys/contrib/dev/acpica/common/ahids.c head/sys/contrib/dev/acpica/common/ahpredef.c head/sys/contrib/dev/acpica/common/ahtable.c head/sys/contrib/dev/acpica/common/ahuuids.c head/sys/contrib/dev/acpica/common/cmfsize.c head/sys/contrib/dev/acpica/common/dmextern.c head/sys/contrib/dev/acpica/common/dmrestag.c head/sys/contrib/dev/acpica/common/dmtable.c head/sys/contrib/dev/acpica/common/dmtables.c head/sys/contrib/dev/acpica/common/dmtbdump.c head/sys/contrib/dev/acpica/common/dmtbinfo.c head/sys/contrib/dev/acpica/common/getopt.c head/sys/contrib/dev/acpica/compiler/aslanalyze.c head/sys/contrib/dev/acpica/compiler/aslascii.c head/sys/contrib/dev/acpica/compiler/aslbtypes.c head/sys/contrib/dev/acpica/compiler/aslcodegen.c head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslcompiler.h head/sys/contrib/dev/acpica/compiler/aslcompiler.l head/sys/contrib/dev/acpica/compiler/aslcstyle.y head/sys/contrib/dev/acpica/compiler/asldebug.c head/sys/contrib/dev/acpica/compiler/asldefine.h head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/aslexternal.c head/sys/contrib/dev/acpica/compiler/aslfileio.c head/sys/contrib/dev/acpica/compiler/aslfiles.c head/sys/contrib/dev/acpica/compiler/aslfold.c head/sys/contrib/dev/acpica/compiler/aslglobal.h head/sys/contrib/dev/acpica/compiler/aslhelp.c head/sys/contrib/dev/acpica/compiler/aslhelpers.y head/sys/contrib/dev/acpica/compiler/aslhex.c head/sys/contrib/dev/acpica/compiler/aslkeywords.y head/sys/contrib/dev/acpica/compiler/asllength.c head/sys/contrib/dev/acpica/compiler/asllisting.c head/sys/contrib/dev/acpica/compiler/asllistsup.c head/sys/contrib/dev/acpica/compiler/aslload.c head/sys/contrib/dev/acpica/compiler/asllookup.c head/sys/contrib/dev/acpica/compiler/aslmain.c head/sys/contrib/dev/acpica/compiler/aslmap.c head/sys/contrib/dev/acpica/compiler/aslmapenter.c head/sys/contrib/dev/acpica/compiler/aslmapoutput.c head/sys/contrib/dev/acpica/compiler/aslmaputils.c head/sys/contrib/dev/acpica/compiler/aslmessages.c head/sys/contrib/dev/acpica/compiler/aslmessages.h head/sys/contrib/dev/acpica/compiler/aslmethod.c head/sys/contrib/dev/acpica/compiler/aslnamesp.c head/sys/contrib/dev/acpica/compiler/asloffset.c head/sys/contrib/dev/acpica/compiler/aslopcodes.c head/sys/contrib/dev/acpica/compiler/asloperands.c head/sys/contrib/dev/acpica/compiler/aslopt.c head/sys/contrib/dev/acpica/compiler/asloptions.c head/sys/contrib/dev/acpica/compiler/aslparser.y head/sys/contrib/dev/acpica/compiler/aslpld.c head/sys/contrib/dev/acpica/compiler/aslpredef.c head/sys/contrib/dev/acpica/compiler/aslprepkg.c head/sys/contrib/dev/acpica/compiler/aslprimaries.y head/sys/contrib/dev/acpica/compiler/aslprintf.c head/sys/contrib/dev/acpica/compiler/aslprune.c head/sys/contrib/dev/acpica/compiler/aslresource.c head/sys/contrib/dev/acpica/compiler/aslresources.y head/sys/contrib/dev/acpica/compiler/aslrestype1.c head/sys/contrib/dev/acpica/compiler/aslrestype1i.c head/sys/contrib/dev/acpica/compiler/aslrestype2.c head/sys/contrib/dev/acpica/compiler/aslrestype2d.c head/sys/contrib/dev/acpica/compiler/aslrestype2e.c head/sys/contrib/dev/acpica/compiler/aslrestype2q.c head/sys/contrib/dev/acpica/compiler/aslrestype2s.c head/sys/contrib/dev/acpica/compiler/aslrestype2w.c head/sys/contrib/dev/acpica/compiler/aslrules.y head/sys/contrib/dev/acpica/compiler/aslstartup.c head/sys/contrib/dev/acpica/compiler/aslstubs.c head/sys/contrib/dev/acpica/compiler/aslsupport.l head/sys/contrib/dev/acpica/compiler/aslsupport.y head/sys/contrib/dev/acpica/compiler/asltokens.y head/sys/contrib/dev/acpica/compiler/asltransform.c head/sys/contrib/dev/acpica/compiler/asltree.c head/sys/contrib/dev/acpica/compiler/asltypes.h head/sys/contrib/dev/acpica/compiler/asltypes.y head/sys/contrib/dev/acpica/compiler/aslutils.c head/sys/contrib/dev/acpica/compiler/asluuid.c head/sys/contrib/dev/acpica/compiler/aslwalks.c head/sys/contrib/dev/acpica/compiler/aslxref.c head/sys/contrib/dev/acpica/compiler/aslxrefout.c head/sys/contrib/dev/acpica/compiler/dtcompile.c head/sys/contrib/dev/acpica/compiler/dtcompiler.h head/sys/contrib/dev/acpica/compiler/dtexpress.c head/sys/contrib/dev/acpica/compiler/dtfield.c head/sys/contrib/dev/acpica/compiler/dtio.c head/sys/contrib/dev/acpica/compiler/dtparser.l head/sys/contrib/dev/acpica/compiler
svn commit: r312443 - in head/sys: conf netgraph
Author: pfg
Date: Fri Jan 20 00:02:11 2017
New Revision: 312443
URL: https://svnweb.freebsd.org/changeset/base/312443
Log:
mppc - Finish pluging NETGRAPH_MPPC_COMPRESSION.
There were several places where reference to compression were left
unfinished. Furthermore, KASSERTs contained references to MPPC_INVALID
which is not defined in the tree and therefore were sure to break with
INVARIANTS: comment them out.
Reported by: Eugene Grosbein
PR: 216265
MFC after:3 days
Modified:
head/sys/conf/NOTES
head/sys/conf/options
head/sys/netgraph/ng_mppc.c
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/conf/NOTES Fri Jan 20 00:02:11 2017(r312443)
@@ -774,8 +774,7 @@ options NETGRAPH_IPFW
optionsNETGRAPH_KSOCKET
optionsNETGRAPH_L2TP
optionsNETGRAPH_LMI
-# MPPC compression requires proprietary files (not included)
-#options NETGRAPH_MPPC_COMPRESSION
+optionsNETGRAPH_MPPC_COMPRESSION
optionsNETGRAPH_MPPC_ENCRYPTION
optionsNETGRAPH_NETFLOW
optionsNETGRAPH_NAT
Modified: head/sys/conf/options
==
--- head/sys/conf/options Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/conf/options Fri Jan 20 00:02:11 2017(r312443)
@@ -517,7 +517,6 @@ NETGRAPH_IPFW opt_netgraph.h
NETGRAPH_KSOCKET opt_netgraph.h
NETGRAPH_L2TP opt_netgraph.h
NETGRAPH_LMI opt_netgraph.h
-# MPPC compression requires proprietary files (not included)
NETGRAPH_MPPC_COMPRESSION opt_netgraph.h
NETGRAPH_MPPC_ENCRYPTION opt_netgraph.h
NETGRAPH_NAT opt_netgraph.h
Modified: head/sys/netgraph/ng_mppc.c
==
--- head/sys/netgraph/ng_mppc.c Thu Jan 19 23:44:05 2017(r312442)
+++ head/sys/netgraph/ng_mppc.c Fri Jan 20 00:02:11 2017(r312443)
@@ -66,7 +66,7 @@
#if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION)
#ifdef KLD_MODULE
-/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */
+#define NETGRAPH_MPPC_COMPRESSION
#define NETGRAPH_MPPC_ENCRYPTION
#else
/* This case is indicative of an error in sys/conf files */
@@ -81,7 +81,6 @@ static MALLOC_DEFINE(M_NETGRAPH_MPPC, "n
#endif
#ifdef NETGRAPH_MPPC_COMPRESSION
-/* XXX this file doesn't exist yet, but hopefully someday it will... */
#include
#endif
#ifdef NETGRAPH_MPPC_ENCRYPTION
@@ -543,7 +542,7 @@ err1:
&destCnt, d->history, flags, 0);
/* Check return value */
- KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+ /* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
if ((rtn & MPPC_EXPANDED) == 0
&& (rtn & MPPC_COMP_OK) == MPPC_COMP_OK) {
outlen -= destCnt;
@@ -805,7 +804,7 @@ failed:
&sourceCnt, &destCnt, d->history, flags);
/* Check return value */
- KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__));
+ /* KASSERT(rtn != MPPC_INVALID, ("%s: invalid", __func__)); */
if ((rtn & MPPC_DEST_EXHAUSTED) != 0
|| (rtn & MPPC_DECOMP_OK) != MPPC_DECOMP_OK) {
log(LOG_ERR, "%s: decomp returned 0x%x",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312437 - in head/sys/dev: mpr mps
On Thu, Jan 19, 2017 at 09:47:51PM +, Scott Long wrote: > Author: scottl > Date: Thu Jan 19 21:47:50 2017 > New Revision: 312437 > URL: https://svnweb.freebsd.org/changeset/base/312437 > > Log: > Rework the debug print API. Event printing no longer gets special handling. > All of the printing from the tables file now has wrappers so that the > handling is cleaner and it's possible to print something out (say, during > development) without having to fight the global debug flags. This re-org > will also make it easier to have the tables be compiled out at build time > if desired. > > Other than fixing some minor bugs, there are no user-visible changes from > this change Can you also do "atomics" print? Now debugs interleave w/ other outputs and line can split multiple times. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312446 - head/lib/libc/stdtime
Author: emaste
Date: Fri Jan 20 02:09:59 2017
New Revision: 312446
URL: https://svnweb.freebsd.org/changeset/base/312446
Log:
libc: remove reference to nonexistent lib/locale directory
As far as I can tell this was introduced in r72406 and updated in several
subsequent revisions, but the lib/locale directory it referenced never
existed.
Reviewed by: ngie
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D9252
Modified:
head/lib/libc/stdtime/Makefile.inc
Modified: head/lib/libc/stdtime/Makefile.inc
==
--- head/lib/libc/stdtime/Makefile.inc Fri Jan 20 00:17:53 2017
(r312445)
+++ head/lib/libc/stdtime/Makefile.inc Fri Jan 20 02:09:59 2017
(r312446)
@@ -1,8 +1,7 @@
# Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
# $FreeBSD$
-.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../locale \
- ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
+.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312450 - head/etc/mtree
Author: emaste Date: Fri Jan 20 03:14:18 2017 New Revision: 312450 URL: https://svnweb.freebsd.org/changeset/base/312450 Log: Remove obsolete /usr/lib/debug/usr/lib/private dir Missed in r282420 Reported by: dim Modified: head/etc/mtree/BSD.debug.dist Modified: head/etc/mtree/BSD.debug.dist == --- head/etc/mtree/BSD.debug.dist Fri Jan 20 02:50:24 2017 (r312449) +++ head/etc/mtree/BSD.debug.dist Fri Jan 20 03:14:18 2017 (r312450) @@ -40,8 +40,6 @@ .. i18n .. -private -.. .. libexec bsdinstall ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312451 - in head/lib/libc: . aarch64/string arm/aeabi capability gdtoa gen iconv md posix1e regex/grot resolv stdlib/jemalloc stdtime string sys
Author: ngie
Date: Fri Jan 20 03:23:24 2017
New Revision: 312451
URL: https://svnweb.freebsd.org/changeset/base/312451
Log:
Replace dot-dot relative pathing with SRCTOP-relative paths where possible
This reduces build output, need for recalculating paths, and makes it clearer
which paths are relative to what areas in the source tree. The change in
performance over a locally mounted UFS filesystem was negligible in my
testing,
but this may more positively impact other filesystems like NFS.
LIBC_SRCTOP was left alone so Juniper (and other users) can continue to
manipulate lib/libc/Makefile (and other Makefile.inc's under lib/libc) as
include Makefiles with custom options.
Discussed with: marcel, sjg
MFC after:1 week
Reviewed by: emaste
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D9207
Modified:
head/lib/libc/Makefile
head/lib/libc/aarch64/string/Makefile.inc
head/lib/libc/arm/aeabi/Makefile.inc
head/lib/libc/capability/Makefile.inc
head/lib/libc/gdtoa/Makefile.inc
head/lib/libc/gen/Makefile.inc
head/lib/libc/iconv/Makefile.inc
head/lib/libc/md/Makefile.inc
head/lib/libc/posix1e/Makefile.inc
head/lib/libc/regex/grot/Makefile
head/lib/libc/resolv/Makefile.inc
head/lib/libc/stdlib/jemalloc/Makefile.inc
head/lib/libc/stdtime/Makefile.inc
head/lib/libc/string/Makefile.inc
head/lib/libc/sys/Makefile.inc
Modified: head/lib/libc/Makefile
==
--- head/lib/libc/Makefile Fri Jan 20 03:14:18 2017(r312450)
+++ head/lib/libc/Makefile Fri Jan 20 03:23:24 2017(r312451)
@@ -36,7 +36,7 @@ SHLIB_LDSCRIPT=libc_nossp.ldscript
.endif
SHLIB_LDSCRIPT_LINKS=libxnet.so
WARNS?=2
-CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
+CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
.if ${MK_NLS} != "no"
CFLAGS+=-DNLS
Modified: head/lib/libc/aarch64/string/Makefile.inc
==
--- head/lib/libc/aarch64/string/Makefile.inc Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/aarch64/string/Makefile.inc Fri Jan 20 03:23:24 2017
(r312451)
@@ -4,7 +4,7 @@
# https://git.linaro.org/toolchain/cortex-strings.git
#
-.PATH: ${LIBC_SRCTOP}/../../contrib/cortex-strings/src/aarch64
+.PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64
MDSRCS+=memchr.S \
memcmp.S \
Modified: head/lib/libc/arm/aeabi/Makefile.inc
==
--- head/lib/libc/arm/aeabi/Makefile.incFri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/arm/aeabi/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
@@ -21,7 +21,7 @@ SRCS+=aeabi_vfp_double.S \
# libc. This causes issues when other parts of libc call these functions.
# We work around this by including these functions in libc but mark them as
# hidden so users of libc will not pick up these versions.
-.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/builtins/arm
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm
SRCS+= aeabi_memcmp.S \
aeabi_memcpy.S \
Modified: head/lib/libc/capability/Makefile.inc
==
--- head/lib/libc/capability/Makefile.inc Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/capability/Makefile.inc Fri Jan 20 03:23:24 2017
(r312451)
@@ -1,7 +1,7 @@
# $FreeBSD$
# capability sources
-.PATH: ${LIBC_SRCTOP}/../../sys/kern ${LIBC_SRCTOP}/capability
+.PATH: ${SRCTOP}/sys/kern ${LIBC_SRCTOP}/capability
SRCS+= subr_capability.c
Modified: head/lib/libc/gdtoa/Makefile.inc
==
--- head/lib/libc/gdtoa/Makefile.incFri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/gdtoa/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
@@ -10,11 +10,11 @@ GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex
SYM_MAPS+=${LIBC_SRCTOP}/gdtoa/Symbol.map
-CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/gdtoa
+CFLAGS+=-I${SRCTOP}/contrib/gdtoa
.for src in ${GDTOASRCS}
MISRCS+=gdtoa_${src}
CLEANFILES+=gdtoa_${src}
-gdtoa_${src}: ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} .NOMETA
+gdtoa_${src}: ${SRCTOP}/contrib/gdtoa/${src} .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
.endfor
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Fri Jan 20 03:14:18 2017
(r312450)
+++ head/lib/libc/gen/Makefile.inc Fri Jan 20 03:23:24 2017
(r312451)
@@ -152,11 +152,11 @@ SRCS+=fts-compat.c \
unvis-compat.c
.endif
-.PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
+.PATH: ${SRCTOP}/contrib/
svn commit: r312452 - in head/lib/libpam/modules: . pam_passwdqc pam_ssh
Author: ngie
Date: Fri Jan 20 03:27:47 2017
New Revision: 312452
URL: https://svnweb.freebsd.org/changeset/base/312452
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libpam/modules/Makefile.inc
head/lib/libpam/modules/pam_passwdqc/Makefile
head/lib/libpam/modules/pam_ssh/Makefile
Modified: head/lib/libpam/modules/Makefile.inc
==
--- head/lib/libpam/modules/Makefile.incFri Jan 20 03:23:24 2017
(r312451)
+++ head/lib/libpam/modules/Makefile.incFri Jan 20 03:27:47 2017
(r312452)
@@ -1,11 +1,11 @@
# $FreeBSD$
-PAMDIR=${.CURDIR}/../../../../contrib/openpam
+PAMDIR=${SRCTOP}/contrib/openpam
MK_INSTALLLIB= no
MK_PROFILE=no
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
LIBADD+= pam
Modified: head/lib/libpam/modules/pam_passwdqc/Makefile
==
--- head/lib/libpam/modules/pam_passwdqc/Makefile Fri Jan 20 03:23:24
2017(r312451)
+++ head/lib/libpam/modules/pam_passwdqc/Makefile Fri Jan 20 03:27:47
2017(r312452)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR=${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=${SRCTOP}/contrib/pam_modules/pam_passwdqc
.PATH: ${SRCDIR}
LIB= pam_passwdqc
Modified: head/lib/libpam/modules/pam_ssh/Makefile
==
--- head/lib/libpam/modules/pam_ssh/MakefileFri Jan 20 03:23:24 2017
(r312451)
+++ head/lib/libpam/modules/pam_ssh/MakefileFri Jan 20 03:27:47 2017
(r312452)
@@ -1,7 +1,7 @@
# PAM module for SSH
# $FreeBSD$
-SSHDIR=${.CURDIR}/../../../../crypto/openssh
+SSHDIR=${SRCTOP}/crypto/openssh
LIB= pam_ssh
MAN= pam_ssh.8
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312453 - in head/lib/libpam: libpam static_libpam
Author: ngie
Date: Fri Jan 20 03:31:50 2017
New Revision: 312453
URL: https://svnweb.freebsd.org/changeset/base/312453
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libpam/libpam/Makefile
head/lib/libpam/static_libpam/Makefile
Modified: head/lib/libpam/libpam/Makefile
==
--- head/lib/libpam/libpam/Makefile Fri Jan 20 03:27:47 2017
(r312452)
+++ head/lib/libpam/libpam/Makefile Fri Jan 20 03:31:50 2017
(r312453)
@@ -36,7 +36,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-OPENPAM= ${.CURDIR}/../../../contrib/openpam
+OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
# static_libpam will build libpam.a
Modified: head/lib/libpam/static_libpam/Makefile
==
--- head/lib/libpam/static_libpam/Makefile Fri Jan 20 03:27:47 2017
(r312452)
+++ head/lib/libpam/static_libpam/Makefile Fri Jan 20 03:31:50 2017
(r312453)
@@ -35,7 +35,7 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../libpam
+.PATH: ${SRCTOP}/lib/libpam
# Only build the static library.
LIB= pam
@@ -66,4 +66,4 @@ CLEANFILES+= openpam_static.o \
openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
${CC} -nostdlib ${CFLAGS} -o ${.TARGET} -r -Wl,--whole-archive
${.ALLSRC}
-.include "${.CURDIR}/../libpam/Makefile"
+.include "${.CURDIR:H}/libpam/Makefile"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312454 - in head/lib/libalias: libalias modules
Author: ngie
Date: Fri Jan 20 03:34:59 2017
New Revision: 312454
URL: https://svnweb.freebsd.org/changeset/base/312454
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libalias/libalias/Makefile
head/lib/libalias/modules/Makefile
head/lib/libalias/modules/Makefile.inc
Modified: head/lib/libalias/libalias/Makefile
==
--- head/lib/libalias/libalias/Makefile Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/libalias/Makefile Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
PACKAGE=lib${LIB}
LIB= alias
Modified: head/lib/libalias/modules/Makefile
==
--- head/lib/libalias/modules/Makefile Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/modules/Makefile Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
+.include "${SRCTOP}/sys/modules/libalias/modules/modules.inc"
SUBDIR=${MODULES}
Modified: head/lib/libalias/modules/Makefile.inc
==
--- head/lib/libalias/modules/Makefile.inc Fri Jan 20 03:31:50 2017
(r312453)
+++ head/lib/libalias/modules/Makefile.inc Fri Jan 20 03:34:59 2017
(r312454)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
SHLIBDIR?= /lib
LIB?= alias_${NAME}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312455 - in head/lib/csu: aarch64 amd64 arm i386 mips powerpc powerpc64 riscv sparc64
Author: ngie
Date: Fri Jan 20 03:52:16 2017
New Revision: 312455
URL: https://svnweb.freebsd.org/changeset/base/312455
Log:
Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/csu/aarch64/Makefile
head/lib/csu/amd64/Makefile
head/lib/csu/arm/Makefile
head/lib/csu/i386/Makefile
head/lib/csu/mips/Makefile
head/lib/csu/powerpc/Makefile
head/lib/csu/powerpc64/Makefile
head/lib/csu/riscv/Makefile
head/lib/csu/sparc64/Makefile
Modified: head/lib/csu/aarch64/Makefile
==
--- head/lib/csu/aarch64/Makefile Fri Jan 20 03:34:59 2017
(r312454)
+++ head/lib/csu/aarch64/Makefile Fri Jan 20 03:52:16 2017
(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/amd64/Makefile
==
--- head/lib/csu/amd64/Makefile Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/amd64/Makefile Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
CFLAGS+= -fno-omit-frame-pointer
FILES= ${OBJS}
Modified: head/lib/csu/arm/Makefile
==
--- head/lib/csu/arm/Makefile Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/arm/Makefile Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
STATIC_CFLAGS+=-mlong-calls
FILES= ${OBJS}
Modified: head/lib/csu/i386/Makefile
==
--- head/lib/csu/i386/Makefile Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/i386/Makefile Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= gcrt1.o crt1.o Scrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/mips/Makefile
==
--- head/lib/csu/mips/Makefile Fri Jan 20 03:34:59 2017(r312454)
+++ head/lib/csu/mips/Makefile Fri Jan 20 03:52:16 2017(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/powerpc/Makefile
==
--- head/lib/csu/powerpc/Makefile Fri Jan 20 03:34:59 2017
(r312454)
+++ head/lib/csu/powerpc/Makefile Fri Jan 20 03:52:16 2017
(r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/powerpc64/Makefile
==
--- head/lib/csu/powerpc64/Makefile Fri Jan 20
svn commit: r312456 - head/lib/libarchive
Author: ngie
Date: Fri Jan 20 03:54:36 2017
New Revision: 312456
URL: https://svnweb.freebsd.org/changeset/base/312456
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libarchive/Makefile
Modified: head/lib/libarchive/Makefile
==
--- head/lib/libarchive/MakefileFri Jan 20 03:52:16 2017
(r312455)
+++ head/lib/libarchive/MakefileFri Jan 20 03:54:36 2017
(r312456)
@@ -2,7 +2,7 @@
.include
PACKAGE=lib${LIB}
-_LIBARCHIVEDIR=${.CURDIR}/../../contrib/libarchive
+_LIBARCHIVEDIR=${SRCTOP}/contrib/libarchive
LIB= archive
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312457 - head/lib/libauditd
Author: ngie
Date: Fri Jan 20 03:55:21 2017
New Revision: 312457
URL: https://svnweb.freebsd.org/changeset/base/312457
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libauditd/Makefile
Modified: head/lib/libauditd/Makefile
==
--- head/lib/libauditd/Makefile Fri Jan 20 03:54:36 2017(r312456)
+++ head/lib/libauditd/Makefile Fri Jan 20 03:55:21 2017(r312457)
@@ -3,7 +3,7 @@
#
PACKAGE=lib${LIB}
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
_LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
_LIBBSMDIR=${OPENBSMDIR}/libbsm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312458 - head/lib/libbegemot
Author: ngie
Date: Fri Jan 20 03:55:43 2017
New Revision: 312458
URL: https://svnweb.freebsd.org/changeset/base/312458
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libbegemot/Makefile
Modified: head/lib/libbegemot/Makefile
==
--- head/lib/libbegemot/MakefileFri Jan 20 03:55:21 2017
(r312457)
+++ head/lib/libbegemot/MakefileFri Jan 20 03:55:43 2017
(r312458)
@@ -1,6 +1,6 @@
# $FreeBSD$
-LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
+LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot
PACKAGE=lib${LIB}
.PATH: ${LIBBEGEMOT_DIR}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312459 - head/lib/libblocksruntime
Author: ngie
Date: Fri Jan 20 03:56:10 2017
New Revision: 312459
URL: https://svnweb.freebsd.org/changeset/base/312459
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libblocksruntime/Makefile
Modified: head/lib/libblocksruntime/Makefile
==
--- head/lib/libblocksruntime/Makefile Fri Jan 20 03:55:43 2017
(r312458)
+++ head/lib/libblocksruntime/Makefile Fri Jan 20 03:56:10 2017
(r312459)
@@ -6,7 +6,7 @@ SHLIB_MAJOR=0
CFLAGS+=-I${.CURDIR}
WARNS?=2
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime
INCS= Block.h Block_private.h
SRCS= data.c runtime.c
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312460 - head/lib/libbluetooth
Author: ngie
Date: Fri Jan 20 03:56:42 2017
New Revision: 312460
URL: https://svnweb.freebsd.org/changeset/base/312460
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libbluetooth/Makefile
Modified: head/lib/libbluetooth/Makefile
==
--- head/lib/libbluetooth/Makefile Fri Jan 20 03:56:10 2017
(r312459)
+++ head/lib/libbluetooth/Makefile Fri Jan 20 03:56:42 2017
(r312460)
@@ -6,7 +6,7 @@ LIB=bluetooth
MAN= bluetooth.3
WARNS?=2
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys
SHLIB_MAJOR= 4
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312461 - head/lib/libbsm
Author: ngie
Date: Fri Jan 20 03:57:24 2017
New Revision: 312461
URL: https://svnweb.freebsd.org/changeset/base/312461
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libbsm/Makefile
Modified: head/lib/libbsm/Makefile
==
--- head/lib/libbsm/MakefileFri Jan 20 03:56:42 2017(r312460)
+++ head/lib/libbsm/MakefileFri Jan 20 03:57:24 2017(r312461)
@@ -3,7 +3,7 @@
#
PACKAGE= lib${LIB}
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
_LIBBSMDIR=${OPENBSMDIR}/libbsm
LIB= bsm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312462 - head/lib/libbsnmp/libbsnmp
Author: ngie
Date: Fri Jan 20 03:57:52 2017
New Revision: 312462
URL: https://svnweb.freebsd.org/changeset/base/312462
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libbsnmp/libbsnmp/Makefile
Modified: head/lib/libbsnmp/libbsnmp/Makefile
==
--- head/lib/libbsnmp/libbsnmp/Makefile Fri Jan 20 03:57:24 2017
(r312461)
+++ head/lib/libbsnmp/libbsnmp/Makefile Fri Jan 20 03:57:52 2017
(r312462)
@@ -4,7 +4,7 @@
.include
-CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
+CONTRIB= ${SRCTOP}/contrib/bsnmp/lib
.PATH: ${CONTRIB}
LIB= bsnmp
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312464 - head/lib/libc++
Author: ngie
Date: Fri Jan 20 03:59:10 2017
New Revision: 312464
URL: https://svnweb.freebsd.org/changeset/base/312464
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libc++/Makefile
Modified: head/lib/libc++/Makefile
==
--- head/lib/libc++/MakefileFri Jan 20 03:58:50 2017(r312463)
+++ head/lib/libc++/MakefileFri Jan 20 03:59:10 2017(r312464)
@@ -3,9 +3,9 @@
.include
PACKAGE= clibs
-_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt
-HDRDIR=${.CURDIR}/../../contrib/libc++/include
-SRCDIR=${.CURDIR}/../../contrib/libc++/src
+_LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt
+HDRDIR=${SRCTOP}/contrib/libc++/include
+SRCDIR=${SRCTOP}/contrib/libc++/src
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
.if ${MACHINE_CPUARCH} == "arm"
STATIC_CXXFLAGS+= -mlong-calls
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312463 - head/lib/libbz2
Author: ngie
Date: Fri Jan 20 03:58:50 2017
New Revision: 312463
URL: https://svnweb.freebsd.org/changeset/base/312463
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libbz2/Makefile
Modified: head/lib/libbz2/Makefile
==
--- head/lib/libbz2/MakefileFri Jan 20 03:57:52 2017(r312462)
+++ head/lib/libbz2/MakefileFri Jan 20 03:58:50 2017(r312463)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE= lib${LIB}
-BZ2DIR=${.CURDIR}/../../contrib/bzip2
+BZ2DIR=${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
LIB= bz2
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312465 - head/lib/libcam
Author: ngie
Date: Fri Jan 20 04:03:55 2017
New Revision: 312465
URL: https://svnweb.freebsd.org/changeset/base/312465
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libcam/Makefile
Modified: head/lib/libcam/Makefile
==
--- head/lib/libcam/MakefileFri Jan 20 03:59:10 2017(r312464)
+++ head/lib/libcam/MakefileFri Jan 20 04:03:55 2017(r312465)
@@ -36,11 +36,10 @@ MLINKS+=cam.3 cam_open_device.3 \
cam_cdbparse.3 csio_encode_visit.3 \
cam_cdbparse.3 buff_encode_visit.3
-.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \
- ${.CURDIR}/../../sys/cam
+.PATH: ${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \
+ ${SRCTOP}/sys/cam
-SDIR= ${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR} -I${SDIR}
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys
SHLIB_MAJOR= 7
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312466 - head/lib/libc_nonshared
Author: ngie
Date: Fri Jan 20 04:04:25 2017
New Revision: 312466
URL: https://svnweb.freebsd.org/changeset/base/312466
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libc_nonshared/Makefile
Modified: head/lib/libc_nonshared/Makefile
==
--- head/lib/libc_nonshared/MakefileFri Jan 20 04:03:55 2017
(r312465)
+++ head/lib/libc_nonshared/MakefileFri Jan 20 04:04:25 2017
(r312466)
@@ -6,7 +6,7 @@
# bsd.lib.mk doesn't have an easy way to express that.
MK_PROFILE?=no
.include
-NO_PIC=
+NO_PIC=
# -fpic on some platforms, -fPIC on others.
CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
@@ -18,9 +18,9 @@ LIBC_NONSHARED_SRCS=
SRCS= __stub.c
.if ${MK_ICONV} == "yes"
-.PATH: ${.CURDIR}/../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
.include "Makefile.iconv"
-CFLAGS+=-I${.CURDIR}/../libc/iconv
+CFLAGS+=-I${SRCTOP}/lib/libc/iconv
.endif
SRCS+= ${LIBC_NONSHARED_SRCS}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312467 - in head/lib/ncurses: . form formw menu menuw ncurses ncursesw panel panelw
Author: ngie
Date: Fri Jan 20 04:27:40 2017
New Revision: 312467
URL: https://svnweb.freebsd.org/changeset/base/312467
Log:
Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/ncurses/config.mk
head/lib/ncurses/form/Makefile
head/lib/ncurses/formw/Makefile
head/lib/ncurses/menu/Makefile
head/lib/ncurses/menuw/Makefile
head/lib/ncurses/ncurses/Makefile
head/lib/ncurses/ncursesw/Makefile
head/lib/ncurses/panel/Makefile
head/lib/ncurses/panelw/Makefile
Modified: head/lib/ncurses/config.mk
==
--- head/lib/ncurses/config.mk Fri Jan 20 04:04:25 2017(r312466)
+++ head/lib/ncurses/config.mk Fri Jan 20 04:27:40 2017(r312467)
@@ -2,25 +2,25 @@
# This Makefile is shared by libncurses, libform, libmenu, libpanel.
-NCURSES_DIR= ${.CURDIR}/../../../contrib/ncurses
+NCURSES_DIR= ${SRCTOP}/contrib/ncurses
.if defined(ENABLE_WIDEC)
LIB_SUFFIX=w
CFLAGS+= -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC
-NCURSES_CFG_H= ${.CURDIR}/../ncurses/ncurses_cfg.h
+NCURSES_CFG_H= ${.CURDIR:H}/ncurses/ncurses_cfg.h
.else
LIB_SUFFIX=
NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h
.endif
CFLAGS+= -I.
-.if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX})
-CFLAGS+= -I${.OBJDIR}/../ncurses${LIB_SUFFIX}
+.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX})
+CFLAGS+= -I${.OBJDIR:H}/ncurses${LIB_SUFFIX}
.endif
-CFLAGS+= -I${.CURDIR}/../ncurses${LIB_SUFFIX}
+CFLAGS+= -I${.CURDIR:H}/ncurses${LIB_SUFFIX}
# for ${NCURSES_CFG_H}
-CFLAGS+= -I${.CURDIR}/../ncurses
+CFLAGS+= -I${.CURDIR:H}/ncurses
CFLAGS+= -I${NCURSES_DIR}/include
CFLAGS+= -I${NCURSES_DIR}/ncurses
Modified: head/lib/ncurses/form/Makefile
==
--- head/lib/ncurses/form/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/form/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR=${NCURSES_DIR}/form
Modified: head/lib/ncurses/formw/Makefile
==
--- head/lib/ncurses/formw/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/formw/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../form/Makefile"
+.include "${.CURDIR:H}/form/Makefile"
Modified: head/lib/ncurses/menu/Makefile
==
--- head/lib/ncurses/menu/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/menu/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR=${NCURSES_DIR}/menu
Modified: head/lib/ncurses/menuw/Makefile
==
--- head/lib/ncurses/menuw/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/menuw/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../menu/Makefile"
+.include "${.CURDIR:H}/menu/Makefile"
Modified: head/lib/ncurses/ncurses/Makefile
==
--- head/lib/ncurses/ncurses/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/ncurses/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -10,7 +10,7 @@ MK_MAN=no
.include
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
LIB= ncurses${LIB_SUFFIX}
SHLIB_MAJOR= 8
Modified: head/lib/ncurses/ncursesw/Makefile
==
--- head/lib/ncurses/ncursesw/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/ncursesw/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -2,6 +2,6 @@
ENABLE_WIDEC=
-.PATH: ${.CURDIR}/../ncurses
+.PATH: ${.CURDIR:H}/ncurses
-.include "${.CURDIR}/../ncurses/Makefile"
+.include "${.CURDIR:H}/ncurses/Makefile"
Modified: head/lib/ncurses/panel/Makefile
==
--- head/lib/ncurses/panel/Makefile Fri Jan 20 04:04:25 2017
(r312466)
+++ head/lib/ncurses/panel/Makefile Fri Jan 20 04:27:40 2017
(r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR=${NCURSES_DIR}/panel
Modified: head/lib/ncurses/panelw/Makefile
==
svn commit: r312468 - head/lib/libthread_db
Author: ngie
Date: Fri Jan 20 04:28:16 2017
New Revision: 312468
URL: https://svnweb.freebsd.org/changeset/base/312468
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libthread_db/Makefile
Modified: head/lib/libthread_db/Makefile
==
--- head/lib/libthread_db/Makefile Fri Jan 20 04:27:40 2017
(r312467)
+++ head/lib/libthread_db/Makefile Fri Jan 20 04:28:16 2017
(r312468)
@@ -15,7 +15,7 @@ CFLAGS+=-I. -I${.CURDIR}
SYM_MAPS+=${.CURDIR}/Symbol.map
SYMBOL_MAPS=${SYM_MAPS}
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
# Unfortunately, clang gives an incorrect warning about alignment in
# arch/i386/libpthread_md.c, so turn that off for now.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312469 - head/lib/libypclnt
Author: ngie
Date: Fri Jan 20 04:28:41 2017
New Revision: 312469
URL: https://svnweb.freebsd.org/changeset/base/312469
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libypclnt/Makefile
Modified: head/lib/libypclnt/Makefile
==
--- head/lib/libypclnt/Makefile Fri Jan 20 04:28:16 2017(r312468)
+++ head/lib/libypclnt/Makefile Fri Jan 20 04:28:41 2017(r312469)
@@ -24,9 +24,9 @@ GENSRCS=yp.h \
yppasswd_private_xdr.c
RPCGEN=RPCGEN_CPP=${CPP:Q} rpcgen -C
-RPCSRC=${.CURDIR}/../../include/rpcsvc/yp.x
-RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x
-RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
+RPCSRC=${SRCTOP}/include/rpcsvc/yp.x
+RPCSRC_PW= ${SRCTOP}/include/rpcsvc/yppasswd.x
+RPCSRC_PRIV= ${SRCTOP}/usr.sbin/rpc.yppasswdd/yppasswd_private.x
yp.h: ${RPCSRC}
${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312470 - head/lib/libutil
Author: ngie
Date: Fri Jan 20 04:29:05 2017
New Revision: 312470
URL: https://svnweb.freebsd.org/changeset/base/312470
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libutil/Makefile
Modified: head/lib/libutil/Makefile
==
--- head/lib/libutil/Makefile Fri Jan 20 04:28:41 2017(r312469)
+++ head/lib/libutil/Makefile Fri Jan 20 04:29:05 2017(r312470)
@@ -25,7 +25,7 @@ CFLAGS+= -DLIBC_SCCS
CFLAGS+= -DINET6
.endif
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/
MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \
humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312471 - head/lib/libulog
Author: ngie
Date: Fri Jan 20 04:29:23 2017
New Revision: 312471
URL: https://svnweb.freebsd.org/changeset/base/312471
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libulog/Makefile
Modified: head/lib/libulog/Makefile
==
--- head/lib/libulog/Makefile Fri Jan 20 04:29:05 2017(r312470)
+++ head/lib/libulog/Makefile Fri Jan 20 04:29:23 2017(r312471)
@@ -22,7 +22,7 @@ MLINKS+=ulog_login.3 ulog_login_pseudo.3
LIBADD=md
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_INSTALLLIB} != "no"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312472 - head/lib/libufs
Author: ngie
Date: Fri Jan 20 04:30:05 2017
New Revision: 312472
URL: https://svnweb.freebsd.org/changeset/base/312472
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libufs/Makefile
Modified: head/lib/libufs/Makefile
==
--- head/lib/libufs/MakefileFri Jan 20 04:29:23 2017(r312471)
+++ head/lib/libufs/MakefileFri Jan 20 04:30:05 2017(r312472)
@@ -18,7 +18,7 @@ MLINKS+= ufs_disk_close.3 ufs_disk_fillo
MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
MLINKS+= ufs_disk_close.3 ufs_disk_write.3
-.PATH: ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${SRCTOP}/sys/ufs/ffs
WARNS?=2
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312473 - head/lib/libunbound
Author: ngie
Date: Fri Jan 20 04:31:19 2017
New Revision: 312473
URL: https://svnweb.freebsd.org/changeset/base/312473
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libunbound/Makefile
Modified: head/lib/libunbound/Makefile
==
--- head/lib/libunbound/MakefileFri Jan 20 04:30:05 2017
(r312472)
+++ head/lib/libunbound/MakefileFri Jan 20 04:31:19 2017
(r312473)
@@ -2,8 +2,8 @@
PACKAGE=lib${LIB}
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
# Hold my beer and watch this
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64
${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound
${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util
${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312474 - in head/lib/libthr: . support
Author: ngie
Date: Fri Jan 20 04:32:19 2017
New Revision: 312474
URL: https://svnweb.freebsd.org/changeset/base/312474
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libthr/Makefile
head/lib/libthr/support/Makefile.inc
Modified: head/lib/libthr/Makefile
==
--- head/lib/libthr/MakefileFri Jan 20 04:31:19 2017(r312473)
+++ head/lib/libthr/MakefileFri Jan 20 04:32:19 2017(r312474)
@@ -18,13 +18,13 @@ LIB=thr
SHLIB_MAJOR= 3
WARNS?=3
CFLAGS+=-DPTHREAD_KERNEL
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
- -I${.CURDIR}/../../include
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
+ -I${SRCTOP}/include
CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
CFLAGS+=-I${.CURDIR}/sys
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
-CFLAGS+=-I${.CURDIR}/../libthread_db
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
+CFLAGS+=-I${SRCTOP}/lib/libthread_db
CFLAGS+=-Winline
.ifndef NO_THREAD_UNWIND_STACK
@@ -34,7 +34,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND
LDFLAGS+=-Wl,-znodelete
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/pthread.map
MAN= libthr.3
Modified: head/lib/libthr/support/Makefile.inc
==
--- head/lib/libthr/support/Makefile.incFri Jan 20 04:31:19 2017
(r312473)
+++ head/lib/libthr/support/Makefile.incFri Jan 20 04:32:19 2017
(r312474)
@@ -1,15 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string
# libc must search machine_arch, then machine_cpuarch, but libthr has all its
# code implemented in machine_cpuarch. Cope.
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys)
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys)
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH}
.else
-.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
.endif
SYSCALLS= thr_new
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312475 - head/lib/libtelnet
Author: ngie
Date: Fri Jan 20 04:32:36 2017
New Revision: 312475
URL: https://svnweb.freebsd.org/changeset/base/312475
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libtelnet/Makefile
Modified: head/lib/libtelnet/Makefile
==
--- head/lib/libtelnet/Makefile Fri Jan 20 04:32:19 2017(r312474)
+++ head/lib/libtelnet/Makefile Fri Jan 20 04:32:36 2017(r312475)
@@ -4,7 +4,7 @@
.include
PACKAGE=lib${LIB}
-TELNETDIR= ${.CURDIR}/../../contrib/telnet
+TELNETDIR= ${SRCTOP}/contrib/telnet
.PATH: ${TELNETDIR}/libtelnet
LIB= telnet
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312476 - head/lib/libsysdecode
Author: ngie
Date: Fri Jan 20 04:33:20 2017
New Revision: 312476
URL: https://svnweb.freebsd.org/changeset/base/312476
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsysdecode/Makefile
Modified: head/lib/libsysdecode/Makefile
==
--- head/lib/libsysdecode/Makefile Fri Jan 20 04:32:36 2017
(r312475)
+++ head/lib/libsysdecode/Makefile Fri Jan 20 04:33:20 2017
(r312476)
@@ -9,8 +9,8 @@ SRCS= errno.c flags.c ioctl.c signal.c s
INCS= sysdecode.h
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
MAN= sysdecode.3 \
sysdecode_abi_to_freebsd_errno.3 \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312477 - head/lib/libstdthreads
Author: ngie
Date: Fri Jan 20 04:33:45 2017
New Revision: 312477
URL: https://svnweb.freebsd.org/changeset/base/312477
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libstdthreads/Makefile
Modified: head/lib/libstdthreads/Makefile
==
--- head/lib/libstdthreads/Makefile Fri Jan 20 04:33:20 2017
(r312476)
+++ head/lib/libstdthreads/Makefile Fri Jan 20 04:33:45 2017
(r312477)
@@ -35,7 +35,7 @@ MLINKS= thrd_create.3 call_once.3 \
LIBADD=pthread
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312478 - head/lib/libsqlite3
Author: ngie
Date: Fri Jan 20 04:34:01 2017
New Revision: 312478
URL: https://svnweb.freebsd.org/changeset/base/312478
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsqlite3/Makefile
Modified: head/lib/libsqlite3/Makefile
==
--- head/lib/libsqlite3/MakefileFri Jan 20 04:33:45 2017
(r312477)
+++ head/lib/libsqlite3/MakefileFri Jan 20 04:34:01 2017
(r312478)
@@ -8,7 +8,7 @@ LIBADD+=pthread
SRCS= sqlite3.c
-SQLITE=${.CURDIR}/../../contrib/sqlite3
+SQLITE=${SRCTOP}/contrib/sqlite3
.PATH: ${SQLITE}
WARNS= 3
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312480 - head/lib/libsmb
Author: ngie
Date: Fri Jan 20 04:35:00 2017
New Revision: 312480
URL: https://svnweb.freebsd.org/changeset/base/312480
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsmb/Makefile
Modified: head/lib/libsmb/Makefile
==
--- head/lib/libsmb/MakefileFri Jan 20 04:34:34 2017(r312479)
+++ head/lib/libsmb/MakefileFri Jan 20 04:35:00 2017(r312480)
@@ -3,7 +3,7 @@
.include
PACKAGE=lib${LIB}
-CONTRIBDIR=${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR=${SRCTOP}/contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
LIB= smb
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312479 - head/lib/libsmutil
Author: ngie
Date: Fri Jan 20 04:34:34 2017
New Revision: 312479
URL: https://svnweb.freebsd.org/changeset/base/312479
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsmutil/Makefile
Modified: head/lib/libsmutil/Makefile
==
--- head/lib/libsmutil/Makefile Fri Jan 20 04:34:01 2017(r312478)
+++ head/lib/libsmutil/Makefile Fri Jan 20 04:34:34 2017(r312479)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmutil
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312481 - head/lib/libsmdb
Author: ngie
Date: Fri Jan 20 04:35:18 2017
New Revision: 312481
URL: https://svnweb.freebsd.org/changeset/base/312481
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsmdb/Makefile
Modified: head/lib/libsmdb/Makefile
==
--- head/lib/libsmdb/Makefile Fri Jan 20 04:35:00 2017(r312480)
+++ head/lib/libsmdb/Makefile Fri Jan 20 04:35:18 2017(r312481)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmdb
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312482 - head/lib/libsm
Author: ngie
Date: Fri Jan 20 04:35:36 2017
New Revision: 312482
URL: https://svnweb.freebsd.org/changeset/base/312482
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsm/Makefile
Modified: head/lib/libsm/Makefile
==
--- head/lib/libsm/Makefile Fri Jan 20 04:35:18 2017(r312481)
+++ head/lib/libsm/Makefile Fri Jan 20 04:35:36 2017(r312482)
@@ -3,7 +3,7 @@
.include
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsm
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312483 - head/lib/libsbuf
Author: ngie
Date: Fri Jan 20 04:35:49 2017
New Revision: 312483
URL: https://svnweb.freebsd.org/changeset/base/312483
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libsbuf/Makefile
Modified: head/lib/libsbuf/Makefile
==
--- head/lib/libsbuf/Makefile Fri Jan 20 04:35:36 2017(r312482)
+++ head/lib/libsbuf/Makefile Fri Jan 20 04:35:49 2017(r312483)
@@ -10,6 +10,6 @@ SHLIB_MAJOR = 6
SYMBOL_MAPS=${.CURDIR}/Symbol.map
VERSION_DEF= ${.CURDIR}/Version.def
-.PATH: ${.CURDIR}/../../sys/kern
+.PATH: ${SRCTOP}/sys/kern
.include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312485 - head/lib/librpcsvc
Author: ngie
Date: Fri Jan 20 04:36:28 2017
New Revision: 312485
URL: https://svnweb.freebsd.org/changeset/base/312485
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/librpcsvc/Makefile
Modified: head/lib/librpcsvc/Makefile
==
--- head/lib/librpcsvc/Makefile Fri Jan 20 04:36:06 2017(r312484)
+++ head/lib/librpcsvc/Makefile Fri Jan 20 04:36:28 2017(r312485)
@@ -3,7 +3,7 @@
.include
-.PATH: ${.CURDIR}/../../include/rpcsvc
+.PATH: ${SRCTOP}/include/rpcsvc
PACKAGE=lib${LIB}
LIB=rpcsvc
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312486 - head/lib/librpcsec_gss
Author: ngie
Date: Fri Jan 20 04:36:48 2017
New Revision: 312486
URL: https://svnweb.freebsd.org/changeset/base/312486
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/librpcsec_gss/Makefile
Modified: head/lib/librpcsec_gss/Makefile
==
--- head/lib/librpcsec_gss/Makefile Fri Jan 20 04:36:28 2017
(r312485)
+++ head/lib/librpcsec_gss/Makefile Fri Jan 20 04:36:48 2017
(r312486)
@@ -8,11 +8,11 @@ SRCS+=rpcsec_gss.c rpcsec_gss_prot.c rp
LIBADD=gssapi
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-CFLAGS+= -I${.CURDIR}/../../include
-CFLAGS+= -I${.CURDIR}/../../libc_rpc
+CFLAGS+= -I${SRCTOP}/include
+CFLAGS+= -I${SRCTOP}/lib/libc_rpc
MK_PROFILE=no
MAN= rpcsec_gss.3
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312484 - head/lib/librt
Author: ngie
Date: Fri Jan 20 04:36:06 2017
New Revision: 312484
URL: https://svnweb.freebsd.org/changeset/base/312484
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/librt/Makefile
Modified: head/lib/librt/Makefile
==
--- head/lib/librt/Makefile Fri Jan 20 04:35:49 2017(r312483)
+++ head/lib/librt/Makefile Fri Jan 20 04:36:06 2017(r312484)
@@ -5,7 +5,7 @@
PACKAGE=lib${LIB}
LIB=rt
SHLIB_MAJOR= 1
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
.ifndef NO_THREAD_STACK_UNWIND
CFLAGS+=-fexceptions
.endif
@@ -18,7 +18,7 @@ SRCS+= aio.c mq.c sigev_thread.c timer.c
PRECIOUSLIB=
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312487 - head/lib/libpe
Author: ngie
Date: Fri Jan 20 04:37:03 2017
New Revision: 312487
URL: https://svnweb.freebsd.org/changeset/base/312487
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libpe/Makefile
Modified: head/lib/libpe/Makefile
==
--- head/lib/libpe/Makefile Fri Jan 20 04:36:48 2017(r312486)
+++ head/lib/libpe/Makefile Fri Jan 20 04:37:03 2017(r312487)
@@ -3,7 +3,7 @@
INTERNALLIB=
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/libpe
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312488 - head/lib/libproc
Author: ngie
Date: Fri Jan 20 04:37:22 2017
New Revision: 312488
URL: https://svnweb.freebsd.org/changeset/base/312488
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libproc/Makefile
Modified: head/lib/libproc/Makefile
==
--- head/lib/libproc/Makefile Fri Jan 20 04:37:03 2017(r312487)
+++ head/lib/libproc/Makefile Fri Jan 20 04:37:22 2017(r312488)
@@ -30,9 +30,9 @@ LIBADD+= elf procstat rtld_db util
.if ${MK_CDDL} != "no"
LIBADD+= ctf
IGNORE_PRAGMA= YES
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
- -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
- -I${.CURDIR}/../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
+ -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
+ -I${SRCTOP}/sys/cddl/compat/opensolaris
.else
CFLAGS+= -DNO_CTF
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312489 - head/lib/libprocstat/zfs
Author: ngie
Date: Fri Jan 20 04:38:54 2017
New Revision: 312489
URL: https://svnweb.freebsd.org/changeset/base/312489
Log:
Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libprocstat/zfs/Makefile
Modified: head/lib/libprocstat/zfs/Makefile
==
--- head/lib/libprocstat/zfs/Makefile Fri Jan 20 04:37:22 2017
(r312488)
+++ head/lib/libprocstat/zfs/Makefile Fri Jan 20 04:38:54 2017
(r312489)
@@ -1,21 +1,21 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
SRCS= zfs.c
OBJS= zfs.o
WARNS?=1
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR:H}
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
all: ${OBJS}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312490 - head/lib/libpcap
Author: ngie
Date: Fri Jan 20 04:39:36 2017
New Revision: 312490
URL: https://svnweb.freebsd.org/changeset/base/312490
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libpcap/Makefile
Modified: head/lib/libpcap/Makefile
==
--- head/lib/libpcap/Makefile Fri Jan 20 04:38:54 2017(r312489)
+++ head/lib/libpcap/Makefile Fri Jan 20 04:39:36 2017(r312490)
@@ -114,7 +114,7 @@ SHLIB_MAJOR=8
#
# Magic to grab sources out of src/contrib
#
-PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
+PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap
CFLAGS+=-I${PCAP_DISTDIR}
.PATH: ${PCAP_DISTDIR}
.PATH: ${PCAP_DISTDIR}/bpf/net
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312491 - head/lib/libopie
Author: ngie
Date: Fri Jan 20 04:40:10 2017
New Revision: 312491
URL: https://svnweb.freebsd.org/changeset/base/312491
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libopie/Makefile
Modified: head/lib/libopie/Makefile
==
--- head/lib/libopie/Makefile Fri Jan 20 04:39:36 2017(r312490)
+++ head/lib/libopie/Makefile Fri Jan 20 04:40:10 2017(r312491)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
PACKAGE=lib${LIB}
-OPIE_DIST?=${.CURDIR}/../../contrib/opie
+OPIE_DIST?=${SRCTOP}/contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
SHLIB_MAJOR=8
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312492 - head/lib/libnv
Author: ngie
Date: Fri Jan 20 04:40:55 2017
New Revision: 312492
URL: https://svnweb.freebsd.org/changeset/base/312492
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This implifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libnv/Makefile
Modified: head/lib/libnv/Makefile
==
--- head/lib/libnv/Makefile Fri Jan 20 04:40:10 2017(r312491)
+++ head/lib/libnv/Makefile Fri Jan 20 04:40:55 2017(r312492)
@@ -8,8 +8,8 @@ SHLIBDIR?= /lib
LIB= nv
SHLIB_MAJOR= 0
-.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys
-CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
+.PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
+CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR}
SRCS= cnvlist.c
SRCS+= dnvlist.c
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312493 - head/lib/libngatm
Author: ngie
Date: Fri Jan 20 04:41:53 2017
New Revision: 312493
URL: https://svnweb.freebsd.org/changeset/base/312493
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libngatm/Makefile
Modified: head/lib/libngatm/Makefile
==
--- head/lib/libngatm/Makefile Fri Jan 20 04:40:55 2017(r312492)
+++ head/lib/libngatm/Makefile Fri Jan 20 04:41:53 2017(r312493)
@@ -8,8 +8,8 @@ SHLIB_MAJOR= 4
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
# source of the library lives in contrib
-SDIR= ${.CURDIR}/../../sys
-CTRB= ${.CURDIR}/../../contrib/ngatm
+SDIR= ${SRCTOP}/sys
+CTRB= ${SRCTOP}/contrib/ngatm
LIBBASE= ${SDIR}/contrib/ngatm
CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312494 - head/lib/libmp
Author: ngie
Date: Fri Jan 20 04:42:11 2017
New Revision: 312494
URL: https://svnweb.freebsd.org/changeset/base/312494
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libmp/Makefile
Modified: head/lib/libmp/Makefile
==
--- head/lib/libmp/Makefile Fri Jan 20 04:41:53 2017(r312493)
+++ head/lib/libmp/Makefile Fri Jan 20 04:42:11 2017(r312494)
@@ -10,9 +10,9 @@ MAN= libmp.3
INCS= mp.h
SRCS= mpasbn.c
-CFLAGS+= -I${.CURDIR}/../../crypto
+CFLAGS+= -I${SRCTOP}/crypto
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312495 - head/lib/libmilter
Author: ngie
Date: Fri Jan 20 04:42:43 2017
New Revision: 312495
URL: https://svnweb.freebsd.org/changeset/base/312495
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libmilter/Makefile
Modified: head/lib/libmilter/Makefile
==
--- head/lib/libmilter/Makefile Fri Jan 20 04:42:11 2017(r312494)
+++ head/lib/libmilter/Makefile Fri Jan 20 04:42:43 2017(r312495)
@@ -3,7 +3,7 @@
.include
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312496 - head/lib/libmd
Author: ngie
Date: Fri Jan 20 04:43:21 2017
New Revision: 312496
URL: https://svnweb.freebsd.org/changeset/base/312496
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libmd/Makefile
Modified: head/lib/libmd/Makefile
==
--- head/lib/libmd/Makefile Fri Jan 20 04:42:43 2017(r312495)
+++ head/lib/libmd/Makefile Fri Jan 20 04:43:21 2017(r312496)
@@ -78,11 +78,11 @@ CLEANFILES+=md[245]hl.c md[245].ref md[
# in which case:
# * macros are used to rename symbols to libcrypt internal names
# * no weak aliases are generated
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2
-CFLAGS+= -I${.CURDIR}/../../sys/crypto/skein
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys/crypto/skein
CFLAGS+= -DWEAK_REFS
-.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
-.PATH: ${.CURDIR}/../../sys/crypto/skein
${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
.if exists(${MACHINE_ARCH}/sha.S)
SRCS+= sha.S
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312497 - head/lib/libmagic
Author: ngie
Date: Fri Jan 20 04:45:09 2017
New Revision: 312497
URL: https://svnweb.freebsd.org/changeset/base/312497
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libmagic/Makefile
Modified: head/lib/libmagic/Makefile
==
--- head/lib/libmagic/Makefile Fri Jan 20 04:43:21 2017(r312496)
+++ head/lib/libmagic/Makefile Fri Jan 20 04:45:09 2017(r312497)
@@ -2,7 +2,7 @@
# Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
PACKAGE=lib${LIB}
-CONTRDIR= ${.CURDIR}/../../contrib/file
+CONTRDIR= ${SRCTOP}/contrib/file
.PATH: ${CONTRDIR}/src
.PATH: ${CONTRDIR}/doc
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312498 - head/lib/liblzma
Author: ngie
Date: Fri Jan 20 04:46:20 2017
New Revision: 312498
URL: https://svnweb.freebsd.org/changeset/base/312498
Log:
Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/liblzma/Makefile
Modified: head/lib/liblzma/Makefile
==
--- head/lib/liblzma/Makefile Fri Jan 20 04:45:09 2017(r312497)
+++ head/lib/liblzma/Makefile Fri Jan 20 04:46:20 2017(r312498)
@@ -2,9 +2,9 @@
PACKAGE=lib${LIB}
LIB= lzma
-LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
+LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma
-.PATH: ${LZMADIR}/../common
+.PATH: ${LZMADIR:H}/common
SRCS+= tuklib_physmem.c tuklib_cpucores.c
.PATH: ${LZMADIR}/api/lzma
@@ -145,7 +145,7 @@ CFLAGS+=-DHAVE_CONFIG_H \
-I${LZMADIR}/lzma \
-I${LZMADIR}/delta \
-I${LZMADIR}/simple \
- -I${LZMADIR}/../common
+ -I${LZMADIR:H}/common
LIBADD+= pthread
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312500 - head/lib/libkiconv
Author: ngie
Date: Fri Jan 20 04:50:46 2017
New Revision: 312500
URL: https://svnweb.freebsd.org/changeset/base/312500
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libkiconv/Makefile
Modified: head/lib/libkiconv/Makefile
==
--- head/lib/libkiconv/Makefile Fri Jan 20 04:50:19 2017(r312499)
+++ head/lib/libkiconv/Makefile Fri Jan 20 04:50:46 2017(r312500)
@@ -17,7 +17,7 @@ MLINKS+= kiconv.3 kiconv_add_xlat16_cspa
kiconv.3 kiconv_add_xlat16_cspairs.3 \
kiconv.3 kiconv_add_xlat16_table.3
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
WARNS?=1
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312499 - head/lib/libldns
Author: ngie
Date: Fri Jan 20 04:50:19 2017
New Revision: 312499
URL: https://svnweb.freebsd.org/changeset/base/312499
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libldns/Makefile
Modified: head/lib/libldns/Makefile
==
--- head/lib/libldns/Makefile Fri Jan 20 04:46:20 2017(r312498)
+++ head/lib/libldns/Makefile Fri Jan 20 04:50:19 2017(r312499)
@@ -1,7 +1,7 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR = ${.CURDIR}/../../contrib/ldns
+LDNSDIR = ${SRCTOP}/contrib/ldns
PACKAGE=lib${LIB}
.PATH: ${LDNSDIR} ${LDNSDIR}/compat
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312501 - head/lib/libcom_err
Author: ngie
Date: Fri Jan 20 04:51:36 2017
New Revision: 312501
URL: https://svnweb.freebsd.org/changeset/base/312501
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libcom_err/Makefile
Modified: head/lib/libcom_err/Makefile
==
--- head/lib/libcom_err/MakefileFri Jan 20 04:50:46 2017
(r312500)
+++ head/lib/libcom_err/MakefileFri Jan 20 04:51:36 2017
(r312501)
@@ -5,7 +5,7 @@ LIB=com_err
SRCS= com_err.c error.c
INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
MAN= com_err.3
-COM_ERRDIR=${.CURDIR}/../../contrib/com_err
+COM_ERRDIR=${SRCTOP}/contrib/com_err
CFLAGS+= -I${COM_ERRDIR}
LDFLAGS= -Wl,--no-undefined
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312502 - head/lib/libcompat
Author: ngie
Date: Fri Jan 20 04:52:00 2017
New Revision: 312502
URL: https://svnweb.freebsd.org/changeset/base/312502
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libcompat/Makefile
Modified: head/lib/libcompat/Makefile
==
--- head/lib/libcompat/Makefile Fri Jan 20 04:51:36 2017(r312501)
+++ head/lib/libcompat/Makefile Fri Jan 20 04:52:00 2017(r312502)
@@ -3,7 +3,7 @@
PACKAGE=lib${LIB}
LIB= compat
-CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale
NO_PIC=
WARNS?=0
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312503 - head/lib/libcrypt
Author: ngie
Date: Fri Jan 20 04:52:29 2017
New Revision: 312503
URL: https://svnweb.freebsd.org/changeset/base/312503
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libcrypt/Makefile
Modified: head/lib/libcrypt/Makefile
==
--- head/lib/libcrypt/Makefile Fri Jan 20 04:52:00 2017(r312502)
+++ head/lib/libcrypt/Makefile Fri Jan 20 04:52:29 2017(r312503)
@@ -10,7 +10,7 @@ SHLIBDIR?=/lib
SHLIB_MAJOR= 5
LIB= crypt
-.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2
+.PATH: ${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2
SRCS= crypt.c misc.c \
crypt-md5.c md5c.c \
crypt-nthash.c md4c.c \
@@ -19,12 +19,12 @@ SRCS= crypt.c misc.c \
MAN= crypt.3
MLINKS=crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \
crypt.3 crypt_set_format.3
-CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
- -I${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \
+ -I${SRCTOP}/sys/crypto/sha2
# Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
-.PATH: ${.CURDIR}/../../secure/lib/libcrypt
+.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"
+.PATH: ${SRCTOP}/secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312504 - head/lib/libcxxrt
Author: ngie
Date: Fri Jan 20 04:53:00 2017
New Revision: 312504
URL: https://svnweb.freebsd.org/changeset/base/312504
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libcxxrt/Makefile
Modified: head/lib/libcxxrt/Makefile
==
--- head/lib/libcxxrt/Makefile Fri Jan 20 04:52:29 2017(r312503)
+++ head/lib/libcxxrt/Makefile Fri Jan 20 04:53:00 2017(r312504)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE= clibs
-SRCDIR=${.CURDIR}/../../contrib/libcxxrt
+SRCDIR=${SRCTOP}/contrib/libcxxrt
SHLIB_MAJOR= 1
SHLIBDIR?= /lib
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312506 - in head/lib/libiconv_modules: . mapper_parallel
Author: ngie
Date: Fri Jan 20 04:53:26 2017
New Revision: 312506
URL: https://svnweb.freebsd.org/changeset/base/312506
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libiconv_modules/Makefile.inc
head/lib/libiconv_modules/mapper_parallel/Makefile
Modified: head/lib/libiconv_modules/Makefile.inc
==
--- head/lib/libiconv_modules/Makefile.inc Fri Jan 20 04:53:20 2017
(r312505)
+++ head/lib/libiconv_modules/Makefile.inc Fri Jan 20 04:53:26 2017
(r312506)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
SHLIB_MAJOR= 4
WARNS?=6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
CFLAGS+= -Dbool=_Bool
Modified: head/lib/libiconv_modules/mapper_parallel/Makefile
==
--- head/lib/libiconv_modules/mapper_parallel/Makefile Fri Jan 20 04:53:20
2017(r312505)
+++ head/lib/libiconv_modules/mapper_parallel/Makefile Fri Jan 20 04:53:26
2017(r312506)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
SHLIB= mapper_parallel
SRCS+= citrus_mapper_serial.c
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312505 - head/lib/libgssapi
Author: ngie
Date: Fri Jan 20 04:53:20 2017
New Revision: 312505
URL: https://svnweb.freebsd.org/changeset/base/312505
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libgssapi/Makefile
Modified: head/lib/libgssapi/Makefile
==
--- head/lib/libgssapi/Makefile Fri Jan 20 04:53:00 2017(r312504)
+++ head/lib/libgssapi/Makefile Fri Jan 20 04:53:20 2017(r312505)
@@ -3,7 +3,7 @@
PACKAGE=lib${LIB}
LIB= gssapi
SHLIB_MAJOR= 10
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
SRCS=
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312507 - head/lib/libexecinfo
Author: ngie
Date: Fri Jan 20 04:53:40 2017
New Revision: 312507
URL: https://svnweb.freebsd.org/changeset/base/312507
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libexecinfo/Makefile
Modified: head/lib/libexecinfo/Makefile
==
--- head/lib/libexecinfo/Makefile Fri Jan 20 04:53:26 2017
(r312506)
+++ head/lib/libexecinfo/Makefile Fri Jan 20 04:53:40 2017
(r312507)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-LIBEXECINFO= ${.CURDIR}/../../contrib/libexecinfo
+LIBEXECINFO= ${SRCTOP}/contrib/libexecinfo
LIB= execinfo
SHLIB_MAJOR= 1
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312508 - head/lib/libexpat
Author: ngie
Date: Fri Jan 20 04:53:45 2017
New Revision: 312508
URL: https://svnweb.freebsd.org/changeset/base/312508
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libexpat/Makefile
Modified: head/lib/libexpat/Makefile
==
--- head/lib/libexpat/Makefile Fri Jan 20 04:53:40 2017(r312507)
+++ head/lib/libexpat/Makefile Fri Jan 20 04:53:45 2017(r312508)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-EXPAT= ${.CURDIR}/../../contrib/expat
+EXPAT= ${SRCTOP}/contrib/expat
LIB= bsdxml
SHLIBDIR?= /lib
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312509 - head/lib/libevent
Author: ngie
Date: Fri Jan 20 04:53:50 2017
New Revision: 312509
URL: https://svnweb.freebsd.org/changeset/base/312509
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libevent/Makefile
Modified: head/lib/libevent/Makefile
==
--- head/lib/libevent/Makefile Fri Jan 20 04:53:45 2017(r312508)
+++ head/lib/libevent/Makefile Fri Jan 20 04:53:50 2017(r312509)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-.PATH: ${.CURDIR}/../../contrib/pf/libevent
+.PATH: ${SRCTOP}/contrib/pf/libevent
.include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312511 - head/lib/libdwarf
Author: ngie
Date: Fri Jan 20 04:54:21 2017
New Revision: 312511
URL: https://svnweb.freebsd.org/changeset/base/312511
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libdwarf/Makefile
Modified: head/lib/libdwarf/Makefile
==
--- head/lib/libdwarf/Makefile Fri Jan 20 04:54:09 2017(r312510)
+++ head/lib/libdwarf/Makefile Fri Jan 20 04:54:21 2017(r312511)
@@ -94,7 +94,7 @@ CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.TARGET}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312510 - head/lib/libelf
Author: ngie
Date: Fri Jan 20 04:54:09 2017
New Revision: 312510
URL: https://svnweb.freebsd.org/changeset/base/312510
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libelf/Makefile
Modified: head/lib/libelf/Makefile
==
--- head/lib/libelf/MakefileFri Jan 20 04:53:50 2017(r312509)
+++ head/lib/libelf/MakefileFri Jan 20 04:54:09 2017(r312510)
@@ -82,7 +82,7 @@ CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.TARGET}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312512 - head/lib/libdevdctl/tests
Author: ngie
Date: Fri Jan 20 04:55:14 2017
New Revision: 312512
URL: https://svnweb.freebsd.org/changeset/base/312512
Log:
Use .CURDIR:H instead of .CURDIR to simplify pathing in output, etc
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/libdevdctl/tests/Makefile
Modified: head/lib/libdevdctl/tests/Makefile
==
--- head/lib/libdevdctl/tests/Makefile Fri Jan 20 04:54:21 2017
(r312511)
+++ head/lib/libdevdctl/tests/Makefile Fri Jan 20 04:55:14 2017
(r312512)
@@ -2,7 +2,7 @@
TESTSDIR= ${TESTSBASE}/lib/libdevdctl
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
PLAIN_TESTS_CXX= libdevdctl_unittest
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312434 - head/sys/sys
On Thu, 19 Jan 2017, Sean Bruno wrote: Author: sbruno Date: Thu Jan 19 19:58:08 2017 New Revision: 312434 URL: https://svnweb.freebsd.org/changeset/base/312434 Log: Adjust gtaskqueue startup again so that we catch the !SMP case and users that choose not to use EARLY_AP_STARTUP. There is still an initialization issue/panic with !SMP and !EARLY_AP_STARTUP that we have yet to resolve. Submitted by: bde It is more for "legacy" (non-MSI) interrupts with most of the 8 combinations SMP, EARLY_AP_STARTUP and (ncpus > 1). Some combinations work, but not the simplest ones with ncpus == 1 since the complications for the complex cases affect the simplest cases adversely. Bruce ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r312513 - head/sys/modules/ath
Author: ngie
Date: Fri Jan 20 05:45:07 2017
New Revision: 312513
URL: https://svnweb.freebsd.org/changeset/base/312513
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/sys/modules/ath/Makefile
Modified: head/sys/modules/ath/Makefile
==
--- head/sys/modules/ath/Makefile Fri Jan 20 04:55:14 2017
(r312512)
+++ head/sys/modules/ath/Makefile Fri Jan 20 05:45:07 2017
(r312513)
@@ -31,8 +31,8 @@
ATH_RATE?= sample # tx rate control algorithm
-.PATH: ${.CURDIR}/../../dev/ath
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal
+.PATH: ${SRCTOP}/sys/dev/ath
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal
KMOD= if_ath
SRCS= if_ath.c if_ath_alq.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
@@ -46,7 +46,7 @@ SRCS+=device_if.h bus_if.h pci_if.h opt
#
# AR5210 support; these are first generation 11a-only devices.
#
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5210
SRCS+= ah_eeprom_v1.c \
ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \
ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \
@@ -56,7 +56,7 @@ SRCS+=ah_eeprom_v1.c \
# AR5211 support; these are second generation 11b/g/a devices
# (but 11g was OFDM only and is not supported).
#
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5211
SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \
ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \
ar5211_recv.c ar5211_reset.c ar5211_xmit.c
@@ -64,7 +64,7 @@ SRCS+=ar5211_attach.c ar5211_beacon.c a
#
# AR5212 support; this covers all other pci/cardbus legacy parts.
#
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5212
SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \
ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \
ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \
@@ -85,7 +85,7 @@ SRCS+=ar5413.c
# NB: 9160 depends on 5416 but 5416 does not require 9160
#
# + 5416 (Owl)
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar5416
SRCS+= ah_eeprom_v14.c ah_eeprom_v4k.c \
ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_btcoex.c \
ar5416_cal.c ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
@@ -97,7 +97,7 @@ SRCS+=ah_eeprom_v14.c ah_eeprom_v4k.c \
SRCS+= ar2133.c
# + AR9160 (Sowl)
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9001
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9001
SRCS+= ar9160_attach.c
# + AR9130 - (Sowl) - Embedded (AR913x SoC)
@@ -111,7 +111,7 @@ SRCS+= ar9130_attach.c ar9130_eeprom.c a
# AR9002 series chips
# + AR9220/AR9280 - Merlin
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9002
SRCS+= ar9280.c ar9280_attach.c ar9280_olc.c
# + AR9285 - Kite
@@ -119,13 +119,13 @@ SRCS+=ar9285.c ar9285_reset.c ar9285_at
SRCS+= ar9285_diversity.c ar9285_btcoex.c
# + AR9287 - Kiwi
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal
SRCS+= ah_eeprom_9287.c
-.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9002
+.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9002
SRCS+= ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c
# + AR9300 HAL
-.PATH: ${.CURDIR}/../../contrib/dev/ath/ath_hal/ar9300
+.PATH: ${SRCTOP}/sys/contrib/dev/ath/ath_hal/ar9300
SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
@@ -135,22 +135,22 @@ SRCS+= ar9300_power.c ar9300_timer.c ar9
# NB: rate control is bound to the driver by symbol names so only pick one
.if ${ATH_RATE} == "sample"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/sample
SRCS+= sample.c
.elif ${ATH_RATE} == "onoe"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/onoe
SRCS+= onoe.c
.elif ${ATH_RATE} == "amrr"
-.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr
+.PATH: ${SRCTOP}/sys/dev/ath/ath_rate/amrr
SRCS+= amrr.c
.endif
# DFS
-.PATH: ${.CURDIR}/../../dev/ath/ath_dfs/null
+.PATH: ${SRCTOP}/sys/dev/ath/ath_dfs/null
SRCS+= dfs_null.c
-CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-CFLAGS+= -I. -I${.CURDIR}/../../contrib/dev/ath/ath_hal/
+CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal
+CFLAGS+= -I. -I${SRCTOP}/sys/contrib/dev/ath/ath_hal/
.if !defined(KERNBUILDDIR)
opt_ah.h:
___
svn-src-head@fre
svn commit: r312514 - head/gnu/usr.bin/gdb/gdbserver
Author: ngie
Date: Fri Jan 20 05:51:25 2017
New Revision: 312514
URL: https://svnweb.freebsd.org/changeset/base/312514
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
MFC after:3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/gnu/usr.bin/gdb/gdbserver/Makefile
Modified: head/gnu/usr.bin/gdb/gdbserver/Makefile
==
--- head/gnu/usr.bin/gdb/gdbserver/Makefile Fri Jan 20 05:45:07 2017
(r312513)
+++ head/gnu/usr.bin/gdb/gdbserver/Makefile Fri Jan 20 05:51:25 2017
(r312514)
@@ -3,7 +3,7 @@
# Not elf specific so don't install in /usr/libexec/elf
BINDIR=/usr/bin
-GDBDIR=${.CURDIR}/../../../../contrib/gdb
+GDBDIR=${SRCTOP}/contrib/gdb
.PATH: ${GDBDIR}/gdb/signals
.PATH: ${GDBDIR}/gdb/gdbserver
.PATH: ${GDBDIR}/gdb
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r312513 - head/sys/modules/ath
> On Jan 19, 2017, at 21:45, Ngie Cooper wrote: > > Author: ngie > Date: Fri Jan 20 05:45:07 2017 > New Revision: 312513 > URL: https://svnweb.freebsd.org/changeset/base/312513 > > Log: > Use SRCTOP-relative paths to other directories instead of .CURDIR-relative > ones > > This simplifies pathing in make/displayed output > > MFC after:3 weeks > Sponsored by: Dell EMC Isilon I hope that this also gives Jenkins the hint that these warnings are not unique because the filename is now consistent between sys/conf/files and sys/modules/ath/Makefile: https://groups.google.com/forum/#!topic/jenkinsci-issues/8ewZHr_dXiU . We’ll see… -Ngie signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r312404 - head/usr.bin/sed
On Thu, Jan 19, 2017 at 9:01 AM, Xin LI wrote: > Author: delphij > Date: Thu Jan 19 08:01:35 2017 > New Revision: 312404 > URL: https://svnweb.freebsd.org/changeset/base/312404 > > Log: > Use S_ISREG instead of manual & (also it's better to compare the > result from & and the pattern instead of just assuming it's one bit > value). > > Pointed out by Tianjie Mao . > > MFC after:2 weeks > Differential Revision:https://reviews.freebsd.org/D4827 Hi, sed -i no longer works on symlinks which breaks lots of ports. Please revert and request an exp-run. Cheers, Antoine ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
