25862952 publisher change and prep for moving to github
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Fri Apr 07 15:26:24 2017 -0700 (2017-04-07)
changeset 17044c67bc06f3ac
parent 1703 59811dd200b2
child 1705 76aff95e6534
25862952 publisher change and prep for moving to github
BUILD_INSTRUCTIONS
README.md
pkg/Makefile
pkg/manifests/x11-demo.p5m
     1.1 --- a/BUILD_INSTRUCTIONS	Thu Apr 06 22:27:29 2017 -0700
     1.2 +++ b/BUILD_INSTRUCTIONS	Fri Apr 07 15:26:24 2017 -0700
     1.3 @@ -1,28 +1,6 @@
     1.4  Solaris X Window System Consolidation Build Instructions
     1.5  --------------------------------------------------------
     1.6  
     1.7 -Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
     1.8 -
     1.9 -Permission is hereby granted, free of charge, to any person obtaining a
    1.10 -copy of this software and associated documentation files (the "Software"),
    1.11 -to deal in the Software without restriction, including without limitation
    1.12 -the rights to use, copy, modify, merge, publish, distribute, sublicense,
    1.13 -and/or sell copies of the Software, and to permit persons to whom the
    1.14 -Software is furnished to do so, subject to the following conditions:
    1.15 -
    1.16 -The above copyright notice and this permission notice (including the next
    1.17 -paragraph) shall be included in all copies or substantial portions of the
    1.18 -Software.
    1.19 -
    1.20 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1.21 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.22 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    1.23 -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.24 -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    1.25 -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    1.26 -DEALINGS IN THE SOFTWARE.
    1.27 -____________________________________________________________________________
    1.28 -
    1.29  == Build requirements & preparation ==
    1.30  
    1.31  To build X, you need to set up a machine with the correct build environment:
    1.32 @@ -79,7 +57,7 @@
    1.33  proto/pkg_sparc or proto/pkg_i386 as appropriate.
    1.34  
    1.35  Builds made by individual developers default to using the publisher
    1.36 -name "xnv-devel" but that can be overridden via flags to the buildit or
    1.37 +name "nightly" but that can be overridden via flags to the buildit or
    1.38  make_release_packages scripts.  They will depend on the versions of
    1.39  packages from other consolidations that were installed on the system
    1.40  they built them on.
    1.41 @@ -89,12 +67,9 @@
    1.42  to get a local copy installed as /opt/onbld/bin/onu .
    1.43  
    1.44  onu will create a new boot environment and install the packages there - you
    1.45 -will then need to reboot into that BE to use them. Since none of the X
    1.46 -packages have the reboot required flag, it is possible to use pkg to install
    1.47 -them to the live BE, but then you have more work to do if you need to switch
    1.48 -back to the previous versions.
    1.49 +will then need to reboot into that BE to use them.
    1.50  
    1.51 -Note that onu uses pkg image-update, which means there are two important
    1.52 +Note that onu uses pkg update, which means there are two important
    1.53  things to remember:
    1.54  
    1.55  1) It will upgrade all of your packages and not just the X packages.
    1.56 @@ -104,6 +79,29 @@
    1.57  
    1.58  Example: Install to a new BE named "X14" that is cloned from the current BE:
    1.59  
    1.60 - # onu -O -u file://`pwd`/proto/pkgs_i386 -U xnv-devel -t X14
    1.61 + # onu -O -u file://`pwd`/proto/pkgs_i386 -U nightly -t X14
    1.62  
    1.63  ____________________________________________________________________________
    1.64 +
    1.65 +Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
    1.66 +
    1.67 +Permission is hereby granted, free of charge, to any person obtaining a
    1.68 +copy of this software and associated documentation files (the "Software"),
    1.69 +to deal in the Software without restriction, including without limitation
    1.70 +the rights to use, copy, modify, merge, publish, distribute, sublicense,
    1.71 +and/or sell copies of the Software, and to permit persons to whom the
    1.72 +Software is furnished to do so, subject to the following conditions:
    1.73 +
    1.74 +The above copyright notice and this permission notice (including the next
    1.75 +paragraph) shall be included in all copies or substantial portions of the
    1.76 +Software.
    1.77 +
    1.78 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1.79 +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.80 +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    1.81 +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.82 +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    1.83 +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    1.84 +DEALINGS IN THE SOFTWARE.
    1.85 +____________________________________________________________________________
    1.86 +
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/README.md	Fri Apr 07 15:26:24 2017 -0700
     2.3 @@ -0,0 +1,29 @@
     2.4 +# Getting started with the X Consolidation
     2.5 +
     2.6 +## Getting Started
     2.7 +This README provides a very brief overview of the gate (i.e., source
     2.8 +code repository), how to retrieve a copy, and how to build it.  
     2.9 +
    2.10 +## Overview
    2.11 +The X consolidation maintains a project at
    2.12 +
    2.13 +     https://github.com/oracle/solaris-xorg
    2.14 +
    2.15 +That repo contains Makefile, patches, IPS (i.e., pkg(7)) manifests,
    2.16 +and other files necessary to build, package and publish the Xorg bits
    2.17 +on Solaris.
    2.18 +
    2.19 +## Getting the Bits
    2.20 +The canonical repository internal to Oracle is stored in Mercurial, and
    2.21 +is mirrored to an external Git repository on GitHub.  In order to build
    2.22 +or develop in the gate, you will need to clone it.  You can do so with
    2.23 +the following command.  
    2.24 +
    2.25 +    $ git clone https://github.com/oracle/solaris-xorg your-clone
    2.26 +
    2.27 +## Building the software
    2.28 +Please review BUILD_INSTRUCTIONS for details on how to build and generate
    2.29 +IPS packages.
    2.30 +
    2.31 +# Copyright
    2.32 +Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
     3.1 --- a/pkg/Makefile	Thu Apr 06 22:27:29 2017 -0700
     3.2 +++ b/pkg/Makefile	Fri Apr 07 15:26:24 2017 -0700
     3.3 @@ -2,7 +2,7 @@
     3.4  #
     3.5  # Makefile for X Consolidation packages
     3.6  #
     3.7 -# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
     3.8 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     3.9  #
    3.10  # Permission is hereby granted, free of charge, to any person obtaining a
    3.11  # copy of this software and associated documentation files (the "Software"),
    3.12 @@ -415,9 +415,7 @@
    3.13  
    3.14  ### Repo setup
    3.15  
    3.16 -# Default in developer builds is "xnv-devel"
    3.17 -# X RE cronjob build scripts override to "xnv-nightly"
    3.18 -PKGPUBLISHER = xnv-devel
    3.19 +PKGPUBLISHER = nightly
    3.20  
    3.21  # Initialize the empty on-disk repositories
    3.22  $(PKGDEST):
     4.1 --- a/pkg/manifests/x11-demo.p5m	Thu Apr 06 22:27:29 2017 -0700
     4.2 +++ b/pkg/manifests/x11-demo.p5m	Fri Apr 07 15:26:24 2017 -0700
     4.3 @@ -1,4 +1,4 @@
     4.4 -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
     4.5 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     4.6  #
     4.7  # Permission is hereby granted, free of charge, to any person obtaining a
     4.8  # copy of this software and associated documentation files (the "Software"),
     4.9 @@ -25,7 +25,7 @@
    4.10      value="ico, xeyes, xgc, and xlogo sample clients to demonstrate or test various X operations."
    4.11  # Silence pkglint WARNING pkglint.manifest004:
    4.12  #	last name component demo in package name clashes across
    4.13 -#	pkg://solaris/library/java/demo pkg://xnv-devel/x11/
    4.14 +#	pkg://solaris/library/java/demo pkg://nightly/x11/
    4.15  set name=pkg.linted value=True
    4.16  link path=usr/X11/bin/ico target=../../bin/ico
    4.17  link path=usr/X11/bin/xeyes target=../../bin/xeyes