Print this page
NEX-16336 provide system/tunables package
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Alex Deiter <alex.deiter@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Fix up some merges where we wanted the upstream version.
re #13842 make clobber leaves trash (review tweaks)
re #13842 make clobber leaves trash
re #11781 rb3701 Update man related tools (add missed files)
re #11781 rb3701 Update man related tools
--HG--
rename : usr/src/cmd/man/src/THIRDPARTYLICENSE => usr/src/cmd/man/THIRDPARTYLICENSE
rename : usr/src/cmd/man/src/THIRDPARTYLICENSE.descrip => usr/src/cmd/man/THIRDPARTYLICENSE.descrip
rename : usr/src/cmd/man/src/man.c => usr/src/cmd/man/man.c
re #8813 rb3805 Failed to set DHCP on bnx0 network interface

@@ -24,10 +24,11 @@
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2017 Joyent, Inc.
+# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
 #
 
 #
 # Makefile for system source
 #

@@ -38,11 +39,11 @@
 # it defines TARGETDIRS and ROOTDIRS.
 include Targetdirs
 
 COMMON_SUBDIRS= data uts lib cmd ucblib ucbcmd psm man test
 sparc_SUBDIRS= stand
-i386_SUBDIRS= grub boot
+i386_SUBDIRS= grub boot etc
 
 #
 # sparc needs to build stand before psm
 #
 $(SPARC_BLD)psm: stand

@@ -162,11 +163,12 @@
         (cd $$CLOSED_ROOT; \
             $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
             (cd $(ROOT); $(TAR) xBpf -); \
         ( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
             ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
-            $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) )
+            $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) ); \
+        ( cd $(ROOT); $(SED) -i -e "/^#mtu=/s/^#//" ./kernel/drv/bnx.conf )
 
 #
 # Declare what parts can be built in parallel
 # DUMMY at the end is used in case macro expansion produces an empty string to
 # prevent everything going in parallel