--- a/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
#
SUBDIRS = components
@@ -46,4 +46,7 @@
$(SUBDIRS): FORCE
@+echo "$(TARGET) $@" ; $(MAKE) -C $@ $(TARGET)
+README.md: README
+ markdown_py < $< > $@
+
FORCE:
--- a/README Wed Mar 15 14:25:45 2017 -0700
+++ b/README Wed Mar 15 12:33:24 2017 -0700
@@ -6,23 +6,18 @@
This README provides a very brief overview of the gate, how to retrieve
a copy, and how to build it. Detailed documentation about the Userland
- gate can be found in the 'doc' directory. Questions or comments about
- the gate can be addressed to [email protected].
+ gate can be found in the 'doc' directory.
Overview
- The Userland consolidation maintains a project page at
+ The Userland consolidation maintains a project at
- https://solaris-userland.java.net/
-
- and a Mercurial gate at
+ https://github.com/oracle/solaris-userland
- https://hg.java.net/hg/solaris-userland~gate
-
- This gate contains build recipies, patches, IPS manifests, etc. necessary
+ That repo contains build recipes, patches, IPS manifests, etc. necessary
to download, prep, build, test, package and publish open source software.
- The build infrastructure is similiar to that of the SFW consolidation in
- that it makes use of herarchical Makefiles which provide dependency and
+ The build infrastructure is similar to that of the SFW consolidation in
+ that it makes use of hierarchical Makefiles which provide dependency and
recipe information for building the components. In order to build the
contents of the Userland gate, you need to clone it. Since you are
reading this, you probably already have.
@@ -33,7 +28,7 @@
build or develop in the gate, you will need to clone it. You can do so
with the following command
- $ hg clone https://hg.java.net/hg/solaris-userland~gate /scratch/clone
+ $ git clone https://github.com/oracle/solaris-userland.git /scratch/clone
This will create a replica of the various pieces that are checked into the
source code management system, but it does not retrieve the community
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md Wed Mar 15 12:33:24 2017 -0700
@@ -0,0 +1,82 @@
+<pre><code> Getting started with the Userland Consolidation
+</code></pre>
+<p>Getting Started</p>
+<pre><code>This README provides a very brief overview of the gate, how to retrieve
+a copy, and how to build it. Detailed documentation about the Userland
+gate can be found in the 'doc' directory.
+</code></pre>
+<p>Overview</p>
+<pre><code>The Userland consolidation maintains a project at
+
+ https://github.com/oracle/solaris-userland
+
+That repo contains build recipes, patches, IPS manifests, etc. necessary
+to download, prep, build, test, package and publish open source software.
+The build infrastructure is similar to that of the SFW consolidation in
+that it makes use of hierarchical Makefiles which provide dependency and
+recipe information for building the components. In order to build the
+contents of the Userland gate, you need to clone it. Since you are
+reading this, you probably already have.
+</code></pre>
+<p>Getting the Bits</p>
+<pre><code>As mentioned, the gate is stored in a Mercurial repository. In order to
+build or develop in the gate, you will need to clone it. You can do so
+with the following command
+
+ $ git clone https://github.com/oracle/solaris-userland.git /scratch/clone
+
+This will create a replica of the various pieces that are checked into the
+source code management system, but it does not retrieve the community
+source archives associated with the gate content. To download the
+community source associated with your cloned workspace, you will need to
+execute the following:
+
+ $ cd /scratch/clone/components
+ $ gmake download
+
+This will use GNU make and the downloading tool in the gate to walk through
+all of the component directories downloading and validating the community
+source archives from the gate machine or their canonical source repository.
+
+There are two variation to this that you may find interesting. First, you
+can cause gmake(1) to perform it's work in parallel by adding '-j (jobs)'
+to the command line. Second, if you are only interested in working on a
+particular component, you can change directories to that component's
+directory and use 'gmake download' from that to only get it's source
+archive.
+</code></pre>
+<p>Building the Bits.</p>
+<pre><code>You can build individual components or the contents of the entire gate.
+</code></pre>
+<p>Component build</p>
+<pre><code>If you are only working on a single component, you can just build it using
+following:
+
+ setup the workspace for building components
+
+ $ cd (your-workspace)/components ; gmake setup
+
+ build the individual component
+
+ $ cd (component-dir) ; gmake publish
+</code></pre>
+<p>Complete Top Down build </p>
+<pre><code>Complete top down builds are also possible by simply running
+
+ $ cd (your-workspace)/components
+ $ gmake publish
+
+The 'publish' target will build each component and publish it to the
+workspace IPS repo.
+Tools to help facilitate build zone creation will be integrated
+shortly. If the zone you create to build your workspace in does not have
+networking enabled, you can pre-download any community source archives into
+your workspace from the global with:
+
+ $ cd (your-workspace)/components
+ $ gmake download
+</code></pre>
+<p>You can add parallelism to your builds by adding '-j (jobs)' to your gmake
+ command line arguments.</p>
+<p>The gate should only incrementally build what it needs to based on what has
+ changed since you last built it.</p>
\ No newline at end of file
--- a/components/gamin/patches/gamin-02-gamin.patch Wed Mar 15 14:25:45 2017 -0700
+++ b/components/gamin/patches/gamin-02-gamin.patch Wed Mar 15 12:33:24 2017 -0700
@@ -1,7 +1,6 @@
expilcitly use python2.7 in dlpitest.py privrbactest.py ucredtest.py gami.py
http://hg.osdyson.org/solaris-desktop-spec-files/raw-file/8f7c0cd200a9/patches/gamin-02-gamin.diff
-https://java.net/projects/solaris-desktop/sources/spec-files/history?path=patches/gamin-02-gamin.diff
--- a/python/gamin.py.orig 2009-12-04 13:19:30.527419772 +0800
+++ b/python/gamin.py 2009-12-04 13:19:43.189517582 +0800
--- a/components/libusb/ugen/libusbugen.p5m Wed Mar 15 14:25:45 2017 -0700
+++ b/components/libusb/ugen/libusbugen.p5m Wed Mar 15 12:33:24 2017 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -27,7 +27,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
-set name=info.source-url value=https://solaris-userland.java.net/
+set name=info.source-url value=https://github.com/oracle/solaris-userland
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2003/721
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libusb/wrapper/libusb.p5m Wed Mar 15 14:25:45 2017 -0700
+++ b/components/libusb/wrapper/libusb.p5m Wed Mar 15 12:33:24 2017 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -29,7 +29,7 @@
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
-set name=info.source-url value=https://solaris-userland.java.net/
+set name=info.source-url value=https://github.com/oracle/solaris-userland
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2003/721
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/meta-packages/developer-opensolaris-userland/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -29,8 +29,8 @@
COMPONENT_VERSION=
COMPONENT_SRC=
COMPONENT_ARCHIVE=
-COMPONENT_PROJECT_URL= http://solaris-userland.java.net/
-COMPONENT_ARCHIVE_URL= http://hg.java.net/solaris-userland-gate/
+COMPONENT_PROJECT_URL= https://github.com/oracle/solaris-userland
+COMPONENT_ARCHIVE_URL= https://github.com/oracle/solaris-userland.git
COMPONENT_BUGDB= gate-stuff/userland
include $(WS_MAKE_RULES)/prep.mk
--- a/components/meta-packages/group-feature/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/components/meta-packages/group-feature/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -29,8 +29,8 @@
COMPONENT_VERSION= $(PKG_SOLARIS_VERSION)
COMPONENT_SRC=
COMPONENT_ARCHIVE=
-COMPONENT_PROJECT_URL= http://solaris-userland.java.net/
-COMPONENT_ARCHIVE_URL= http://hg.java.net/solaris-userland-gate/
+COMPONENT_PROJECT_URL= https://github.com/oracle/solaris-userland
+COMPONENT_ARCHIVE_URL= https://github.com/oracle/solaris-userland.git
COMPONENT_BUGDB= gate-stuff/userland
include $(WS_MAKE_RULES)/prep.mk
--- a/components/nicstat/nicstat.license Wed Mar 15 14:25:45 2017 -0700
+++ b/components/nicstat/nicstat.license Wed Mar 15 12:33:24 2017 -0700
@@ -7,7 +7,7 @@
Extensions to nicstat have been made by Oracle to support current versions
of Solaris and provide additional tools. These changes are detailed in the
-https://java.net/projects/solaris-userland/sources/gate/show/components/nicstat/patches
+https://github.com/oracle/solaris-userland/tree/master/components/nicstat/patches
subdirectory.
The current open source version of nicstat can be downloaded at:
--- a/components/perl/perl522/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/components/perl/perl522/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -79,7 +79,6 @@
-Ulocincpth= \
-Dbin=/usr/perl5/$(PERL_VERSION_LOCAL)/bin \
-Dcc="cc" \
- -Dcf_email="[email protected]" \
-Dcf_by="perl-bugs" \
-Dlibperl=libperl.so \
-Dmyhostname="localhost" \
--- a/components/perl/perl522/perl.license Wed Mar 15 14:25:45 2017 -0700
+++ b/components/perl/perl522/perl.license Wed Mar 15 12:33:24 2017 -0700
@@ -7,7 +7,7 @@
Extensions to Perl have been made by Oracle to support current versions of
Solaris and provide additional tools. These changes are detailed in the
-https://java.net/projects/solaris-userland/sources/gate/show/components/perl/perl522/patches/
+https://github.com/oracle/solaris-userland/tree/master/components/perl/perl522/patches
subdirectory.
The current open source version of Perl can be downloaded at:
--- a/components/perl512/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/components/perl512/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
BUILD_BITS= 32
include ../../make-rules/shared-macros.mk
@@ -94,7 +94,6 @@
-Duse64bitint \
-Dcc="cc" \
-Doptimize="$(CFLAGS.studio)" \
- -Dcf_email="[email protected]" \
-Dcf_by="perl-bugs" \
-Dmyhostname="localhost" \
-Dmksymlinks \
--- a/components/perl512/perl.license Wed Mar 15 14:25:45 2017 -0700
+++ b/components/perl512/perl.license Wed Mar 15 12:33:24 2017 -0700
@@ -8,7 +8,7 @@
Extensions to Perl 5.12.5 have been made by Oracle to support current versions
of Solaris and provide additional tools. These changes are detailed in the
solaris-userland project source repository at
-http://java/net/projects/solaris-userland/sources/gates/ in the
+https://github.com/oracle/solaris-userland in the
components/perl512/patches/setenv.patch file.
The current open source version of Perl can be downloaded at:
--- a/components/vim/Makefile Wed Mar 15 14:25:45 2017 -0700
+++ b/components/vim/Makefile Wed Mar 15 12:33:24 2017 -0700
@@ -73,7 +73,7 @@
CONFIGURE_OPTIONS += --with-features=huge
CONFIGURE_OPTIONS += --with-compiledby="the Solaris Userland build environment"
-CONFIGURE_OPTIONS += --with-modified-by="Solaris Userland <[email protected]>"
+CONFIGURE_OPTIONS += --with-modified-by="Solaris Userland Team"
CONFIGURE_OPTIONS += --enable-luainterp=dynamic
CONFIGURE_OPTIONS += --enable-perlinterp=dynamic
CONFIGURE_OPTIONS += --enable-pythoninterp=dynamic
--- a/doc/gate-mechanics.txt Wed Mar 15 14:25:45 2017 -0700
+++ b/doc/gate-mechanics.txt Wed Mar 15 12:33:24 2017 -0700
@@ -80,7 +80,7 @@
notify gatelings
-External mirror repository (https://hg.java.net/hg/solaris-userland~gate)
+External mirror repository (https://github.com/oracle/solaris-userland.git)
The external mirror is the mercurial repository that contains an externally
accessible copy of the canonical tools, source code, and build recipies for
the product. It should always be in a stable, buildable state.
--- a/make-rules/shared-macros.mk Wed Mar 15 14:25:45 2017 -0700
+++ b/make-rules/shared-macros.mk Wed Mar 15 12:33:24 2017 -0700
@@ -103,7 +103,7 @@
# The changset and external source repo used in building the packages.
CONSOLIDATION_CHANGESET=$(shell hg identify -i)
-CONSOLIDATION_REPOSITORY_URL=https://hg.java.net/hg/solaris-userland~gate
+CONSOLIDATION_REPOSITORY_URL=https://github.com/oracle/solaris-userland.git
# Native OS version
OS_VERSION := $(shell uname -r)
--- a/tools/userland-mangler Wed Mar 15 14:25:45 2017 -0700
+++ b/tools/userland-mangler Wed Mar 15 12:33:24 2017 -0700
@@ -21,7 +21,7 @@
#
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
#
# userland-mangler - a file mangling utility
@@ -95,7 +95,7 @@
Further information about this software can be found on the open source community website at %s.
"""
notes_source = """
-This software was built from source available at https://java.net/projects/solaris-userland. The original community source was downloaded from %s
+This software was built from source available at https://github.com/oracle/solaris-userland. The original community source was downloaded from %s
"""
def notes_section_text(header_seen, community, source, modified_date):