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
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/Makefile
+++ new/usr/src/Makefile
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
24 24 # Copyright (c) 2012 by Delphix. All rights reserved.
25 25 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
26 26 # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
27 27 # Copyright 2016 Toomas Soome <tsoome@me.com>
28 28 # Copyright 2017 Joyent, Inc.
29 +# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
29 30 #
30 31
31 32 #
32 33 # Makefile for system source
33 34 #
34 35 # include global definitions
35 36 include Makefile.master
36 37 #
37 38 # the Targetdirs file is the AT&T target.dirs file in a makefile format.
38 39 # it defines TARGETDIRS and ROOTDIRS.
39 40 include Targetdirs
40 41
41 42 COMMON_SUBDIRS= data uts lib cmd ucblib ucbcmd psm man test
42 43 sparc_SUBDIRS= stand
43 -i386_SUBDIRS= grub boot
44 +i386_SUBDIRS= grub boot etc
44 45
45 46 #
46 47 # sparc needs to build stand before psm
47 48 #
48 49 $(SPARC_BLD)psm: stand
49 50
50 51 SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS)
51 52
52 53 HDRSUBDIRS= uts head lib cmd
53 54
54 55 # UCB headers are bug-for-bug compatible and not checkable against the header
55 56 # standards.
56 57 #
57 58 CHKHDRSUBDIRS= head uts lib
58 59
59 60 #
60 61 # Headers that can be built in parallel
61 62 #
62 63 PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders
63 64
64 65 #
65 66 # Directories that can be built in parallel
66 67 #
67 68 PARALLEL_DIRS = data uts lib man
68 69
69 70 # The check target also causes smf(5) service manifests to be validated.
70 71 CHKMFSTSUBDIRS= cmd
71 72
72 73 # And man page formats
73 74 CHKMANSUBDIRS = man
74 75
75 76 MSGSUBDIRS= cmd ucbcmd lib data
76 77 DOMAINS= \
77 78 SUNW_OST_ADMIN \
78 79 SUNW_OST_NETRPC \
79 80 SUNW_OST_OSCMD \
80 81 SUNW_OST_OSLIB \
81 82 SUNW_OST_UCBCMD \
82 83 SUNW_OST_ZONEINFO
83 84
84 85 MSGDDIRS= $(DOMAINS:%=$(MSGROOT)/%)
85 86 MSGDIRS= $(MSGROOT) $(MSGDDIRS) $(MSGROOT)/LC_TIME
86 87
87 88 all := TARGET= all
88 89 install := TARGET= install
89 90 install1 := TARGET= install
90 91 install2 := TARGET= install
91 92 install_h := TARGET= install_h
92 93 clean := TARGET= clean
93 94 clobber := TARGET= clobber
94 95 check := TARGET= check
95 96
96 97 .KEEP_STATE:
97 98
98 99 #
99 100 # Note: install does not cause a build in pkg. To build packages,
100 101 # cd pkg and do a 'make install'
101 102 #
102 103
103 104 all: mapfiles closedbins sgs .WAIT $(SUBDIRS) pkg
104 105
105 106 #
106 107 # The _msg build is a two-step process. First, the _msg dependency
107 108 # causes recursive makes in $(MSGSUBDIRS), which stages raw message
108 109 # files in $(ROOT)/catalog. Second, the action from the install
109 110 # target rule causes those messages to be post-processed from where
110 111 # they were staged in $(ROOT)/catalog, and the results placed into the
111 112 # proto area.
112 113 #
113 114 # The stage-licenses target causes the license files needed for
114 115 # packaging to be pulled from $(SRC) and $(CLOSED) and staged in
115 116 # $(ROOT)/licenses.
116 117 #
117 118 install: install1 install2 _msg stage-licenses
118 119 @cd msg; pwd; $(MAKE) _msg
119 120 @rm -rf "$(ROOT)/catalog"
120 121
121 122 stage-licenses: install2
122 123 @cd pkg; pwd; $(MAKE) stage-licenses
123 124
124 125 install1: mapfiles closedbins sgs
125 126
126 127 install2: install1 .WAIT $(SUBDIRS)
127 128
128 129 _msg: _msgdirs rootdirs FRC
129 130 @for m in $(MSGSUBDIRS); do \
130 131 cd $$m; pwd; $(MAKE) _msg; cd ..; \
131 132 done
132 133
133 134 mapfiles: bldtools
134 135 @cd common/mapfiles; pwd; $(MAKE) install
135 136
136 137 clean: $(SUBDIRS) head pkg
137 138 clobber: $(SUBDIRS) head pkg clobber_local
138 139 clobber_local:
139 140 @cd tools; pwd; $(MAKE) clobber
140 141 @cd common/mapfiles; pwd; $(MAKE) clobber
141 142 @cd msg; pwd; $(MAKE) clobber
142 143
143 144 # If the tarballs are included inside ON_CLOSED_BINS, use those to extract and
144 145 # preserve the permissions (in case a distro ships them).
145 146
146 147 closedbins: bldtools $(ROOTDIRS) FRC
147 148 @CLOSED_ROOT="$$ON_CLOSED_BINS/root_$(MACH)$${RELEASE_BUILD+-nd}"; \
148 149 if [ -f "$$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2" ]; then \
149 150 $(ECHO) "Extracting tarball $$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2"; \
150 151 (cd $(CODEMGR_WS); \
151 152 $(TAR) xjpf $$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2); \
152 153 CLOSED_ROOT="$(CODEMGR_WS)/closed/root_$(MACH)$${RELEASE_BUILD+-nd}"; \
153 154 fi; \
154 155 if [ ! -d "$$CLOSED_ROOT" ]; then \
155 156 $(ECHO) "Error: ON_CLOSED_BINS must point to closed" \
156 157 "binaries."; \
|
↓ open down ↓ |
103 lines elided |
↑ open up ↑ |
157 158 $(ECHO) "root_$(MACH)$${RELEASE_BUILD+-nd} is not" \
158 159 "present in $$ON_CLOSED_BINS."; \
159 160 exit 1; \
160 161 fi; \
161 162 $(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \
162 163 (cd $$CLOSED_ROOT; \
163 164 $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \
164 165 (cd $(ROOT); $(TAR) xBpf -); \
165 166 ( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \
166 167 ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \
167 - $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) )
168 + $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) ); \
169 + ( cd $(ROOT); $(SED) -i -e "/^#mtu=/s/^#//" ./kernel/drv/bnx.conf )
168 170
169 171 #
170 172 # Declare what parts can be built in parallel
171 173 # DUMMY at the end is used in case macro expansion produces an empty string to
172 174 # prevent everything going in parallel
173 175 #
174 176 .PARALLEL: $(PARALLEL_HEADERS) DUMMY
175 177 .PARALLEL: $(PARALLEL_DIRS) DUMMY
176 178
177 179 $(SUBDIRS) head pkg: FRC
178 180 @cd $@; pwd; $(MAKE) $(TARGET)
179 181
180 182 # librpcsvc has a dependency on headers installed by
181 183 # userheaders, hence the .WAIT before libheaders.
182 184 sgs: rootdirs .WAIT sysheaders userheaders .WAIT \
183 185 libheaders cmdheaders
184 186
185 187 #
186 188 # Top-level setup target to setup the development environment that includes
187 189 # headers, tools and generated mapfiles. For open-only builds (i.e.: source
188 190 # trees w/o usr/closed), this also depends on the closedbins target (above)
189 191 # in order to properly seed the proto area. Note, although the tools are
190 192 # dependent on a number of constant mapfiles, the tools themselves are
191 193 # required to build the generated mapfiles.
192 194 #
193 195 setup: closedbins bldtools sgs mapfiles
194 196
195 197 bldtools:
196 198 @cd tools; pwd; $(MAKE) install
197 199
198 200 # /var/mail/:saved is a special case because of the colon in the name.
199 201 #
200 202 rootdirs: $(ROOTDIRS)
201 203 $(INS) -d -m 775 $(ROOT)/var/mail/:saved
202 204
203 205 lint: FRC
204 206 $(MAKE) -f Makefile.lint
205 207
206 208 _msgdirs: $(MSGDIRS)
207 209
208 210 $(ROOTDIRS) $(MSGDIRS):
209 211 $(INS.dir)
210 212
211 213 userheaders: FRC
212 214 @cd head; pwd; $(MAKE) install_h
213 215
214 216 libheaders: bldtools
215 217 @cd lib; pwd; $(MAKE) install_h
216 218
217 219 sysheaders: FRC
218 220 @cd uts; pwd; $(MAKE) install_h
219 221
220 222 cmdheaders: FRC
221 223 @cd cmd/devfsadm; pwd; $(MAKE) install_h
222 224 @cd cmd/fm; pwd; $(MAKE) install_h
223 225 @cd cmd/mdb; pwd; $(MAKE) install_h
224 226
225 227 check: $(CHKHDRSUBDIRS) $(CHKMFSTSUBDIRS) $(CHKMANSUBDIRS)
226 228
227 229 #
228 230 # Cross-reference customization: skip all of the subdirectories that
229 231 # don't contain actual source code.
230 232 #
231 233 XRPRUNE = pkg prototypes
232 234 XRINCDIRS = uts/common head ucbhead
233 235
234 236 cscope.out tags: FRC
235 237 $(XREF) -f -x $@
236 238
237 239 FRC:
238 240
239 241 #
240 242 # Targets for reporting compiler versions; nightly uses these.
241 243 #
242 244
243 245 cc-version:
244 246 @if $($(MACH)_CC) -_versions >/dev/null 2>/dev/null; then \
245 247 $(ECHO) 32-bit compiler; \
246 248 $(ECHO) $($(MACH)_CC); \
247 249 $($(MACH)_CC) -_versions 2>&1 | \
248 250 $(EGREP) '^(cw|cc|gcc|primary|shadow)'; \
249 251 else \
250 252 __COMPILER=`$($(MACH)_CC) -_compiler 2>/dev/null || $(TRUE)`;\
251 253 if [ -z "$$__COMPILER" ]; then \
252 254 $(ECHO) No 32-bit compiler found; \
253 255 exit 1; \
254 256 else \
255 257 $(ECHO) 32-bit compiler; \
256 258 $(ECHO) $($(MACH)_CC); \
257 259 $(ECHO) $$__COMPILER; \
258 260 $($(MACH)_CC) -V 2>&1 | head -1; \
259 261 fi; \
260 262 fi
261 263
262 264 cc64-version:
263 265 @if $($(MACH64)_CC) -_versions >/dev/null 2>/dev/null; then \
264 266 $(ECHO) 64-bit compiler; \
265 267 $(ECHO) $($(MACH64)_CC); \
266 268 $($(MACH64)_CC) -_versions 2>&1 | \
267 269 $(EGREP) '^(cw|cc|gcc|primary|shadow)'; \
268 270 else \
269 271 __COMPILER=`$($(MACH64)_CC) -_compiler 2>/dev/null || $(TRUE)`;\
270 272 if [ -z "$$__COMPILER" ]; then \
271 273 $(ECHO) No 64-bit compiler found; \
272 274 exit 1; \
273 275 else \
274 276 $(ECHO) 64-bit compiler; \
275 277 $(ECHO) $($(MACH64)_CC); \
276 278 $(ECHO) $$__COMPILER; \
277 279 $($(MACH64)_CC) -V 2>&1 | head -1; \
278 280 fi; \
279 281 fi
280 282
281 283 java-version:
282 284 @if [ -x "$(JAVAC)" ]; then \
283 285 $(ECHO) $(JAVAC); \
284 286 $(JAVA_ROOT)/bin/java -fullversion 2>&1 | head -1; \
285 287 else \
286 288 $(ECHO) No Java compiler found; \
287 289 exit 1; \
288 290 fi
|
↓ open down ↓ |
111 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX