Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/pkg/Makefile.lic
+++ new/usr/src/pkg/Makefile.lic
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
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
24 24 #
25 25
26 26 #
27 27 # PKGDEBUG and LICROOT should be defined on the command line or in
28 28 # the environment when using this Makefile, as they generally come
29 29 # from usr/src/pkg/Makefile. The remaining env vars should already
30 30 # be part of a working build environment.
31 31 #
32 32
33 33 include $(SRC)/Makefile.master
↓ open down ↓ |
33 lines elided |
↑ open up ↑ |
34 34
35 35 #
36 36 # For license files in the open source tree, always copy them from src
37 37 # into the license staging directory in the proto area
38 38 #
39 39 $(LICROOT)/usr/src/%: $(CODEMGR_WS)/usr/src/%
40 40 $(PKGDEBUG)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
41 41 $(PKGDEBUG)$(INS.file)
42 42
43 43 #
44 -# For license files in the closed source tree, the desired action
45 -# depends on the type of build.
44 +# A build without closed source relies on closed-bins extraction to stage
45 +# the license file and does nothing here.
46 46 #
47 -# 1. For a normal build, with closed source present, simply copy the
48 -# file into the license staging directory.
49 -#
50 -# 2. For a Tonic build, copy the file into both open and closed
51 -# license staging directories.
52 -#
53 -# 3. For a build without closed source, rely on closed-bins extraction
54 -# to stage the license file, and do nothing here.
55 -#
56 -$(TONICBUILD)INS= install -O
57 -$(LICROOT)/usr/closed/%: $(CLOSED_BUILD) $(CODEMGR_WS)/usr/closed/%
58 - $(CLOSED_BUILD)$(PKGDEBUG) \
47 +$(LICROOT)/usr/closed/%:
59 48 if [ ! -d $(@D) ]; then \
60 49 mkdir -p $(@D); \
61 50 fi; \
62 - $(TONICBUILD) $(RM) $(@:$(ROOT)/%=$(CLOSEDROOT)/%)
63 - $(CLOSED_BUILD)$(PKGDEBUG)$(INS.file)
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX