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