Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/conflict/Makefile
author Matt Keenan <matt.keenan@oracle.com>
Fri, 19 Jun 2015 09:35:02 +0100
branchs11-update
changeset 4508 d8924d870370
parent 3996 20c0f21bbe1e
permissions -rw-r--r--
PSARC 2015/172 OpenStack Ironic (OpenStack Bare Metal Provisioning Service) PSARC 2015/070 pecan - Lightweight Python web-framework PSARC 2015/071 PyCA Python Cryptography PSARC 2015/170 OpenStack client for Ironic (Bare Metal Provisioning) PSARC 2015/171 scp - python secure copy PSARC 2015/196 singledispatch - Single-dispatch generic functions for Python PSARC 2015/197 logutils - Set of handlers for standard Python logging library PSARC 2015/198 Support for enumerations in Python 2.6 and 2.7 PSARC 2015/250 paramiko - SSHv2 protocol implementation in Python 20547142 Request to integrate Ironic into userland 17502639 The Python paramiko module should be added to Userland 20172780 The Python module scp should be added to Userland 20180376 The Python module ironicclient should be added to Userland 20182588 The Python module pecan should be added to Userland 20465525 The PyCA cryptography module should be added to Userland 20904396 The Python module singledispatch should be added to Userland 20904413 The Python module logutils should be added to Userland 20917993 The Python enum34 module should be added to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
387
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
# CDDL HEADER START
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
# The contents of this file are subject to the terms of the
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
# Common Development and Distribution License (the "License").
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
# You may not use this file except in compliance with the License.
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
# or http://www.opensolaris.org/os/licensing.
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
# See the License for the specific language governing permissions
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
# and limitations under the License.
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
# When distributing Covered Code, include this CDDL HEADER in each
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
# If applicable, add the following below this CDDL HEADER, with the
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
# fields enclosed by brackets "[]" replaced with your own identifying
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
# information: Portions Copyright [yyyy] [name of copyright owner]
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
# CDDL HEADER END
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
#
88254491c816 7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 












88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    22


#








3996






20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 
3661

diff
changeset




    23


# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.








387






88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    24


#













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    25














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    26


include ../../make-rules/shared-macros.mk













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    27














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    28


COMPONENT_NAME=		conflict








771






f57a88a76d61
7161370 Update conflict to version 20100627



Rich Burridge <rich.burridge@oracle.com>


parents: 
387

diff
changeset




    29


COMPONENT_VERSION=	20100627













f57a88a76d61
7161370 Update conflict to version 20100627



Rich Burridge <rich.burridge@oracle.com>


parents: 
387

diff
changeset




    30


IPS_COMPONENT_VERSION=	0.2010.6.27








387






88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    31


COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    32


COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    33


COMPONENT_PROJECT_URL=	http://invisible-island.net/conflict/conflict.html








800






2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
771

diff
changeset




    34


COMPONENT_ARCHIVE_HASH=	\













2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile



Mike Sullivan <Mike.Sullivan@Oracle.COM>


parents: 
771

diff
changeset




    35


    sha256:e795d7d580d2a2bb5081bcf9b0efe6d86567fd29770c60de90da7c07105bfeb9








387






88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    36


COMPONENT_ARCHIVE_URL=	ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)








2434






6c9bb5cf5610
15930486 - Auto-generation of Userland gate list for the Solaris 11 Update Release



Rich Burridge <rich.burridge@oracle.com>


parents: 
800

diff
changeset




    37


COMPONENT_BUGDB=	utility/conflict








387






88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    38









3661






47545fb8aed4
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests



John Beck <John.Beck@Oracle.COM>


parents: 
2434

diff
changeset




    39


TPNO=			8338













47545fb8aed4
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests



John Beck <John.Beck@Oracle.COM>


parents: 
2434

diff
changeset




    40









3996






20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 
3661

diff
changeset




    41


include $(WS_MAKE_RULES)/prep.mk













20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 
3661

diff
changeset




    42


include $(WS_MAKE_RULES)/configure.mk













20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 
3661

diff
changeset




    43


include $(WS_MAKE_RULES)/ips.mk








387






88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    44














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    45


# Required to configure correctly.













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    46


COMPONENT_PRE_CONFIGURE_ACTION = \













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    47


	($(CLONEY) $(SOURCE_DIR) $(@D))













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    48














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    49


CONFIGURE_ENV += "CC=$(CC)"













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    50














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    51


# If the configure options are not explicitly set, then configure fails with:













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    52


# configure: warning: CC=/ws/onnv-tools/SUNWspro/sunstudio12.1/bin/cc: invalid host type













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    53


# configure: warning: CXX=/ws/onnv-tools/SUNWspro/sunstudio12.1/bin/CC: invalid host type













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    54


# configure: error: can only configure for one host and one target at a time













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    55


CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX)













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    56


CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    57














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    58


# common targets













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    59


build:		$(BUILD_32)













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    60














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    61


install:	$(INSTALL_32)













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    62














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    63


test:		build













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    64


	@cd $(BUILD_DIR_32); ./run_test.sh













88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    65














88254491c816
7063901 Move conflict to userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    66









3996






20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland



Norm Jacobs <Norm.Jacobs@Oracle.COM>


parents: 
3661

diff
changeset




    67


REQUIRED_PACKAGES += system/library















upstream/oracle/userland-gate