Permalink
Browse files

6880460 some root-build bits were missed by 6864230

6414832 SUNWonbld gk account should be removed
6536468 date in Nevada motd should be changed
6855668 webrev mangles dates in non-Romanised locales
6866716 estimation of max-jobs for /.make.machines is incorrect
6589104 make POUND_SIGN less of a drag
6750554 build rule for mcs gives shell+date a real workout
6885068 no need for raciness
Portions contributed by Rich Lowe
  • Loading branch information...
jmcp jmcp
jmcp authored and jmcp committed Oct 7, 2009
1 parent 26f848c commit 48bc00d6814e04ff3edb32cafe7d1bc580baff68
Showing with 906 additions and 1,182 deletions.
  1. +13 −8 usr/src/Makefile.master
  2. +0 −9 usr/src/Makefile.psm
  3. +19 −19 usr/src/Makefile.psm.targ
  4. +192 −286 usr/src/Targetdirs
  5. +0 −5 usr/src/cmd/cron/Makefile
  6. +0 −2 usr/src/cmd/fcoesvc/Makefile
  7. +0 −2 usr/src/cmd/mdb/Makefile.kmdb
  8. +2 −3 usr/src/cmd/mdb/intel/amd64/kmdb/Makefile
  9. +2 −3 usr/src/cmd/mdb/intel/ia32/kmdb/Makefile
  10. +3 −4 usr/src/cmd/mdb/sun4u/v9/kmdb/Makefile
  11. +3 −4 usr/src/cmd/mdb/sun4v/v9/kmdb/Makefile
  12. +4 −4 usr/src/cmd/oplhpd/Makefile
  13. +1 −1 usr/src/cmd/scadm/Makefile.com
  14. +3 −3 usr/src/cmd/sf880drd/Makefile
  15. +2 −2 usr/src/lib/cfgadm_plugins/Makefile.com
  16. +4 −7 usr/src/lib/cfgadm_plugins/ac/Makefile.com
  17. +3 −5 usr/src/lib/cfgadm_plugins/pci/Makefile.com
  18. +4 −7 usr/src/lib/cfgadm_plugins/sbd/Makefile.com
  19. +4 −7 usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
  20. +0 −1 usr/src/lib/hbaapi/Makefile.com
  21. +2 −2 usr/src/lib/libc_psr/sun4u-opl/Makefile
  22. +3 −4 usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
  23. +3 −4 usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
  24. +4 −6 usr/src/lib/libc_psr/sun4u-us3/Makefile
  25. +1 −1 usr/src/lib/libc_psr/sun4u/sparc/Makefile
  26. +1 −1 usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
  27. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile
  28. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile
  29. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile
  30. +2 −4 usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile
  31. +3 −5 usr/src/lib/libc_psr/sun4v/Makefile
  32. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
  33. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
  34. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap2/sparc/Makefile
  35. +1 −1 usr/src/lib/libc_psr/sun4v_hwcap2/sparcv9/Makefile
  36. +2 −2 usr/src/lib/libmd/Makefile.com
  37. +1 −6 usr/src/lib/libmd/sun4u/Makefile.links
  38. +2 −4 usr/src/lib/libmd/sun4v/sparc/Makefile
  39. +2 −2 usr/src/lib/libmd/sun4v/sparcv9/Makefile
  40. +3 −3 usr/src/lib/libpcp/sparc/Makefile
  41. +2 −2 usr/src/lib/libprtdiag_psr/sparc/cherrystone/Makefile
  42. +2 −2 usr/src/lib/libprtdiag_psr/sparc/daktari/Makefile
  43. +2 −2 usr/src/lib/libprtdiag_psr/sparc/desktop/picl/Makefile
  44. +2 −2 usr/src/lib/libprtdiag_psr/sparc/montecarlo/Makefile
  45. +3 −3 usr/src/lib/libprtdiag_psr/sparc/montoya/Makefile
  46. +3 −3 usr/src/lib/libprtdiag_psr/sparc/monza/Makefile
  47. +3 −3 usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile
  48. +2 −2 usr/src/lib/libprtdiag_psr/sparc/schumacher/picl/Makefile
  49. +2 −2 usr/src/lib/librsc/Makefile.com
  50. +4 −4 usr/src/lib/libtsalarm/sparc/Makefile
  51. +1 −1 usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
  52. +0 −3 usr/src/lib/smhba/Makefile.com
  53. +6 −8 usr/src/psm/stand/bootblks/ufs/Makefile
  54. +4 −0 usr/src/tools/Makefile.tools
  55. +0 −88 usr/src/tools/SUNWonbld/postinstall
  56. +0 −58 usr/src/tools/SUNWonbld/preremove
  57. +1 −2 usr/src/tools/SUNWonbld/prototype_com
  58. +10 −4 usr/src/tools/gk/Makefile
  59. +48 −0 usr/src/tools/gk/gen_make.machines.sh
  60. +12 −2 usr/src/tools/scripts/bldenv.sh
  61. +3 −1 usr/src/tools/scripts/nightly.1
  62. +10 −3 usr/src/tools/scripts/nightly.sh
  63. +2 −1 usr/src/tools/scripts/webrev.sh
  64. +5 −5 usr/src/uts/Makefile.targ
  65. +9 −10 usr/src/uts/i86pc/i86hvm/Makefile.targ
  66. +1 −1 usr/src/uts/i86pc/sys/Makefile
  67. +1 −1 usr/src/uts/i86pc/vm/Makefile
  68. +1 −1 usr/src/uts/i86xpv/sys/Makefile
  69. +1 −1 usr/src/uts/i86xpv/vm/Makefile
  70. +3 −3 usr/src/uts/sun4u/Makefile
  71. +5 −5 usr/src/uts/sun4u/aes/Makefile
  72. +13 −14 usr/src/uts/sun4u/blade/Makefile.targ.shared
  73. +12 −12 usr/src/uts/sun4u/boston/Makefile.targ
  74. +16 −17 usr/src/uts/sun4u/cherrystone/Makefile.targ
  75. +1 −1 usr/src/uts/sun4u/cherrystone/sys/Makefile
  76. +15 −16 usr/src/uts/sun4u/chicago/Makefile.targ
  77. +10 −10 usr/src/uts/sun4u/chicago/fpc/Makefile
  78. +16 −17 usr/src/uts/sun4u/daktari/Makefile.targ
  79. +1 −1 usr/src/uts/sun4u/daktari/sys/Makefile
  80. +8 −9 usr/src/uts/sun4u/darwin/Makefile.targ
  81. +10 −14 usr/src/uts/sun4u/douglas/Makefile.targ.shared
  82. +14 −18 usr/src/uts/sun4u/enchilada/Makefile.targ
  83. +14 −18 usr/src/uts/sun4u/excalibur/Makefile.targ
  84. +0 −3 usr/src/uts/sun4u/excalibur/sys/Makefile
  85. +13 −14 usr/src/uts/sun4u/fjlite/Makefile.targ
  86. +12 −17 usr/src/uts/sun4u/grover/Makefile.targ.shared
  87. +13 −14 usr/src/uts/sun4u/javelin/Makefile.targ.shared
  88. +15 −16 usr/src/uts/sun4u/littleneck/Makefile.targ
  89. +12 −14 usr/src/uts/sun4u/lw2plus/Makefile.targ
  90. +13 −13 usr/src/uts/sun4u/lw8/Makefile.targ
  91. +1 −1 usr/src/uts/sun4u/lw8/sys/Makefile
  92. +24 −24 usr/src/uts/sun4u/makaha/Makefile.targ
  93. +15 −16 usr/src/uts/sun4u/montecarlo/Makefile.targ.shared
  94. +1 −1 usr/src/uts/sun4u/montecarlo/sys/Makefile
  95. +12 −12 usr/src/uts/sun4u/mpxu/Makefile.targ.shared
  96. +1 −1 usr/src/uts/sun4u/mpxu/sys/Makefile
  97. +1 −1 usr/src/uts/sun4u/ngdr/sys/Makefile
  98. +14 −14 usr/src/uts/sun4u/opl/Makefile.targ.shared
  99. +0 −3 usr/src/uts/sun4u/opl/sys/Makefile
  100. +8 −9 usr/src/uts/sun4u/quasar/Makefile.targ
  101. +12 −15 usr/src/uts/sun4u/schumacher/Makefile.targ
  102. +12 −12 usr/src/uts/sun4u/seattle/Makefile.targ
  103. +17 −18 usr/src/uts/sun4u/serengeti/Makefile.targ.shared
  104. +1 −1 usr/src/uts/sun4u/serengeti/sys/Makefile
  105. +15 −15 usr/src/uts/sun4u/snowbird/Makefile.targ
  106. +1 −1 usr/src/uts/sun4u/snowbird/sys/Makefile
  107. +17 −19 usr/src/uts/sun4u/starcat/Makefile.targ.shared
  108. +0 −3 usr/src/uts/sun4u/starcat/sys/Makefile
  109. +16 −18 usr/src/uts/sun4u/starfire/Makefile.targ
  110. +1 −1 usr/src/uts/sun4u/starfire/sys/Makefile
  111. +11 −11 usr/src/uts/sun4u/sunfire/Makefile.targ.shared
  112. +1 −1 usr/src/uts/sun4u/sunfire/sys/Makefile
  113. +3 −3 usr/src/uts/sun4u/sys/Makefile
  114. +14 −18 usr/src/uts/sun4u/taco/Makefile.targ
  115. +12 −16 usr/src/uts/sun4u/tazmo/Makefile.targ.shared
  116. +1 −1 usr/src/uts/sun4u/vm/Makefile
  117. +19 −19 usr/src/uts/sun4v/Makefile
  118. +10 −10 usr/src/uts/sun4v/montoya/Makefile.targ
  119. +10 −13 usr/src/uts/sun4v/ontario/Makefile.targ
  120. +1 −1 usr/src/uts/sun4v/sys/Makefile
  121. +1 −1 usr/src/uts/sun4v/vm/Makefile
View
@@ -54,12 +54,18 @@ ROOT= /proto
#
# The declaration POUND_SIGN is always '#'. This is needed to get around the
# make feature that '#' is always a comment delimiter, even when escaped or
-# quoted. The only way of generating this is the :sh macro mechanism. Note
-# however that in general :sh macros should be avoided in makefiles that are
-# widely included into other makefiles, as the resulting shell executions can
-# cause a noticable slowdown in build times.
+# quoted. We use this macro expansion method to get POUND_SIGN rather than
+# always breaking out a shell because the general case can cause a noticable
+# slowdown in build times when so many Makefiles include Makefile.master.
#
-POUND_SIGN:sh= echo \\043
+# While the majority of users are expected to override the setting below
+# with an env file (via nightly or bldenv), if you aren't building that way
+# (ie, you're using "ws" or some other bootstrapping method) then you need
+# this definition in order to avoid the subshell invocation mentioned above.
+#
+
+PRE_POUND= pre\#
+POUND_SIGN= $(PRE_POUND:pre\%=%)
NOT_RELEASE_BUILD=
INTERNAL_RELEASE_BUILD= $(POUND_SIGN)
@@ -885,11 +891,10 @@ RELEASE_MINOR= 11
RELEASE= $(RELEASE_MAJOR).$(RELEASE_MINOR)
VERSION= SunOS Development
PATCHID= $(VERSION)
-RELEASE_DATE= October 2007
+RELEASE_DATE= release date not set
PATCH_DATE= $(RELEASE_DATE)
RELEASE_CM= "@($(POUND_SIGN))SunOS $(RELEASE) $(PATCHID) $(PATCH_DATE)"
-DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: \
-`$(ECHO) $$LOGNAME` `date +%Y-%m-%d` `$(ECHO) [\`basename $$CODEMGR_WS\`]`"
+DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: non-nightly build"
PROCESS_COMMENT= @?${MCS} -c -a $(RELEASE_CM) -a $(DEV_CM)
$(STRIP_COMMENTS)PROCESS_COMMENT= @?${MCS} -d -a $(RELEASE_CM) -a $(DEV_CM)
View
@@ -26,16 +26,7 @@
#
# Makefile.psm, global definitions for platform specific modules
-#
-# The distinction between root.sys and root.bin is largely historical;
-# the files in group bin used to be owned by user bin.
-#
-INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-#
-#
-#
ROOT_PLAT_DIR = $(ROOT)/platform
ROOT_PSM_DIR = $(ROOT_PLAT_DIR)/$(PLATFORM)
View
@@ -28,26 +28,26 @@
# Installation targets and rules:
#
$(ROOT_PLAT_DIR) $(USR_PLAT_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_DIR): $(ROOT_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_BOOT_PSM_KERN_DIR):
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_LIB_DIR) \
$(ROOT_PSM_SBIN_DIR): $(ROOT_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_LIB64_DIR): $(ROOT_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_MOD_DIR): $(ROOT_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_MOD_DIRS_32): $(ROOT_PSM_MOD_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(ROOT_PSM_DIR)/%: % $(ROOT_PSM_DIR)
$(INS.file)
@@ -113,13 +113,13 @@ $(ROOT_PSM_BRAND_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_BRAND_DIR) FRC
$(INS.file)
$(ROOT_PSM_LIB_FS_DIR): $(ROOT_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(ROOT_PSM_LIB_UFS_DIR) \
$(ROOT_PSM_LIB_NFS_DIR) \
$(ROOT_PSM_LIB_HSFS_DIR) \
$(ROOT_PSM_LIB_ZFS_DIR): $(ROOT_PSM_LIB_FS_DIR)
- $(INS.dir.root.bin)
+ $(INS.dir)
$(ROOT_PSM_LIB_UFS_DIR)/%: % $(ROOT_PSM_LIB_UFS_DIR)
$(INS.file)
@@ -137,34 +137,34 @@ $(ROOT_PSM_LIB_ZFS_DIR)/%: % $(ROOT_PSM_LIB_ZFS_DIR)
#
#
$(USR_PSM_DIR): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_INCL_DIR) \
$(USR_PSM_LIB_DIR) \
$(USR_PSM_SBIN_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB64_DIR): $(USR_PSM_LIB_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_FS_DIR): $(USR_PSM_LIB_DIR) $(LINKED_LIB_FS_DIRS)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_LIB_UFS_DIR) \
$(USR_PSM_LIB_NFS_DIR) \
$(USR_PSM_LIB_HSFS_DIR) \
$(USR_PSM_LIB_ZFS_DIR): $(USR_PSM_LIB_FS_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_MOD_DIR): $(USR_PSM_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_MOD_DIRS_32): $(USR_PSM_MOD_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(USR_PSM_ISYS_DIR) \
$(USR_PSM_IVM_DIR): $(USR_PSM_INCL_DIR)
- -$(INS.dir.root.bin)
+ -$(INS.dir)
$(USR_PSM_INCL_DIR)/%: % $(USR_PSM_INCL_DIR)
$(INS.file)
@@ -227,10 +227,10 @@ $(USR_PSM_DACF_DIR)/%: % $(USR_PSM_DACF_DIR) FRC
# links in /usr/platform
#
$(LINKED_DIRS): $(USR_PLAT_DIR)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_LIB_DIRS): $(LINKED_DIRS)
- -$(INS.dir.root.sys)
+ -$(INS.dir)
$(LINKED_ADB_DIRS): $(LINKED_LIB_DIRS)
-$(INS.slink6)
Oops, something went wrong.

0 comments on commit 48bc00d

Please sign in to comment.