Browse Source

OS-8394 Move smartos-live (and friends if needed) to pkgsrc.smartos.org

Reviewed by: Brian Bennett <brian.bennett@mnx.io>
Approved by: Brian Bennett <brian.bennett@mnx.io>
pull/1052/head
Dan McDonald 3 months ago committed by GitHub
parent
commit
3f31b88bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 59
      README.md
  2. 17
      docs/dev-upgrade.md
  3. 9
      src/smartdc/bin/pkgsrc-setup.sh
  4. 3
      tools/pkgsrc_branch.nawk

59
README.md

@ -1,7 +1,7 @@
# Quickstart
```
git clone https://github.com/joyent/smartos-live.git
git clone https://github.com/TritonDataCenter/smartos-live.git
cd smartos-live
./configure
gmake world
@ -49,10 +49,10 @@ includes:
# Bug Reports
If you encounter a problem, please reach out for assistance. You can
file a [GitHub issue](https://github.com/joyent/smartos-live/issues) for
any problem you encounter. When filing a bug, please include the
platform version that you're running and a description of the problem.
If you encounter a problem, please reach out for assistance. You can file a
[GitHub issue](https://github.com/TritonDataCenter/smartos-live/issues) for
any problem you encounter. When filing a bug, please include the platform
version that you're running and a description of the problem.
If there was an operating system crash dump or a program generated a
core dump, it would be greatly appreciated if you could make that
@ -61,8 +61,8 @@ available.
While there are multiple repositories that make up the smartos-live
image, if you're in doubt about where to file a bug or just are
uncertain, please file it on the [SmartOS live issue
tracker](https://github.com/joyent/smartos-live/issues) and we'll help
from there. It's more important that the bug is recorded and we can work
tracker](https://github.com/TritonDataCenter/smartos-live/issues) and we'll
help from there. It's more important that the bug is recorded and we can work
on solving it than it end up in the right location.
# Components of SmartOS
@ -71,16 +71,16 @@ SmartOS is made up of several different components. These components are:
## smartos-live
The [smartos-live](https://github.com/joyent/smartos-live) repository is
the root of SmartOS. It has logic for how to build all of the different
components that make up SmartOS and has components that are specific to
the SmartOS live image environment. For example, it has tools like
`vmadm` and `imgadm`.
The [smartos-live](https://github.com/TritonDataCenter/smartos-live)
repository is the root of SmartOS. It has logic for how to build all of the
different components that make up SmartOS and has components that are
specific to the SmartOS live image environment. For example, it has tools
like `vmadm` and `imgadm`.
## illumos-joyent
The [illumos-joyent](https://github.com/joyent/illumos-joyent)
repository is the core of the operating system. It represents Joyent's
The [illumos-joyent](https://github.com/TritonDataCenter/illumos-joyent)
repository is the core of the operating system. It represents SmartOS's
child of [illumos-gate](https://github.com/illumos/illumos-gate). This
has the core kernel, libraries, and user commands.
@ -90,8 +90,8 @@ and not stock illumos-gate.
## illumos-extra
The [illumos-extra](https://github.com/joyent/illumos-extra) repository
contains a few different sets of software:
The [illumos-extra](https://github.com/TritonDataCenter/illumos-extra)
repository contains a few different sets of software:
1. Software which is held at a specific version that is required for the
platform to build. For example, GNU binutils fall into this category.
@ -154,10 +154,11 @@ series of Makefile targets that a local project is required to implement.
The current set of local projects include:
* [illumos-kvm](https://github.com/joyent/illumos-kvm)
* [illumos-kvm-cmd](https://github.com/joyent/illumos-kvm-cmd) aka QEMU
* [mdata-client](https://github.com/joyent/mdata-client)
* [ur-agent](https://github.com/joyent/sdc-ur-agent)
* [illumos-kvm](https://github.com/TritonDataCenter/illumos-kvm)
* [illumos-kvm-cmd](https://github.com/TritonDataCenter/illumos-kvm-cmd) aka
QEMU
* [mdata-client](https://github.com/TritonDataCenter/mdata-client)
* [ur-agent](https://github.com/TritonDataCenter/sdc-ur-agent)
# Building SmartOS
@ -263,7 +264,7 @@ Once the build zone has been configured, you can kick off a build in a
few easy steps:
```
$ git clone https://github.com/joyent/smartos-live
$ git clone https://github.com/TritonDataCenter/smartos-live
$ cd smartos-live
$ ./configure
$ gmake live
@ -353,7 +354,7 @@ for both build flavors.
latest built bits, useful in case of interrupted uploads
The `bits-upload` tool comes from
[eng.git](http://github.com/joyent/eng) which the build pulls in via
[eng.git](http://github.com/TritonDataCenter/eng) which the build pulls in via
the `deps/eng` "git submodule" from the top-level of the workspace.
The upload can be influenced by the following shell environment
@ -384,7 +385,7 @@ used to configure the upload:
For details on the default values of these variables, and how they are
used, see
[bits-upload.sh](https://github.com/joyent/eng/blob/master/tools/bits-upload.sh)
[bits-upload.sh](https://github.com/TritonDataCenter/eng/blob/master/tools/bits-upload.sh)
Finally, release engineers may find the script
[`build_jenkins`](/tools/build_jenkins) useful, intended to be run
@ -498,7 +499,7 @@ arguments when running `./configure` to take care of it. For example, you
would modify the normal workflow as follows:
```
$ git clone https://github.com/joyent/smartos-live
$ git clone https://github.com/TritonDataCenter/smartos-live
$ cd smartos-live
$ ./configure -d
$ gmake live
@ -728,14 +729,14 @@ All the repositories contained within this build use GitHub pull requests for
new changes.
All changes should have an associated issue. You can use the [GitHub
issue tracker](https://github.com/joyent/smartos-live/issues). Joyent
issue tracker](https://github.com/TritonDataCenter/smartos-live/issues). MNX
employees use an internal JIRA exposed at
<https://smartos.org/bugview>. The commit message should be of this form:
```
joyent/smartos-live#9999 make some changes (#23)
TritonDataCenter/smartos-live#9999 make some changes (#23)
joyent/smartos-live#10000 make a related change
TritonDataCenter/smartos-live#10000 make a related change
Reviewed by: Steve Reviewer <steve.reviewer@gmail.com>
Approved by: Amy Approver <amy.approver@gmail.com>
```
@ -904,7 +905,7 @@ Running mount -O -F lofs -o ro /var/tmp/smartos-test-loopback/usr /usr
Running tar -xzf ./tests-test_archive-master-20191001T134222Z.tgz -C / ./opt ./kernel ./tests.manifest.gen ./tests.buildstamp
adding cyrus user
adding ztest user
Running curl -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/bootstrap-2021Q4-tools.tar.gz
Running curl -kO https://pkgsrc.smartos.org/packages/SmartOS/bootstrap/bootstrap-2021Q4-tools.tar.gz
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 22.9M 100 22.9M 0 0 566k 0 0:00:41 0:00:41 --:--:-- 577k
@ -913,7 +914,7 @@ Running ln -s /opt/tools /opt/local
Running pkgin -y in python27 sudo coreutils gcc7 gmake
reading local summary...
processing local summary...
processing remote summary (https://pkgsrc.joyent.com/packages/SmartOS/2021Q4/tools/All)...
processing remote summary (https://pkgsrc.smartos.org/packages/SmartOS/2021Q4/tools/All)...
pkg_summary.xz 100% 120KB 119.9KB/s 00:00
calculating dependencies...done.

17
docs/dev-upgrade.md

@ -48,10 +48,10 @@ be cleaned out.
The next thing you should do is take a snapshot of your instance or
potentially back up important information. To snapshot your instance,
you can use the
[triton](https://github.com/joyent/node-triton#node-triton) tool. If you
have not already, follow the
[setup](https://github.com/joyent/node-triton#setup) instructions such
that you can point it at the system with your instance.
[triton](https://github.com/TritonDataCenter/node-triton#node-triton)
tool. If you have not already, follow the
[setup](https://github.com/TritonDataCenter/node-triton#setup) instructions
such that you can point it at the system with your instance.
First, identify the name of the instance that you are working on. This
can usually be done by running `triton inst list`. For example:
@ -176,7 +176,8 @@ Edit these files:
/opt/local/etc/pkgin/repositories.conf
```
And change any instance of `2018Q4` to `2021Q4`. There should be one
And change any instance of `2018Q4` to `2021Q4`, and any instance of
`pkgsrc.joyent.com` to `pkgsrc.smartos.org`. There should be one
instance in each file. Here's is a pre-upgrade view:
```
@ -191,9 +192,9 @@ and a post-upgrade view:
```
smartos-build-2(~)[0]% grep Q4 /opt/local/etc/pkg_install.conf
PKG_PATH=https://pkgsrc.joyent.com/packages/SmartOS/2021Q4/x86_64/All
PKG_PATH=https://pkgsrc.smartos.org/packages/SmartOS/2021Q4/x86_64/All
smartos-build-2(~)[0]% grep Q4 /opt/local/etc/pkgin/repositories.conf
https://pkgsrc.joyent.com/packages/SmartOS/2021Q4/x86_64/All
https://pkgsrc.smartos.org/packages/SmartOS/2021Q4/x86_64/All
smartos-build-2(~)[0]%
```
@ -325,7 +326,7 @@ To test this, start a fresh clone of smartos-live and build. For
example:
```
$ git clone https://github.com/joyent/smartos-live test
$ git clone https://github.com/TritonDataCenter/smartos-live test
$ cd test
$ ./configure && gmake live
$

9
src/smartdc/bin/pkgsrc-setup.sh

@ -5,6 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# Copyright 2022 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#
function fatal () {
@ -20,16 +21,16 @@ fi
root="/${1}"
# Occasionally, the filename and hash will need to be updated. Refer to
# pkgsrc.joyent.com for changes. Old boostrap tars are kept around indefinitely,
# pkgsrc.smartos.org for changes. Old boostrap tars are kept around indefinitely,
# so there's no particular urgency for getting it done when a new bootstrap
# is available, but we'll want to stay relatively up to date.
BOOTSTRAP_TAR="bootstrap-trunk-tools-20201019.tar.gz"
BOOTSTRAP_SHA="9b7a6daff5528d800e8cea20692f61ccd3b81471"
BOOTSTRAP_TAR="bootstrap-trunk-tools-20220706.tar.gz"
BOOTSTRAP_SHA="c15932a7cc791b8c5f7a0137a7521c28c503b453"
cd /tmp || fatal 'cd to /tmp failed'
printf 'Downloading pkgsrc bootstrap...\n'
curl -# -kO https://pkgsrc.joyent.com/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}
curl -# -kO https://pkgsrc.smartos.org/packages/SmartOS/bootstrap/${BOOTSTRAP_TAR}
DOWNLOADED_SHA="$(/bin/digest -a sha1 ${BOOTSTRAP_TAR})"
if ! [[ "${BOOTSTRAP_SHA}" = "${DOWNLOADED_SHA}" ]]; then

3
tools/pkgsrc_branch.nawk

@ -10,6 +10,7 @@
# http://www.illumos.org/license/CDDL.
#
# Copyright 2018 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#
# Determine pkgsrc branch given a repositories.conf file.
#
@ -32,7 +33,7 @@ BEGIN {
next;
}
$3 != "pkgsrc.joyent.com" || $4 != "packages" {
$3 != "pkgsrc.smartos.org" && $3 != "pkgsrc.joyent.com" || $4 != "packages" {
print("WARNING: unexpected URL format: " $0) >"/dev/stderr";
next;
}

Loading…
Cancel
Save