diff options
| author | Dan McDonald <danmcd@omniti.com> | 2015-10-20 19:01:25 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-10-21 13:43:26 -0400 |
| commit | 2e27c225839ca5af7c7b52f72b17676fd2f78cdb (patch) | |
| tree | 37953f6536e139874ea803bc1e198211d3c787e9 /usr/src | |
| parent | ddadf64dec36f9cae0ff7ed9384ec87f855af450 (diff) | |
| download | illumos-gate-2e27c225839ca5af7c7b52f72b17676fd2f78cdb.tar.gz | |
6366 Allow ON_CLOSED_BINS to point to a directory with tarballs
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index b9be247888..b71c3485c8 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -23,6 +23,7 @@ # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> +# Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. # # @@ -137,8 +138,17 @@ clobber_local: @cd common/mapfiles; pwd; $(MAKE) clobber @cd msg; pwd; $(MAKE) clobber +# If the tarballs are included inside ON_CLOSED_BINS, use those to extract and +# preserve the permissions (in case a distro ships them). + 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 \ + $(ECHO) "Extracting tarball $$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2"; \ + (cd $(CODEMGR_WS); \ + $(TAR) xjpf $$ON_CLOSED_BINS/on-closed-bins$${RELEASE_BUILD+-nd}.$(MACH).tar.bz2); \ + CLOSED_ROOT="$(CODEMGR_WS)/closed/root_$(MACH)$${RELEASE_BUILD+-nd}"; \ + fi; \ if [ ! -d "$$CLOSED_ROOT" ]; then \ $(ECHO) "Error: ON_CLOSED_BINS must point to closed" \ "binaries."; \ |