diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-25 12:25:32 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-25 12:25:32 +0000 |
| commit | a5158d656c8cf8e3be1a63c4601739b696e938a3 (patch) | |
| tree | c4a6b5ac6995a35efea28480eef007af249b558d /usr/src/uts | |
| parent | d1e72d851b679128a2371f1b0cdc40d030e4a622 (diff) | |
| parent | 633aa8079184298dfc2ae6966d0d9cc897712b57 (diff) | |
| download | illumos-joyent-a5158d656c8cf8e3be1a63c4601739b696e938a3.tar.gz | |
[illumos-gate merge]
commit 633aa8079184298dfc2ae6966d0d9cc897712b57
6575 grow_replicas_001_pos fails intermittently
commit 327848f9b50960449ae0e73e0767b617af721690
6578 cifs_attr_002_pos fails to cleanup after itself
commit 964a6bd0f9365bb057bceb3cf813be3dbb8de2bf
6577 zfs_copies_004_neg fails trying to expand wildcard characters
commit ee0ab62f26fb5723153c0c1b3cb1c5590bd7fb3c
6468 remove iscsi-related cruft from zfs-tests
commit 412db4e993a383395d7ff1add4bb97f97ca3d433
6642 testrunner output can be displayed in the wrong order
6643 zfstest should enforce the required privileges before running.
commit a6c5c5ca2069d841106ecb240d54632487830200
6663 Driver timerfd not built on SPARC
commit 4185ca1d7f22b7d0d04eac3b580dd338274cb432
6671 man(1): document MANWIDTH variable
commit 5db531e3faa94427746eae754b11770fd8416b6d
6662 uts should only build the variant requested
commit 96088c8326643135b996338d1fe5a68aac181f31
6592 AI_ADDRCONFIG fails all resolutions when only loopback is present
Conflicts:
usr/src/uts/sparc/Makefile.sparc
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/intel/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/genunix/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc | 3 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/genunix/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/uts/sun4v/genunix/Makefile | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile index 0b95ba541c..a30bb132f0 100644 --- a/usr/src/uts/intel/Makefile +++ b/usr/src/uts/intel/Makefile @@ -48,7 +48,7 @@ def.prereq := TARGET= def all := TARGET= all all.prereq := TARGET= all install := TARGET= install -install.prereq := TARGET= all +install.prereq := TARGET= install clean := TARGET= clean clobber := TARGET= clobber lint := TARGET= lint diff --git a/usr/src/uts/intel/genunix/Makefile b/usr/src/uts/intel/genunix/Makefile index d1ae9be8bf..897789505c 100644 --- a/usr/src/uts/intel/genunix/Makefile +++ b/usr/src/uts/intel/genunix/Makefile @@ -61,9 +61,9 @@ include $(UTSBASE)/intel/Makefile.intel # # Define targets # -ALL_TARGET = $(LIBGEN) +ALL_TARGET = $(LIBGEN) $(GENUNIX) LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(GENUNIX) $(ROOTMODULE) +INSTALL_TARGET = $(LIBGEN) $(GENUNIX) $(ROOTMODULE) # # Overrides diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index d335f230f0..4fd54a12ef 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -23,6 +23,7 @@ # Copyright (c) 2013 Andrew Stormont. All rights reserved. # Copyright (c) 2015, Joyent, Inc. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright 2016 Gary Mills # @@ -218,7 +219,7 @@ DRV_KMODS += log logindmux kssl mm nca physmem pm poll pool DRV_KMODS += pseudo ptc ptm pts ptsl ramdisk random rsm rts sad DRV_KMODS += simnet softmac sppp sppptun sy sysevent sysmsg DRV_KMODS += spdsock -DRV_KMODS += tcp tcp6 tl tnf ttymux udp udp6 wc winlock zcons zfd +DRV_KMODS += tcp tcp6 timerfd tl tnf ttymux udp udp6 wc winlock zcons zfd DRV_KMODS += ippctl DRV_KMODS += dld DRV_KMODS += ipd diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile index 37bf74365a..d8fc99e661 100644 --- a/usr/src/uts/sun4u/Makefile +++ b/usr/src/uts/sun4u/Makefile @@ -55,7 +55,7 @@ def.prereq := TARGET= def all := TARGET= all all.prereq := TARGET= all install := TARGET= install -install.prereq := TARGET= all +install.prereq := TARGET= install install_h := TARGET= install_h install_h.prere := TARGET= install_h clean := TARGET= clean diff --git a/usr/src/uts/sun4u/genunix/Makefile b/usr/src/uts/sun4u/genunix/Makefile index 0f6a33b52d..dd72737d12 100644 --- a/usr/src/uts/sun4u/genunix/Makefile +++ b/usr/src/uts/sun4u/genunix/Makefile @@ -62,9 +62,9 @@ include $(UTSBASE)/sparc/Makefile.sparc # # Define targets # -ALL_TARGET = $(LIBGEN) +ALL_TARGET = $(LIBGEN) $(GENUNIX) LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(GENUNIX) $(ROOTMODULE) +INSTALL_TARGET = $(LIBGEN) $(GENUNIX) $(ROOTMODULE) # # Override defaults diff --git a/usr/src/uts/sun4v/genunix/Makefile b/usr/src/uts/sun4v/genunix/Makefile index e0c060c402..905d426dcc 100644 --- a/usr/src/uts/sun4v/genunix/Makefile +++ b/usr/src/uts/sun4v/genunix/Makefile @@ -70,9 +70,9 @@ include $(UTSBASE)/sparc/Makefile.sparc # # Define targets # -ALL_TARGET = $(LIBGEN) +ALL_TARGET = $(LIBGEN) $(GENUNIX) LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(GENUNIX) $(ROOTMODULE) +INSTALL_TARGET = $(LIBGEN) $(GENUNIX) $(ROOTMODULE) # # Override defaults |