kayak Cdiff ./build

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


*** 1,31 ****
  #!/bin/bash
  #
! # CDDL HEADER START
  #
! # The contents of this file are subject to the terms of the
! # Common Development and Distribution License, Version 1.0 only
! # (the "License").  You may not use this file except in compliance
! # with the License.
  #
! # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
! # or http://www.opensolaris.org/os/licensing.
! # See the License for the specific language governing permissions
! # and limitations under the License.
  #
! # When distributing Covered Code, include this CDDL HEADER in each
! # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
! # If applicable, add the following below this CDDL HEADER, with the
! # fields enclosed by brackets "[]" replaced with your own identifying
! # information: Portions Copyright [yyyy] [name of copyright owner]
  #
! # CDDL HEADER END
! #
! #
! # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
! # Use is subject to license terms.
! #
  fail() {
          echo "ERROR: $*"
          exit 1
  }
  
--- 1,22 ----
  #!/bin/bash
+ 
  #
! # This file and its contents are supplied under the terms of the
! # Common Development and Distribution License ("CDDL"), version 1.0.
! # You may only use this file in accordance with the terms of version
! # 1.0 of the CDDL.
  #
! # A full copy of the text of the CDDL should have accompanied this
! # source.  A copy of the CDDL is also available via the Internet at
! # http://www.illumos.org/license/CDDL.
  #
! 
  #
! # Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
  #
! 
  fail() {
          echo "ERROR: $*"
          exit 1
  }
  
*** 54,64 ****
  if [[ ! -d $ROOTDIR ]]; then
    zfs create -o compression=off $BASE/root || fail "zfs create failed"
  fi
  SVCCFG_DTD=${ROOTDIR}/usr/share/lib/xml/dtd/service_bundle.dtd.1
  SVCCFG_REPOSITORY=${ROOTDIR}/etc/svc/repository.db
- #SVCCFG=/usr/sbin/svccfg
  if [[ -f ${PREBUILT_ILLUMOS}/usr/src/cmd/svc/svccfg/svccfg-native ]]; then
          SVCCFG=${PREBUILT_ILLUMOS}/usr/src/cmd/svc/svccfg/svccfg-native
  else
          echo "WARNING -- Not using 'native' svccfg, may hang on build."
          echo "       We recommend a pre-built illumos's svccfg-native."
--- 45,54 ----
*** 116,126 ****
          system/hostid.xml system/power.xml system/pfexecd.xml
          system/consadm.xml system/pools.xml system/console-login.xml
          system/stmf.xml system/fmd.xml system/utmp.xml
          system/poold.xml system/dumpadm.xml"
  
! SYSTEM="system/boot/grub system/boot/real-mode system/boot/wanboot/internal
          system/boot/loader system/boot/wanboot system/data/hardware-registry
          system/data/keyboard/keytables system/data/terminfo
          system/data/zoneinfo system/extended-system-utilities
          system/file-system/autofs system/file-system/nfs
          system/file-system/smb system/file-system/udfs
--- 106,116 ----
          system/hostid.xml system/power.xml system/pfexecd.xml
          system/consadm.xml system/pools.xml system/console-login.xml
          system/stmf.xml system/fmd.xml system/utmp.xml
          system/poold.xml system/dumpadm.xml"
  
! SYSTEM="system/boot/real-mode system/boot/wanboot/internal
          system/boot/loader system/boot/wanboot system/data/hardware-registry
          system/data/keyboard/keytables system/data/terminfo
          system/data/zoneinfo system/extended-system-utilities
          system/file-system/autofs system/file-system/nfs
          system/file-system/smb system/file-system/udfs
*** 162,188 ****
          driver/network/ofk driver/network/pcn driver/network/platform
          driver/network/qlc driver/network/rds driver/network/rdsv3
          driver/network/rge driver/network/rpcib driver/network/rtls
          driver/network/sdp driver/network/sdpib driver/network/sfe
          driver/network/tavor driver/network/usbecm driver/network/vr
!         driver/network/xge driver/network/yge driver/pcmcia driver/serial/pcser
          driver/serial/usbftdi driver/serial/usbsacm driver/serial/usbser
          driver/serial/usbser_edge driver/serial/usbsksp
          driver/serial/usbsksp/usbs49_fw driver/serial/usbsprl
          driver/storage/aac driver/storage/adpu320 driver/storage/ahci
          driver/storage/amr driver/storage/arcmsr driver/storage/ata
          driver/storage/bcm_sata driver/storage/blkdev driver/storage/cpqary3
          driver/storage/glm driver/storage/lsimega driver/storage/marvell88sx
          driver/storage/mega_sas driver/storage/mpt_sas driver/storage/mr_sas
!         driver/storage/nv_sata driver/storage/pcata driver/storage/pmcs
          driver/storage/sbp2 driver/storage/scsa1394 driver/storage/sdcard
          driver/storage/ses driver/storage/si3124 driver/storage/smp
          driver/usb driver/usb/ugen driver/xvm/pv driver/storage/vioblk
          driver/network/vioif driver/storage/nvme driver/storage/pvscsi"
  
  PARTS="release/name release/notices service/picl install/beadm SUNWcs SUNWcsd
!         library/libidn shell/pipe-viewer text/less editor/vim
          developer/linker file/gnu-coreutils openssh openssh-server
          diagnostic/diskinfo"
  
  PKGS="$PARTS $SYSTEM $DRIVERS"
  
--- 152,178 ----
          driver/network/ofk driver/network/pcn driver/network/platform
          driver/network/qlc driver/network/rds driver/network/rdsv3
          driver/network/rge driver/network/rpcib driver/network/rtls
          driver/network/sdp driver/network/sdpib driver/network/sfe
          driver/network/tavor driver/network/usbecm driver/network/vr
!         driver/network/xge driver/network/yge driver/pcmcia
          driver/serial/usbftdi driver/serial/usbsacm driver/serial/usbser
          driver/serial/usbser_edge driver/serial/usbsksp
          driver/serial/usbsksp/usbs49_fw driver/serial/usbsprl
          driver/storage/aac driver/storage/adpu320 driver/storage/ahci
          driver/storage/amr driver/storage/arcmsr driver/storage/ata
          driver/storage/bcm_sata driver/storage/blkdev driver/storage/cpqary3
          driver/storage/glm driver/storage/lsimega driver/storage/marvell88sx
          driver/storage/mega_sas driver/storage/mpt_sas driver/storage/mr_sas
!         driver/storage/nv_sata driver/storage/pmcs
          driver/storage/sbp2 driver/storage/scsa1394 driver/storage/sdcard
          driver/storage/ses driver/storage/si3124 driver/storage/smp
          driver/usb driver/usb/ugen driver/xvm/pv driver/storage/vioblk
          driver/network/vioif driver/storage/nvme driver/storage/pvscsi"
  
  PARTS="release/name release/notices service/picl install/beadm SUNWcs SUNWcsd
!         library/libidn shell/pipe-viewer text/less editor/vim web/curl
          developer/linker file/gnu-coreutils openssh openssh-server
          diagnostic/diskinfo"
  
  PKGS="$PARTS $SYSTEM $DRIVERS"
  
*** 348,357 ****
--- 338,352 ----
          /usr/sbin/devfsadm -r $WORKDIR/mnt > /dev/null
          popd >/dev/null
          mkdir $WORKDIR/mnt/kayak
          cp $SRCDIR/*.sh $WORKDIR/mnt/kayak/
          chmod a+x $WORKDIR/mnt/kayak/*.sh
+ 
+         # So "bootadm update-archive" can work.
+         cp $SRCDIR/digest $WORKDIR/mnt/usr/bin/digest
+         chmod 0755 $WORKDIR/mnt/usr/bin/digest
+ 
          make_initial_boot $WORKDIR/mnt/.initialboot
          if [[ -n "$DEBUG" ]]; then
                  cp $SRCDIR/anon.system $WORKDIR/mnt/etc/system
                  cp $SRCDIR/anon.dtrace.conf $WORKDIR/mnt/kernel/drv/dtrace.conf
          fi