Print this page
Modernize CDDL license text and copyrights for OmniTI-original code.
Add pxeboot/BSD Loader as an option for PXE Kayak boots.
Fix PXE regressions.
Add web/curl explicitly, because removing svm broke a long
dependency string that included web/curl.
Remove pcser and pcata, which no longer exist
Kayak for ISO checkpoint 1

Split Close
Expand all
Collapse all
          --- old/build_image.sh
          +++ new/build_image.sh
   1    1  #!/bin/bash
        2 +
   2    3  #
   3      -# CDDL HEADER START
        4 +# This file and its contents are supplied under the terms of the
        5 +# Common Development and Distribution License ("CDDL"), version 1.0.
        6 +# You may only use this file in accordance with the terms of version
        7 +# 1.0 of the CDDL.
   4    8  #
   5      -# The contents of this file are subject to the terms of the
   6      -# Common Development and Distribution License, Version 1.0 only
   7      -# (the "License").  You may not use this file except in compliance
   8      -# with the License.
        9 +# A full copy of the text of the CDDL should have accompanied this
       10 +# source.  A copy of the CDDL is also available via the Internet at
       11 +# http://www.illumos.org/license/CDDL.
   9   12  #
  10      -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  11      -# or http://www.opensolaris.org/os/licensing.
  12      -# See the License for the specific language governing permissions
  13      -# and limitations under the License.
       13 +
  14   14  #
  15      -# When distributing Covered Code, include this CDDL HEADER in each
  16      -# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  17      -# If applicable, add the following below this CDDL HEADER, with the
  18      -# fields enclosed by brackets "[]" replaced with your own identifying
  19      -# information: Portions Copyright [yyyy] [name of copyright owner]
       15 +# Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
  20   16  #
  21      -# CDDL HEADER END
  22      -#
  23      -#
  24      -# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  25      -# Use is subject to license terms.
  26      -#
       17 +
  27   18  fail() {
  28   19          echo "ERROR: $*"
  29   20          exit 1
  30   21  }
  31   22  
  32   23  # NOTE --> The URL needs to be updated with every release.
  33   24  # Change "bloody" to whatever release the current branch is.
  34   25  PUBLISHER=omnios
  35   26  : ${PKGURL:=http://pkg.omniti.com/omnios/bloody}
  36   27  : ${GZIP_CMD:=gzip}
↓ open down ↓ 12 lines elided ↑ open up ↑
  49   40    BASEDIR=`zfs get -o value -H mountpoint $BASE`
  50   41  fi
  51   42  MKFILEDIR=/tmp
  52   43  WORKDIR=$BASEDIR
  53   44  ROOTDIR=$WORKDIR/root
  54   45  if [[ ! -d $ROOTDIR ]]; then
  55   46    zfs create -o compression=off $BASE/root || fail "zfs create failed"
  56   47  fi
  57   48  SVCCFG_DTD=${ROOTDIR}/usr/share/lib/xml/dtd/service_bundle.dtd.1
  58   49  SVCCFG_REPOSITORY=${ROOTDIR}/etc/svc/repository.db
  59      -#SVCCFG=/usr/sbin/svccfg
  60   50  if [[ -f ${PREBUILT_ILLUMOS}/usr/src/cmd/svc/svccfg/svccfg-native ]]; then
  61   51          SVCCFG=${PREBUILT_ILLUMOS}/usr/src/cmd/svc/svccfg/svccfg-native
  62   52  else
  63   53          echo "WARNING -- Not using 'native' svccfg, may hang on build."
  64   54          echo "       We recommend a pre-built illumos's svccfg-native."
  65   55          echo "       Set PREBUILT_ILLUMOS in your environment to point"
  66   56          echo "       to a built illumos-omnios repository."
  67   57          SVCCFG=/usr/sbin/svccfg
  68   58  fi
  69   59  export WORKDIR ROOTDIR SVCCFG_DTD SVCCFG_REPOSITORY SVCCFG
↓ open down ↓ 41 lines elided ↑ open up ↑
 111  101          network/network-netmask.xml network/dlmgmt.xml
 112  102          network/network-location.xml network/ibd-post-upgrade.xml
 113  103          network/network-routing-setup.xml network/network-loopback.xml
 114  104          network/dns/client.xml network/dns/install.xml
 115  105          network/dns/multicast.xml platform/i86pc/acpihpd.xml
 116  106          system/hostid.xml system/power.xml system/pfexecd.xml
 117  107          system/consadm.xml system/pools.xml system/console-login.xml
 118  108          system/stmf.xml system/fmd.xml system/utmp.xml
 119  109          system/poold.xml system/dumpadm.xml"
 120  110  
 121      -SYSTEM="system/boot/grub system/boot/real-mode system/boot/wanboot/internal
      111 +SYSTEM="system/boot/real-mode system/boot/wanboot/internal
 122  112          system/boot/loader system/boot/wanboot system/data/hardware-registry
 123  113          system/data/keyboard/keytables system/data/terminfo
 124  114          system/data/zoneinfo system/extended-system-utilities
 125  115          system/file-system/autofs system/file-system/nfs
 126  116          system/file-system/smb system/file-system/udfs
 127  117          system/file-system/zfs system/flash/fwflash
 128  118          system/fru-id/platform system/fru-id system/ipc
 129  119          system/kernel/dynamic-reconfiguration/i86pc
 130  120          system/kernel/security/gss system/library/math
 131  121          system/library/platform system/library/policykit
↓ open down ↓ 25 lines elided ↑ open up ↑
 157  147          driver/network/ib driver/network/ibdma driver/network/ibp
 158  148          driver/network/igb driver/network/iprb driver/network/ixgb
 159  149          driver/network/ixgbe driver/network/mxfe driver/network/myri10ge
 160  150          driver/network/nge driver/network/ntxn driver/network/nxge
 161  151          driver/network/vmxnet3s driver/network/sfxge driver/network/i40e
 162  152          driver/network/ofk driver/network/pcn driver/network/platform
 163  153          driver/network/qlc driver/network/rds driver/network/rdsv3
 164  154          driver/network/rge driver/network/rpcib driver/network/rtls
 165  155          driver/network/sdp driver/network/sdpib driver/network/sfe
 166  156          driver/network/tavor driver/network/usbecm driver/network/vr
 167      -        driver/network/xge driver/network/yge driver/pcmcia driver/serial/pcser
      157 +        driver/network/xge driver/network/yge driver/pcmcia
 168  158          driver/serial/usbftdi driver/serial/usbsacm driver/serial/usbser
 169  159          driver/serial/usbser_edge driver/serial/usbsksp
 170  160          driver/serial/usbsksp/usbs49_fw driver/serial/usbsprl
 171  161          driver/storage/aac driver/storage/adpu320 driver/storage/ahci
 172  162          driver/storage/amr driver/storage/arcmsr driver/storage/ata
 173  163          driver/storage/bcm_sata driver/storage/blkdev driver/storage/cpqary3
 174  164          driver/storage/glm driver/storage/lsimega driver/storage/marvell88sx
 175  165          driver/storage/mega_sas driver/storage/mpt_sas driver/storage/mr_sas
 176      -        driver/storage/nv_sata driver/storage/pcata driver/storage/pmcs
      166 +        driver/storage/nv_sata driver/storage/pmcs
 177  167          driver/storage/sbp2 driver/storage/scsa1394 driver/storage/sdcard
 178  168          driver/storage/ses driver/storage/si3124 driver/storage/smp
 179  169          driver/usb driver/usb/ugen driver/xvm/pv driver/storage/vioblk
 180  170          driver/network/vioif driver/storage/nvme driver/storage/pvscsi"
 181  171  
 182  172  PARTS="release/name release/notices service/picl install/beadm SUNWcs SUNWcsd
 183      -        library/libidn shell/pipe-viewer text/less editor/vim
      173 +        library/libidn shell/pipe-viewer text/less editor/vim web/curl
 184  174          developer/linker file/gnu-coreutils openssh openssh-server
 185  175          diagnostic/diskinfo"
 186  176  
 187  177  PKGS="$PARTS $SYSTEM $DRIVERS"
 188  178  
 189  179  if [ -n "$DEBUG" ]; then
 190  180          PKGS="$PKGS $DEBUG_PKGS"
 191  181          BIGROOT=1
 192  182  fi
 193  183  CULL="perl python package/pkg snmp"
↓ open down ↓ 149 lines elided ↑ open up ↑
 343  333          ;;
 344  334  
 345  335          "copy")
 346  336          pushd $ROOTDIR >/dev/null
 347  337          /usr/bin/find . | /usr/bin/cpio -pdum $WORKDIR/mnt 2> /dev/null > /dev/null || fail "populate root"
 348  338          /usr/sbin/devfsadm -r $WORKDIR/mnt > /dev/null
 349  339          popd >/dev/null
 350  340          mkdir $WORKDIR/mnt/kayak
 351  341          cp $SRCDIR/*.sh $WORKDIR/mnt/kayak/
 352  342          chmod a+x $WORKDIR/mnt/kayak/*.sh
      343 +
      344 +        # So "bootadm update-archive" can work.
      345 +        cp $SRCDIR/digest $WORKDIR/mnt/usr/bin/digest
      346 +        chmod 0755 $WORKDIR/mnt/usr/bin/digest
      347 +
 353  348          make_initial_boot $WORKDIR/mnt/.initialboot
 354  349          if [[ -n "$DEBUG" ]]; then
 355  350                  cp $SRCDIR/anon.system $WORKDIR/mnt/etc/system
 356  351                  cp $SRCDIR/anon.dtrace.conf $WORKDIR/mnt/kernel/drv/dtrace.conf
 357  352          fi
 358  353          chkpt umount
 359  354          ;;
 360  355  
 361  356          "umount")
 362  357          /usr/sbin/umount $WORKDIR/mnt || fail "umount"
↓ open down ↓ 26 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX