diff options
Diffstat (limited to 'usr/src/Makefile')
| -rw-r--r-- | usr/src/Makefile | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 219e80372d..01ea95b29f 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -25,7 +25,7 @@ # 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 2018 Joyent, Inc. +# Copyright 2019 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # @@ -50,7 +50,7 @@ $(SPARC_BLD)psm: stand SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) -HDRSUBDIRS= uts head lib cmd +HDRSUBDIRS= uts head lib cmd ucbhead # UCB headers are bug-for-bug compatible and not checkable against the header # standards. @@ -60,7 +60,7 @@ CHKHDRSUBDIRS= head uts lib # # Headers that can be built in parallel # -PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders +PARALLEL_HEADERS = sysheaders userheaders libheaders ucbheaders cmdheaders # # Directories that can be built in parallel @@ -105,7 +105,7 @@ all: mapfiles closedbins sgs .WAIT $(SUBDIRS) pkg # packaging to be pulled from $(SRC) and $(CLOSED) and staged in # $(ROOT)/licenses. # -install: install1 install2 _msg stage-licenses +install: install1 install2 _msg @cd msg; pwd; $(MAKE) _msg @rm -rf "$(ROOT)/catalog" @@ -133,7 +133,10 @@ clobber_local: # If the tarballs are included inside ON_CLOSED_BINS, use those to extract and # preserve the permissions (in case a distro ships them). - +# +# intel_nhmex hard codes the use of older smbios structures. Therefore, +# we disable its use of smbios. See OS-4435 for more information. +# closedbins: bldtools $(ROOTDIRS) FRC @CLOSED_ROOT="$$ON_CLOSED_BINS/root_$(MACH)$${RELEASE_BUILD+-nd}"; \ if [ -f "$$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2" ]; then \ @@ -153,9 +156,14 @@ closedbins: bldtools $(ROOTDIRS) FRC (cd $$CLOSED_ROOT; \ $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \ (cd $(ROOT); $(TAR) xBpf -); \ + $(ECHO) "Stripping CTF from closed-bins in $$ROOT"; \ ( 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) ); \ + $(ECHO) "Fixing intel_nhmex.conf in $$ROOT"; \ + (cd $(ROOT); \ + echo "no-smbios=1;" >> kernel/drv/intel_nhmex.conf) + # # Declare what parts can be built in parallel @@ -165,13 +173,13 @@ closedbins: bldtools $(ROOTDIRS) FRC .PARALLEL: $(PARALLEL_HEADERS) DUMMY .PARALLEL: $(PARALLEL_DIRS) DUMMY -$(SUBDIRS) head pkg: FRC +$(SUBDIRS) head ucbhead pkg: FRC @cd $@; pwd; $(MAKE) $(TARGET) # librpcsvc has a dependency on headers installed by # userheaders, hence the .WAIT before libheaders. sgs: rootdirs .WAIT sysheaders userheaders .WAIT \ - libheaders cmdheaders + libheaders ucbheaders cmdheaders # # Top-level setup target to setup the development environment that includes @@ -214,6 +222,9 @@ libheaders: bldtools sysheaders: FRC @cd uts; pwd; $(MAKE) install_h +ucbheaders: FRC + @cd ucbhead; pwd; $(MAKE) install_h + cmdheaders: FRC @cd cmd/devfsadm; pwd; $(MAKE) install_h @cd cmd/fm; pwd; $(MAKE) install_h |