Print this page
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/Makefile
+++ new/usr/src/cmd/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.
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
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 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 # Copyright 2010 Nexenta Systems, Inc. All rights reserved.
24 24 # Copyright 2011 Joyent, Inc. All rights reserved.
25 +# Copyright (c) 2012 by Delphix. All rights reserved.
25 26
26 27 include ../Makefile.master
27 28
28 29 #
29 30 # Note that the commands 'agents', 'lp', 'perl', and 'man' are first in
30 31 # the list, violating alphabetical order. This is because they are very
31 32 # long-running and should be given the most wall-clock time for a
32 33 # parallel build.
33 34 #
34 35 # Commands in the FIRST_SUBDIRS list are built before starting the build
35 36 # of other commands. Currently this includes only 'isaexec' and
36 37 # 'platexec'. This is necessary because $(ROOT)/usr/lib/isaexec or
37 38 # $(ROOT)/usr/lib/platexec must exist when some other commands are built
38 39 # because their 'make install' creates a hard link to one of them.
39 40 #
40 41 # Commands are listed one per line so that TeamWare can auto-merge most
41 42 # changes.
42 43 #
43 44
44 45 FIRST_SUBDIRS= \
45 46 isaexec \
46 47 platexec
47 48
48 49 COMMON_SUBDIRS= \
49 50 allocate \
50 51 availdevs \
51 52 lp \
52 53 perl \
53 54 man \
54 55 Adm \
55 56 abi \
56 57 adbgen \
57 58 acct \
58 59 acctadm \
59 60 arch \
60 61 asa \
61 62 ast \
62 63 audio \
63 64 auths \
64 65 autopush \
65 66 avs \
66 67 awk \
67 68 awk_xpg4 \
68 69 backup \
69 70 banner \
70 71 bart \
71 72 basename \
72 73 bc \
73 74 bdiff \
74 75 beadm \
75 76 bfs \
76 77 bnu \
77 78 boot \
78 79 busstat \
79 80 cal \
80 81 calendar \
81 82 captoinfo \
82 83 cat \
83 84 cdrw \
84 85 cfgadm \
85 86 checkeq \
86 87 checknr \
87 88 chgrp \
88 89 chmod \
89 90 chown \
90 91 chroot \
91 92 clear \
92 93 clinfo \
93 94 cmd-crypto \
94 95 cmd-inet \
95 96 col \
96 97 compress \
97 98 consadm \
98 99 coreadm \
99 100 cpio \
100 101 cpc \
101 102 cron \
102 103 crypt \
103 104 csh \
104 105 csplit \
105 106 ctrun \
106 107 ctstat \
107 108 ctwatch \
108 109 datadm \
109 110 date \
110 111 dc \
111 112 dd \
112 113 deroff \
113 114 devfsadm \
114 115 syseventd \
115 116 devctl \
116 117 devinfo \
117 118 devmgmt \
118 119 devprop \
119 120 dfs.cmds \
120 121 diff \
121 122 diff3 \
122 123 diffmk \
123 124 dircmp \
124 125 dirname \
125 126 dis \
126 127 diskmgtd \
127 128 dispadmin \
128 129 dladm \
129 130 dlstat \
130 131 dmesg \
131 132 dodatadm \
132 133 dtrace \
133 134 du \
134 135 dumpadm \
135 136 dumpcs \
136 137 echo \
137 138 ed \
138 139 eeprom \
139 140 egrep \
140 141 eject \
141 142 emul64ioctl \
142 143 enhance \
143 144 env \
144 145 eqn \
145 146 expand \
146 147 expr \
147 148 exstr \
148 149 factor \
149 150 false \
150 151 fcinfo \
151 152 fcoesvc \
152 153 fdetach \
153 154 fdformat \
154 155 fdisk \
155 156 filesync \
156 157 fgrep \
157 158 file \
158 159 filebench \
159 160 find \
160 161 flowadm \
161 162 flowstat \
162 163 fm \
163 164 fmt \
164 165 fmthard \
165 166 fmtmsg \
166 167 fold \
167 168 format \
168 169 fs.d \
169 170 fstyp \
170 171 fuser \
171 172 fwflash \
172 173 gcore \
173 174 gencat \
174 175 geniconvtbl \
175 176 genmsg \
176 177 getconf \
177 178 getdevpolicy \
178 179 getent \
179 180 getfacl \
180 181 getmajor \
181 182 getopt \
182 183 gettext \
183 184 gettxt \
184 185 grep \
185 186 grep_xpg4 \
186 187 groups \
187 188 grpck \
188 189 gss \
189 190 hal \
190 191 halt \
191 192 head \
192 193 hostid \
193 194 hostname \
194 195 hotplug \
195 196 hotplugd \
196 197 hwdata \
197 198 ibd_upgrade \
198 199 id \
199 200 idmap \
200 201 infocmp \
201 202 init \
202 203 initpkg \
203 204 install.d \
204 205 intrd \
205 206 intrstat \
206 207 ipcrm \
207 208 ipcs \
208 209 ipf \
209 210 isainfo \
210 211 isalist \
211 212 itutools \
212 213 iscsiadm \
213 214 iscsid \
214 215 iscsitsvc \
215 216 isns \
216 217 itadm \
217 218 java \
218 219 kbd \
219 220 keyserv \
220 221 killall \
221 222 krb5 \
222 223 ksh \
223 224 kstat \
224 225 kvmstat \
225 226 last \
226 227 lastcomm \
227 228 latencytop \
228 229 ldap \
229 230 ldapcachemgr \
230 231 lgrpinfo \
231 232 line \
232 233 link \
233 234 dlmgmtd \
234 235 listen \
235 236 loadkeys \
236 237 locale \
237 238 localedef \
238 239 lockstat \
239 240 locator \
240 241 lofiadm \
241 242 logadm \
242 243 logger \
243 244 login \
244 245 logins \
245 246 look \
246 247 ls \
247 248 luxadm \
248 249 lvm \
249 250 mach \
250 251 machid \
251 252 mail \
252 253 mailx \
253 254 makekey \
254 255 mdb \
255 256 mesg \
256 257 mkdir \
257 258 mkfifo \
258 259 mkfile \
259 260 mkmsgs \
260 261 mknod \
261 262 mkpwdict \
262 263 mktemp \
263 264 modload \
264 265 more \
265 266 mpathadm \
266 267 msgfmt \
267 268 msgid \
268 269 mt \
269 270 mv \
270 271 mvdir \
271 272 ndmpadm \
272 273 ndmpd \
273 274 ndmpstat \
274 275 netadm \
275 276 netfiles \
276 277 newform \
277 278 newgrp \
278 279 news \
279 280 newtask \
280 281 nice \
281 282 nl \
282 283 nlsadmin \
283 284 nohup \
284 285 nsadmin \
285 286 nscd \
286 287 oamuser \
287 288 oawk \
288 289 od \
289 290 pack \
290 291 pagesize \
291 292 passmgmt \
292 293 passwd \
293 294 pathchk \
294 295 pbind \
295 296 pcidr \
296 297 pcitool \
297 298 pfexec \
298 299 pfexecd \
299 300 pginfo \
300 301 pgstat \
301 302 pgrep \
302 303 picl \
303 304 plimit \
304 305 policykit \
305 306 pools \
306 307 power \
307 308 powertop \
308 309 ppgsz \
309 310 pg \
310 311 plockstat \
311 312 pr \
312 313 prctl \
313 314 print \
314 315 printf \
315 316 priocntl \
316 317 profiles \
317 318 projadd \
318 319 projects \
319 320 prstat \
320 321 prtconf \
321 322 prtdiag \
322 323 prtvtoc \
323 324 ps \
324 325 psradm \
325 326 psrinfo \
326 327 psrset \
327 328 ptools \
328 329 pwck \
329 330 pwconv \
330 331 pwd \
331 332 pyzfs \
332 333 raidctl \
333 334 ramdiskadm \
334 335 rcap \
335 336 rcm_daemon \
336 337 rctladm \
337 338 refer \
338 339 regcmp \
339 340 renice \
340 341 rexd \
341 342 rm \
342 343 rmdir \
343 344 rmformat \
344 345 rmmount \
345 346 rmt \
346 347 rmvolmgr \
347 348 roles \
348 349 rpcbind \
349 350 rpcgen \
350 351 rpcinfo \
351 352 rpcsvc \
352 353 runat \
353 354 sa \
354 355 saf \
355 356 sasinfo \
356 357 savecore \
357 358 sbdadm \
358 359 script \
359 360 scsi \
360 361 sdiff \
361 362 sdpadm \
362 363 sed \
363 364 sendmail \
364 365 setfacl \
365 366 setmnt \
366 367 setpgrp \
367 368 setuname \
368 369 sgs \
369 370 sh \
370 371 shcomp \
371 372 smbios \
372 373 smbsrv \
373 374 smserverd \
374 375 soelim \
375 376 sort \
376 377 spell \
377 378 split \
378 379 sqlite \
379 380 srchtxt \
380 381 srptadm \
381 382 srptsvc \
382 383 ssh \
383 384 stat \
384 385 stmfadm \
385 386 stmfproxy \
386 387 stmfsvc \
387 388 stmsboot \
388 389 streams \
389 390 strings \
390 391 su \
391 392 sulogin \
392 393 sunpc \
393 394 svc \
394 395 svr4pkg \
395 396 swap \
396 397 sync \
397 398 sysdef \
398 399 syseventadm \
399 400 syslogd \
400 401 tabs \
401 402 tail \
402 403 tar \
403 404 tbl \
404 405 tcopy \
405 406 tcpd \
406 407 terminfo \
407 408 th_tools \
408 409 tic \
409 410 time \
410 411 tip \
411 412 tnf \
412 413 touch \
413 414 tput \
414 415 tr \
415 416 trapstat \
416 417 troff \
417 418 true \
418 419 truss \
419 420 tsol \
420 421 tty \
421 422 ttymon \
422 423 tzreload \
423 424 uadmin \
424 425 ul \
425 426 uname \
426 427 units \
427 428 unlink \
428 429 unpack \
429 430 userattr \
430 431 users \
431 432 utmp_update \
432 433 utmpd \
433 434 valtools \
434 435 vgrind \
435 436 vi \
436 437 volcheck \
437 438 volrmmount \
438 439 vrrpadm \
439 440 vscan \
440 441 vt \
441 442 w \
442 443 wall \
443 444 which \
444 445 who \
445 446 whodo \
446 447 wracct \
|
↓ open down ↓ |
412 lines elided |
↑ open up ↑ |
447 448 write \
448 449 wusbadm \
449 450 xargs \
450 451 xstr \
451 452 yes \
452 453 ypcmd \
453 454 yppasswd \
454 455 zdb \
455 456 zdump \
456 457 zfs \
458 + zhack \
457 459 zic \
458 460 zinject \
459 461 zlogin \
460 462 zoneadm \
461 463 zoneadmd \
462 464 zonecfg \
463 465 zonename \
464 466 zpool \
465 467 zlook \
466 468 zonestat \
467 469 zstreamdump \
468 470 ztest
469 471
470 472 $(CLOSED_BUILD)COMMON_SUBDIRS += \
471 473 $(CLOSED)/cmd/iconv \
472 474 $(CLOSED)/cmd/ksh \
473 475 $(CLOSED)/cmd/localedef \
474 476 $(CLOSED)/cmd/more_xpg4 \
475 477 $(CLOSED)/cmd/mtst \
476 478 $(CLOSED)/cmd/od \
477 479 $(CLOSED)/cmd/patch \
478 480 $(CLOSED)/cmd/pax \
479 481 $(CLOSED)/cmd/printf \
480 482 $(CLOSED)/cmd/sed \
481 483 $(CLOSED)/cmd/sed_xpg4
482 484
483 485 i386_SUBDIRS= \
484 486 acpihpd \
485 487 addbadsec \
486 488 biosdev \
487 489 diskscan \
488 490 lms \
489 491 ntfsprogs \
490 492 parted \
491 493 rtc \
492 494 ucodeadm \
493 495 xvm
494 496
495 497 sparc_SUBDIRS= \
496 498 cvcd \
497 499 dcs \
498 500 device_remap \
499 501 drd \
500 502 fruadm \
501 503 ldmad \
502 504 oplhpd \
503 505 prtdscp \
504 506 prtfru \
505 507 scadm \
506 508 sckmd \
507 509 sf880drd \
508 510 virtinfo \
509 511 vntsd
510 512
511 513 #
512 514 # Commands that are messaged. Note that 'lp' and 'man' come first
513 515 # (see previous comment about 'lp' and 'man').
514 516 #
515 517 MSGSUBDIRS= \
516 518 lp \
517 519 man \
518 520 abi \
519 521 acctadm \
520 522 allocate \
521 523 asa \
522 524 audio \
523 525 audit \
524 526 auditconfig \
525 527 auditd \
526 528 auditrecord \
527 529 auditset \
528 530 auths \
529 531 autopush \
530 532 avs \
531 533 awk \
532 534 awk_xpg4 \
533 535 backup \
534 536 banner \
535 537 bart \
536 538 basename \
537 539 beadm \
538 540 bnu \
539 541 busstat \
540 542 cal \
541 543 cat \
542 544 cdrw \
543 545 cfgadm \
544 546 checkeq \
545 547 checknr \
546 548 chgrp \
547 549 chmod \
548 550 chown \
549 551 cmd-crypto \
550 552 cmd-inet \
551 553 col \
552 554 compress \
553 555 consadm \
554 556 coreadm \
555 557 cpio \
556 558 cpc \
557 559 cron \
558 560 csh \
559 561 csplit \
560 562 ctrun \
561 563 ctstat \
562 564 ctwatch \
563 565 datadm \
564 566 date \
565 567 dc \
566 568 dcs \
567 569 dd \
568 570 deroff \
569 571 devfsadm \
570 572 dfs.cmds \
571 573 diff \
572 574 diffmk \
573 575 dladm \
574 576 dlstat \
575 577 du \
576 578 dumpcs \
577 579 ed \
578 580 eject \
579 581 env \
580 582 eqn \
581 583 expand \
582 584 expr \
583 585 fcinfo \
584 586 fgrep \
585 587 file \
586 588 filesync \
587 589 find \
588 590 flowadm \
589 591 flowstat \
590 592 fm \
591 593 fold \
592 594 fs.d \
593 595 fwflash \
594 596 geniconvtbl \
595 597 genmsg \
596 598 getconf \
597 599 getent \
598 600 gettext \
599 601 gettxt \
600 602 grep \
601 603 grep_xpg4 \
602 604 grpck \
603 605 gss \
604 606 halt \
605 607 head \
606 608 hostname \
607 609 hotplug \
608 610 id \
609 611 idmap \
610 612 isaexec \
611 613 iscsiadm \
612 614 iscsid \
613 615 isns \
614 616 itadm \
615 617 kbd \
616 618 krb5 \
617 619 ksh \
618 620 kstat \
619 621 last \
620 622 ldap \
621 623 ldapcachemgr \
622 624 lgrpinfo \
623 625 locale \
624 626 lofiadm \
625 627 logadm \
626 628 logger \
627 629 logins \
628 630 ls \
629 631 luxadm \
630 632 lvm \
631 633 mailx \
632 634 mesg \
633 635 mkdir \
634 636 mkpwdict \
635 637 mktemp \
636 638 more \
637 639 mpathadm \
638 640 msgfmt \
639 641 mv \
640 642 ndmpadm \
641 643 ndmpstat \
642 644 newgrp \
643 645 newtask \
644 646 nice \
645 647 nohup \
646 648 oawk \
647 649 pack \
648 650 passwd \
649 651 passmgmt \
650 652 pathchk \
651 653 pfexec \
652 654 pg \
653 655 pgrep \
654 656 picl \
655 657 pools \
656 658 power \
657 659 pr \
658 660 praudit \
659 661 print \
660 662 profiles \
661 663 projadd \
662 664 projects \
663 665 prstat \
664 666 prtdiag \
665 667 ps \
666 668 psrinfo \
667 669 ptools \
668 670 pwconv \
669 671 pwd \
670 672 pyzfs \
671 673 raidctl \
672 674 ramdiskadm \
673 675 rcap \
674 676 rcm_daemon \
675 677 refer \
676 678 regcmp \
677 679 renice \
678 680 roles \
679 681 rm \
680 682 rmdir \
681 683 rmformat \
682 684 rmmount \
683 685 rmvolmgr \
684 686 sasinfo \
685 687 sbdadm \
686 688 scadm \
687 689 script \
688 690 scsi \
689 691 sdiff \
690 692 sdpadm \
691 693 sgs \
692 694 sh \
693 695 shcomp \
694 696 smbsrv \
695 697 sort \
696 698 split \
697 699 srptadm \
698 700 ssh \
699 701 stat \
700 702 stmfadm \
701 703 stmsboot \
702 704 strings \
703 705 su \
704 706 svc \
705 707 svr4pkg \
706 708 swap \
707 709 syseventadm \
708 710 syseventd \
709 711 tabs \
710 712 tar \
711 713 tbl \
712 714 time \
713 715 tnf \
714 716 touch \
715 717 tput \
716 718 troff \
717 719 tsol \
718 720 tty \
719 721 ttymon \
720 722 tzreload \
721 723 ul \
722 724 uname \
723 725 units \
724 726 unlink \
725 727 unpack \
726 728 userattr \
727 729 valtools \
728 730 vgrind \
729 731 vi \
730 732 volcheck \
731 733 volrmmount \
732 734 vrrpadm \
733 735 vscan \
734 736 w \
735 737 who \
736 738 whodo \
737 739 wracct \
738 740 write \
739 741 wusbadm \
740 742 xargs \
741 743 yppasswd \
742 744 zdump \
743 745 zfs \
744 746 zic \
745 747 zlogin \
746 748 zoneadm \
747 749 zoneadmd \
748 750 zonecfg \
749 751 zonename \
750 752 zpool \
751 753 zonestat
752 754
753 755 $(CLOSED_BUILD)MSGSUBDIRS += \
754 756 $(CLOSED)/cmd/iconv \
755 757 $(CLOSED)/cmd/ksh \
756 758 $(CLOSED)/cmd/localedef \
757 759 $(CLOSED)/cmd/more_xpg4 \
758 760 $(CLOSED)/cmd/od \
759 761 $(CLOSED)/cmd/patch \
760 762 $(CLOSED)/cmd/pax \
761 763 $(CLOSED)/cmd/printf \
762 764 $(CLOSED)/cmd/sed \
763 765 $(CLOSED)/cmd/sed_xpg4
764 766
765 767 sparc_MSGSUBDIRS= \
766 768 fruadm \
767 769 prtdscp \
768 770 prtfru \
769 771 virtinfo \
770 772 vntsd
771 773
772 774 i386_MSGSUBDIRS= \
773 775 ucodeadm
774 776
775 777 #
776 778 # commands that use dcgettext for localized time, LC_TIME
777 779 #
778 780 DCSUBDIRS= \
779 781 cal \
780 782 cfgadm \
781 783 diff \
782 784 ls \
783 785 pr \
784 786 ps \
785 787 tar \
786 788 w \
787 789 who \
788 790 whodo \
789 791 write
790 792
791 793 $(CLOSED_BUILD)DCSUBDIRS += \
792 794 $(CLOSED)/cmd/pax
793 795
794 796 #
795 797 # commands that belong only to audit.
796 798 #
797 799 AUDITSUBDIRS= \
798 800 amt \
799 801 audit \
800 802 audit_warn \
801 803 auditconfig \
802 804 auditd \
803 805 auditrecord \
804 806 auditreduce \
805 807 auditset \
806 808 auditstat \
807 809 praudit
808 810
809 811 #
810 812 # commands not owned by the systems group
811 813 #
812 814 BWOSDIRS=
813 815
814 816
815 817 all := TARGET = all
816 818 install := TARGET = install
817 819 clean := TARGET = clean
818 820 clobber := TARGET = clobber
819 821 lint := TARGET = lint
820 822 _msg := TARGET = _msg
821 823 _dc := TARGET = _dc
822 824
823 825 .KEEP_STATE:
824 826
825 827 SUBDIRS = $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS)
826 828
827 829 .PARALLEL: $(BWOSDIRS) $(SUBDIRS) $(MSGSUBDIRS) $(AUDITSUBDIRS)
828 830
829 831 all install clean clobber lint: $(FIRST_SUBDIRS) .WAIT $(SUBDIRS) \
830 832 $(AUDITSUBDIRS)
831 833
832 834 #
833 835 # Manifests cannot be checked in parallel, because we are using
834 836 # the global repository that is in $(SRC)/cmd/svc/seed/global.db.
835 837 # For this reason, to avoid .PARALLEL and .NO_PARALLEL conflicts,
836 838 # we spawn off a sub-make to perform the non-parallel 'make check'
837 839 #
838 840 check:
839 841 $(MAKE) -f Makefile.check check
840 842
841 843 #
842 844 # The .WAIT directive works around an apparent bug in parallel make.
843 845 # Evidently make was getting the target _msg vs. _dc confused under
844 846 # some level of parallelization, causing some of the _dc objects
845 847 # not to be built.
846 848 #
847 849 _msg: $(MSGSUBDIRS) $($(MACH)_MSGSUBDIRS) .WAIT _dc
848 850
849 851 _dc: $(DCSUBDIRS)
850 852
851 853 #
852 854 # Dependencies
853 855 #
854 856 fs.d: fstyp
855 857 ksh: shcomp isaexec
856 858 mdb: terminfo
857 859 print: lp
858 860
859 861 $(FIRST_SUBDIRS) $(BWOSDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC
860 862 @if [ -f $@/Makefile ]; then \
861 863 cd $@; pwd; $(MAKE) $(TARGET); \
862 864 else \
863 865 true; \
864 866 fi
865 867
866 868 FRC:
|
↓ open down ↓ |
400 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX