Update package list

Author: citrus-it

build/edk2-bhyve/build.sh renamed to build/bhyve-fw/build.sh

@@ -23,9 +23,6 @@ BUILD_DEPENDS_IPS="
     developer/nasm
 "
 
-# XXX
-BUILD_DEPENDS_IPS=
-
 PROG=uefi-edk2
 PKG=system/bhyve/firmware
 VER=20160525
@@ -66,16 +63,26 @@ clone_source(){
 build() {
     pushd $TMPDIR/$BUILDDIR/$PROG >/dev/null || logerr "pushd"
 
-    logmsg "-- Cleaning source tree..."
+    MAKE_ARGS="
+            AS=/usr/bin/gas
+            AR=/usr/bin/gar
+            LD=/usr/bin/gld
+            OBJCOPY=/usr/bin/gobjcopy
+            CC=${OOGCC_BIN}gcc
+            CXX=${OOGCC_BIN}g++
+    "
+
+    logmsg "-- Cleaning source tree"
 
-    logcmd gmake -C BaseTools clean
+    logcmd gmake $MAKE_ARGS -C BaseTools clean
     rm -f Build Conf/{target,build_rule,tools_def}.txt Conf/.cache 2>/dev/null
 
-    logmsg "-- Building tools..."
+    logmsg "-- Building tools"
 
     # First build the tools. The code isn't able to detect the build
     # architecture - it doesn't expect `uname -m` to return `i86pc`
-    logcmd gmake -C BaseTools ARCH=X64 || logerr "BaseTools build failed"
+    logcmd gmake $MAKE_ARGS ARCH=X64 -C BaseTools \
+        || logerr "BaseTools build failed"
 
     BUILD_ARGS="-DDEBUG_ON_SERIAL_PORT=TRUE -DFD_SIZE_2MB -DCSM_ENABLE=TRUE"
 
@@ -86,22 +93,16 @@ build() {
         export NASM_PREFIX=/usr/bin/i386/
         source edksetup.sh
 
-        logmsg "-- Building compatibility support module (CSM)..."
-        logcmd gmake \
-            AS=/usr/bin/gas \
-            AR=/usr/bin/gar \
-            LD=/usr/bin/gld \
-            OBJCOPY=/usr/bin/gobjcopy \
-            CC=${OOGCC_BIN}gcc \
-            CXX=${OOGCC_BIN}g++ \
-            -C BhyvePkg/Csm/BhyveCsm16/
+        logmsg "-- Building compatibility support module (CSM)"
+        logcmd gmake $MAKE_ARGS -C BhyvePkg/Csm/BhyveCsm16/ \
+            || logerr "CSM build failed"
 
         for mode in RELEASE DEBUG; do
-            logmsg "-- Building $mode Firmware..."
+            logmsg "-- Building $mode firmware"
             logcmd `which build` \
                 -t OOGCC -a X64 -b $mode \
                 -p BhyvePkg/BhyvePkgX64.dsc \
-                $BUILD_ARGS
+                $BUILD_ARGS || logerr "$mode build failed"
         done
     ) || logerr "failed"
 
@@ -111,6 +112,7 @@ build() {
 install() {
     pushd $TMPDIR/$BUILDDIR/$PROG >/dev/null || logerr "pushd"
     logcmd mkdir -p $DESTDIR/usr/share/bhyve/firmware
+    cp OvmfPkg/License.txt $DESTDIR/LICENCE
     for mode in RELEASE DEBUG; do
         logcmd cp Build/BhyveX64/${mode}_OOGCC/FV/BHYVE.fd \
             $DESTDIR/usr/share/bhyve/firmware/BHYVE_$mode.fd
@@ -119,9 +121,12 @@ install() {
 }
 
 init
+prep_build
 clone_source
 build
 install
+# Reset version for package creation
+VER=$VERHUMAN
 make_package
 clean_up
 

build/edk2-bhyve/local.mog renamed to build/bhyve-fw/local.mog

@@ -9,7 +9,9 @@
 
 # Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
 
-license LICENSE license=BSD
+license LICENCE license=Intel
+<transform file path=LICENCE -> drop>
 
+<transform file -> set mode 0755>
 link path=usr/share/bhyve/firmware/BHYVE.fd target=BHYVE_RELEASE.fd
 

build/nasm/local.mog

@@ -9,5 +9,5 @@
 
 # Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
 
-license LICENCE license=BSD
+license LICENSE license=BSD
 

doc/packages.md

@@ -10,6 +10,7 @@
 | compress/zip				| 3.0			| http://www.info-zip.org/Zip.html
 | data/iso-codes			| 3.77			| http://pkg-isocodes.alioth.debian.org/downloads/
 | database/sqlite-3			| 3210000		| https://www.sqlite.org/download.html
+| developer/acpi/compiler		| 20171110		| https://www.acpica.org/downloads/
 | developer/bmake			| 20171126		| http://www.crufty.net/ftp/pub/sjg/
 | developer/build/autoconf		| 2.69			| https://git.savannah.gnu.org/cgit/autoconf.git/refs/tags
 | developer/build/automake		| 1.15.1		| https://git.savannah.gnu.org/cgit/automake.git/refs/tags
@@ -21,6 +22,7 @@
 | developer/java/jdk			| 1.7.0_151-b01		| http://hg.openjdk.java.net/jdk7u/jdk7u/tags
 | developer/lexer/flex			| 2.6.4			| https://github.com/westes/flex/releases
 | developer/macro/gnu-m4		| 1.4.18		| http://git.savannah.gnu.org/cgit/m4.git/refs/tags
+| developer/nasm			| 2.13.02		| http://www.nasm.us/pub/nasm/releasebuilds
 | developer/parser/bison		| 3.0.4			| https://git.savannah.gnu.org/cgit/bison.git/refs/tags
 | developer/pkg-config			| 0.29.2		| https://pkg-config.freedesktop.org/releases
 | developer/versioning/git		| 2.15.1		| https://www.kernel.org/pub/software/scm/git