Browse Source

OS-8397 Make smartos-live work post-illumos#14769

Reviewed by: Jacob Sadowyj <jacob.sadowyj@mnxsolutions.com>
Reviewed by: Jonathan Perkin <jperkin@pkgsrc.org>
Approved by: Jacob Sadowyj <jacob.sadowyj@mnxsolutions.com>
pull/1052/head
Dan McDonald 3 months ago
parent
commit
da1330d38a
  1. 9
      configure
  2. 2
      default.configure-build
  3. 65
      pkgsrc/onbld/packlist

9
configure vendored

@ -202,7 +202,7 @@ function install_pkgin
local pkglist
pkglist="build-essential flex libxslt openjdk11 nodejs"
pkglist="$pkglist p5-XML-Parser gettext python27 py27-expat"
pkglist="$pkglist p5-XML-Parser gettext python27 py27-expat python39"
pkglist="$pkglist coreutils gsed pkg_alternatives cdrtools"
pkglist="$pkglist py27-sqlite3 nasm pigz smartos-build-tools"
@ -386,9 +386,10 @@ SHADOW_CCCS="$SHADOW_CCCS"; export SHADOW_CCCS
JAVA_ROOT=/opt/local/java/openjdk11; export JAVA_ROOT
FLEX=/opt/local/bin/flex; export FLEX
GNUXGETTEXT=/opt/local/bin/xgettext; export GNUXGETTEXT
PYTHON=/opt/local/bin/python2.7; export PYTHON
BUILDPY3='#'; export BUILDPY3
BUILDPY3TOOLS='#'; export BUILDPY3TOOLS
PYTHON3=/opt/local/bin/python3.9; export PYTHON3
PYTHON3_VERSION=3.9; export PYTHON3_VERSION
PYTHON3_PKGVERS=-39; export PYTHON3_PKGVERS
PYTHON3_SUFFIX=''; export PYTHON3_SUFFIX
BLD_JAVA_11=''; export BLD_JAVA_11
# Disable the split 32/64 perl module builds since smartos doesn't exec perl

2
default.configure-build

@ -2,4 +2,4 @@ PUBLISHER="joyent"
RELEASE_VER="joyent_147"
ON_CLOSED_BINS_URL="https://us-east.manta.joyent.com/Joyent_Dev/public/releng/illumos/on-closed-bins.i386.tar.bz2"
ON_CLOSED_BINS_ND_URL="https://us-east.manta.joyent.com/Joyent_Dev/public/releng/illumos/on-closed-bins-nd.i386.tar.bz2"
ILLUMOS_ADJUNCT_TARBALL_URL="https://us-east.manta.joyent.com/Joyent_Dev/public/releng/adjuncts/illumos-adjunct.20210922.tgz"
ILLUMOS_ADJUNCT_TARBALL_URL="https://us-east.manta.joyent.com/Joyent_Dev/public/releng/adjuncts/illumos-adjunct.20220720.tgz"

65
pkgsrc/onbld/packlist

@ -67,39 +67,38 @@
./lib/i386/libdwarf.so.1
./lib/perl/onbld_elfmod_vertype.pm
./lib/perl/onbld_elfmod.pm
./lib/python
./lib/python2.7/onbld/__init__.py
./lib/python2.7/onbld/__init__.pyc
./lib/python2.7/onbld/Checks/__init__.py
./lib/python2.7/onbld/Checks/__init__.pyc
./lib/python2.7/onbld/Checks/Cddl.py
./lib/python2.7/onbld/Checks/Cddl.pyc
./lib/python2.7/onbld/Checks/CmtBlk.py
./lib/python2.7/onbld/Checks/CmtBlk.pyc
./lib/python2.7/onbld/Checks/Comments.py
./lib/python2.7/onbld/Checks/Comments.pyc
./lib/python2.7/onbld/Checks/Copyright.py
./lib/python2.7/onbld/Checks/Copyright.pyc
./lib/python2.7/onbld/Checks/CStyle.py
./lib/python2.7/onbld/Checks/CStyle.pyc
./lib/python2.7/onbld/Checks/DbLookups.py
./lib/python2.7/onbld/Checks/DbLookups.pyc
./lib/python2.7/onbld/Checks/HdrChk.py
./lib/python2.7/onbld/Checks/HdrChk.pyc
./lib/python2.7/onbld/Checks/JStyle.py
./lib/python2.7/onbld/Checks/JStyle.pyc
./lib/python2.7/onbld/Checks/Keywords.py
./lib/python2.7/onbld/Checks/Keywords.pyc
./lib/python2.7/onbld/Checks/ManLint.py
./lib/python2.7/onbld/Checks/ManLint.pyc
./lib/python2.7/onbld/Checks/Mapfile.py
./lib/python2.7/onbld/Checks/Mapfile.pyc
./lib/python2.7/onbld/Checks/ProcessCheck.py
./lib/python2.7/onbld/Checks/ProcessCheck.pyc
./lib/python2.7/onbld/Scm/__init__.py
./lib/python2.7/onbld/Scm/__init__.pyc
./lib/python2.7/onbld/Scm/Ignore.py
./lib/python2.7/onbld/Scm/Ignore.pyc
./lib/python3.9/onbld/__init__.py
./lib/python3.9/onbld/__pycache__/__init__.cpython-39.pyc
./lib/python3.9/onbld/Checks/__init__.py
./lib/python3.9/onbld/Checks/__pycache__/__init__.cpython-39.pyc
./lib/python3.9/onbld/Checks/Cddl.py
./lib/python3.9/onbld/Checks/__pycache__/Cddl.cpython-39.pyc
./lib/python3.9/onbld/Checks/CmtBlk.py
./lib/python3.9/onbld/Checks/__pycache__/CmtBlk.cpython-39.pyc
./lib/python3.9/onbld/Checks/Comments.py
./lib/python3.9/onbld/Checks/__pycache__/Comments.cpython-39.pyc
./lib/python3.9/onbld/Checks/Copyright.py
./lib/python3.9/onbld/Checks/__pycache__/Copyright.cpython-39.pyc
./lib/python3.9/onbld/Checks/CStyle.py
./lib/python3.9/onbld/Checks/__pycache__/CStyle.cpython-39.pyc
./lib/python3.9/onbld/Checks/DbLookups.py
./lib/python3.9/onbld/Checks/__pycache__/DbLookups.cpython-39.pyc
./lib/python3.9/onbld/Checks/HdrChk.py
./lib/python3.9/onbld/Checks/__pycache__/HdrChk.cpython-39.pyc
./lib/python3.9/onbld/Checks/JStyle.py
./lib/python3.9/onbld/Checks/__pycache__/JStyle.cpython-39.pyc
./lib/python3.9/onbld/Checks/Keywords.py
./lib/python3.9/onbld/Checks/__pycache__/Keywords.cpython-39.pyc
./lib/python3.9/onbld/Checks/ManLint.py
./lib/python3.9/onbld/Checks/__pycache__/ManLint.cpython-39.pyc
./lib/python3.9/onbld/Checks/Mapfile.py
./lib/python3.9/onbld/Checks/__pycache__/Mapfile.cpython-39.pyc
./lib/python3.9/onbld/Checks/ProcessCheck.py
./lib/python3.9/onbld/Checks/__pycache__/ProcessCheck.cpython-39.pyc
./lib/python3.9/onbld/Scm/__init__.py
./lib/python3.9/onbld/Scm/__pycache__/__init__.cpython-39.pyc
./lib/python3.9/onbld/Scm/Ignore.py
./lib/python3.9/onbld/Scm/__pycache__/Ignore.cpython-39.pyc
./man/man1onbld/bldenv.1onbld
./man/man1onbld/bringovercheck.1onbld
./man/man1onbld/cddlchk.1onbld

Loading…
Cancel
Save