Utilities: Drop OpenDuetPkg binary and rebuild it with OC

.travis.yml

@@ -17,8 +17,8 @@ matrix:
 
     script:
     - HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl mingw-w64
-    - "./build_oc.tool"
     - "./build_duet.tool"
+    - "./build_oc.tool"
 
     deploy:
       provider: releases
@@ -51,8 +51,8 @@ matrix:
     - if [ "$sum" != "$expsum" ]; then echo "Invalid checksum $sum" ; exit 1 ; fi
     - tar -xf "${file}${suf}" || exit 1
     - export PATH="$(pwd)/${file}/bin:$PATH"
-    - "./build_oc.tool"
     - "./build_duet.tool"
+    - "./build_oc.tool"
 
   - os: linux
     name: "Build Linux CLANG38"
@@ -70,8 +70,8 @@ matrix:
     - sudo apt-get remove -y llvm-3.8 libllvm3.8 # Move LLVM 3.8 out of the way.
     - export PATH="/usr/lib/llvm-8/bin:$PATH" # Default compiler (7.0 or 3.8) has no LTO plugin.
     - export TOOLCHAINS=CLANG38
-    - "./build_oc.tool"
     - "./build_duet.tool"
+    - "./build_oc.tool"
     # Currently this is too ugly, but maybe we can use that in the future.
     - sudo apt-get install -y doxygen texlive texlive-latex-extra
     - abort() { tail -200 log.txt ; exit 1 ; }
@@ -86,8 +86,8 @@ matrix:
     - HAS_OPENSSL_BUILD=0
     - choco install python
     - choco install microsoft-build-tools visualcpp-build-tools make nasm zip
-    - "./build_oc.tool"
     - "./build_duet.tool"
+    - "./build_oc.tool"
 
   - os: osx
     name: "Analyze Scripts"

Changelog.md

@@ -32,6 +32,7 @@ OpenCore Changelog
 - Updated builtin firmware versions for SMBIOS and the rest
 - Fixed OSXSAVE reporting when emulating CPUID on newer CPUs
 - Added `SerialInit` option to perform serial initialisation separately
+- Fixed OpenDuetPkg booting on Intel G33 with SATA controller in RAID mode
 
 #### v0.5.9
 - Added full HiDPI support in OpenCanopy

Utilities/LegacyBoot/BootInstall.command

@@ -2,7 +2,14 @@
 
 # Install booter on physical disk.
 
-cd "$(dirname "$0")" || exit
+cd "$(dirname "$0")" || exit 1
+
+if [ ! -f boot ] || [ ! -f boot0 ] || [ ! -f boot1f32 ]; then
+  echo "Boot files are missing from this package!"
+  echo "You probably forgot to build DuetPkg first."
+  exit 1
+fi
+
 diskutil list
 echo "Enter disk number to install to:"
 read -r N
@@ -10,7 +17,7 @@ read -r N
 if [[ ! $(diskutil info disk"${N}" |  sed -n 's/.*Device Node: *//p') ]]
 then
   echo Disk "$N" not found
-  exit
+  exit 1
 fi
 
 FS=$(diskutil info disk"${N}"s1 | sed -n 's/.*File System Personality: *//p')
@@ -19,7 +26,7 @@ echo "$FS"
 if [ "$FS" != "MS-DOS FAT32" ]
 then
   echo "No FAT32 partition to install"
-  exit
+  exit 1
 fi
 
 # Write MBR

Utilities/LegacyBoot/QemuBuild.command

@@ -4,7 +4,13 @@
 # qemu-system-x86_64 -drive file=$QEMU_IMAGE/OpenCore.RO.raw -serial stdio \
 #   -usb -device usb-kbd -device usb-mouse -s -m 8192
 
-cd "$(dirname "$0")" || exit
+cd "$(dirname "$0")" || exit 1
+
+if [ ! -f boot ] || [ ! -f boot0 ] || [ ! -f boot1f32 ]; then
+  echo "Boot files are missing from this package!"
+  echo "You probably forgot to build DuetPkg first."
+  exit 1
+fi
 
 if [ "$(which qemu-img)" = "" ]; then
   echo "QEMU installation missing"
@@ -32,7 +38,7 @@ echo "Will be installed to Disk ${N}"
 if [[ ! $(diskutil info disk"${N}" |  sed -n 's/.*Device Node: *//p') ]]
 then
   echo Disk "$N" not found
-  exit
+  exit 1
 fi
 
 FS=$(diskutil info disk"${N}"s1 | sed -n 's/.*File System Personality: *//p')
@@ -41,7 +47,7 @@ echo "$FS"
 if [ "$FS" != "MS-DOS FAT32" ]
 then
   echo "No FAT32 partition to install"
-  exit
+  exit 1
 fi
 
 # Write MBR

build_oc.tool

@@ -22,11 +22,14 @@ buildutil() {
     UTILS+=("RsaTool")
   fi
 
+  local cores
+  cores=$(getconf _NPROCESSORS_ONLN)
+
   pushd "${selfdir}/Utilities" || exit 1
   for util in "${UTILS[@]}"; do
     cd "$util" || exit 1
     echo "Building ${util}..."
-    make || exit 1
+    make -j $cores || exit 1
     #
     # FIXME: Do not build RsaTool for Win32 without OpenSSL.
     #
@@ -37,7 +40,7 @@ buildutil() {
     if [ "$(which i686-w64-mingw32-gcc)" != "" ]; then
       echo "Building ${util} for Windows..."
       UDK_ARCH=Ia32 CC=i686-w64-mingw32-gcc STRIP=i686-w64-mingw32-strip DIST=Windows make clean || exit 1
-      UDK_ARCH=Ia32 CC=i686-w64-mingw32-gcc STRIP=i686-w64-mingw32-strip DIST=Windows make || exit 1
+      UDK_ARCH=Ia32 CC=i686-w64-mingw32-gcc STRIP=i686-w64-mingw32-strip DIST=Windows make -j $cores || exit 1
     fi
     cd - || exit 1
   done
@@ -46,7 +49,7 @@ buildutil() {
 
 package() {
   if [ ! -d "$1" ]; then
-    echo "Missing package directory"
+    echo "Missing package directory $1"
     exit 1
   fi
 
@@ -154,6 +157,21 @@ package() {
     cp -r "${selfdir}/Utilities/${utilScpt}" tmp/Utilities/ || exit 1
   done
 
+  # Copy OpenDuetPkg booter.
+  local arch
+  local tgt
+  local booter
+  arch="$(basename $(pwd))"
+  tgt="$(basename $(dirname $(pwd)))"
+  booter="$(pwd)/../../../OpenDuetPkg/${tgt}/${arch}/boot"
+
+  if [ -f "${booter}" ]; then
+    echo "Copying OpenDuetPkg boot file from ${booter}..."
+    cp "${booter}" tmp/Utilities/LegacyBoot/boot || exit 1
+  else
+    echo "Failed to find OpenDuetPkg at ${booter}!"
+  fi
+
   buildutil || exit 1
   utils=(
     "macserial"