From 171e068a2c5f91e1a2c9eee347db0e1b3ec3d81d Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Mon, 29 Jan 2018 10:11:16 +0200 Subject: [PATCH] Cleanup and documentation updates. --- .scripts/build.sh | 30 +---------------------- .travis.yml | 56 ------------------------------------------- BuildCloverConfig.txt | 5 ++-- LICENSE.md | 2 +- README.md | 10 ++++---- 5 files changed, 11 insertions(+), 92 deletions(-) delete mode 100644 .travis.yml diff --git a/.scripts/build.sh b/.scripts/build.sh index e6b406f..1686ac5 100755 --- a/.scripts/build.sh +++ b/.scripts/build.sh @@ -15,33 +15,6 @@ CREDITS_ORIGINAL="Chameleon team, crazybirdy, JrCs." CREDITS_MODIFIED="Chameleon team, crazybirdy, JrCs, Dids." sed -i '' -e "s/.*${CREDITS_ORIGINAL}.*/${CREDITS_MODIFIED}/" "${HOME}/src/edk2/Clover/CloverPackage/CREDITS" -## TODO: This step can be removed if/when Build_Clover -## or Clover itself gets official AptioFix support - -# Build and install the AptioFix (U)EFI drivers by vit9696 -# (thanks to fusion71au from InsanelyMac for the build steps) -cd "${HOME}/src/edk2" -rm -fr \ - AptioFixPkg \ - CupertinoModulePkg \ - EfiMiscPkg \ - EfiPkg \ - 2> /dev/null -git clone https://github.com/vit9696/AptioFixPkg.git -git clone https://github.com/CupertinoNet/CupertinoModulePkg -git clone https://github.com/CupertinoNet/EfiMiscPkg -git clone https://github.com/CupertinoNet/EfiPkg -export NASM_PREFIX="${HOME}/src/opt/local/bin/" -source edksetup.sh -make -C BaseTools -touch edk2.ready -## NOTE: Be sure that the toolchain matches with Clover (XCODE8 in this case) -build -a X64 -b RELEASE -t XCODE8 -p AptioFixPkg/AptioFixPkg.dsc - -# Install the AptioFix (U)EFI drivers -cd "${HOME}/src/edk2/Clover/CloverPackage/CloverV2/drivers-Off" -cp -f ${HOME}/src/edk2/Build/AptioFixPkg/RELEASE_XCODE8/X64/*.efi drivers64UEFI/ - # Create patched APFS EFI drivers cd "${HOME}/src/edk2/Clover/CloverPackage/CloverV2/drivers-Off" cp -f drivers64/apfs-64.efi drivers64/apfs_patched-64.efi @@ -57,12 +30,11 @@ echo '"Fat-64_description" = "Adds support for exFAT (FAT64) partitions.";' >> L echo '"NTFS_description" = "Adds support for NTFS partitions.";' >> Localizable.strings echo '"apfs_description" = "Adds support for APFS partitions.";' >> Localizable.strings echo '"apfs_patched_description" = "Adds support for APFS partitions.\nPatched version which removes verbose logging on startup.\n\nWARNING: Do NOT enable multiple apfs.efi drivers!";' >> Localizable.strings -echo '"AptioMemoryFix_description" = "Fork of the original OsxAptioFix2 driver with a cleaner (yet still terrible) codebase and improved stability and functionality.\n\nWARNING: Do NOT use in combination with older AptioFix drivers.\nThis is an experimental driver by vit9696 (https://github.com/vit9696/AptioFixPkg).";' >> Localizable.strings +#echo '"AptioMemoryFix_description" = "Fork of the original OsxAptioFix2 driver with a cleaner (yet still terrible) codebase and improved stability and functionality.\n\nWARNING: Do NOT use in combination with older AptioFix drivers.\nThis is an experimental driver by vit9696 (https://github.com/vit9696/AptioFixPkg).";' >> Localizable.strings echo '"AptioInputFix_description" = "Reference driver to shim AMI APTIO proprietary mouse & keyboard protocols for File Vault 2 GUI input support.\n\nWARNING: Do NOT use in combination with older AptioFix drivers.\nThis is an experimental driver by vit9696 (https://github.com/vit9696/AptioFixPkg).";' >> Localizable.strings echo '"OsxAptioFix3Drv-64_description" = "64bit driver to fix Memory problems on UEFI firmware such as AMI Aptio.";' >> Localizable.strings echo '"OsxFatBinaryDrv-64_description" = "Enables starting of FAT modules like boot.efi.";' >> Localizable.strings - # Recreate the package cd "${HOME}/src/edk2/Clover/CloverPackage" make pkg diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ebaf12b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -# Build on macOS with Xcode 9.1 -os: osx -osx_image: xcode9.1 - -## NOTE: Caching is disabled for now, to avoid build issues with edk2 updates etc. -# Configure caching -#before_cache: -# - cp -f $HOME/src/edk2/Clover/CloverPackage/sym/Clover_*.* $TRAVIS_BUILD_DIR/ -# - rm -rf $TRAVIS_BUILD_DIR/*.zip -# - rm -rf $HOME/src/edk2/Build -# - rm -rf $HOME/src/edk2/Clover/CloverPackage/sym -# - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverPrefpane/build -# - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverUpdater/build -#cache: -# timeout: 300000 # 5 minutes -# directories: -# - $HOME/src - -# Install dependencies -install: - ## TODO: Switch back to master one the non-interactive features are in - ## NOTE: Be sure to also update BuildCloverConfig.txt to use the master branch - - wget "https://github.com/Micky1979/Build_Clover/raw/master/Build_Clover.command" - - chmod +x Build_Clover.command - - cp -f "${TRAVIS_BUILD_DIR}/BuildCloverConfig.txt" "${HOME}/BuildCloverConfig.txt" - - sed -i -e "s/.*SUGGESTED_CLOVER_REV.*/SUGGESTED_CLOVER_REV=${CLOVER_REVISION}/" "${HOME}/BuildCloverConfig.txt" - -# Build everything -script: - - .scripts/build.sh - - cp -f $HOME/src/edk2/Clover/CloverPackage/sym/Clover_*.* $TRAVIS_BUILD_DIR/ - -# Prepare the deployment -after_success: - - source .scripts/deploy.sh - -# Deploy to GitHub Releases -deploy: - provider: releases - api_key: $GITHUB_OAUTH_TOKEN - file_glob: true - file: $TRAVIS_BUILD_DIR/Clover_*.* - skip_cleanup: true - name: "${GIT_TAG}" - body: "${CLOVER_COMMIT_MSG} - ${CLOVER_COMMIT_AUTHOR}" - on: - tags: false - branch: master - condition: "$CLOVER_DEPLOY = true" - repo: Dids/clover-builder - -# Only build on specific branches -branches: - only: - - master - - development diff --git a/BuildCloverConfig.txt b/BuildCloverConfig.txt index 4dcf544..0d98ae5 100644 --- a/BuildCloverConfig.txt +++ b/BuildCloverConfig.txt @@ -17,7 +17,8 @@ DISABLE_CLEAR=YES MY_SCRIPT= FAST_UPDATE=NO INTERACTIVE=NO -ForceEDK2Update=0 +ForceEDK2Update=1 ARCH=X64 FORCEREBUILD=-fr -SHOWCCP_ADVERTISE=YES +SHOWCCP_ADVERTISE=NO +SVN_UPDATE_ACCEPT_ARG=tf diff --git a/LICENSE.md b/LICENSE.md index a3c8cdb..86dba96 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2017 Pauli 'Dids' Jokela +Copyright (c) 2017-2018 Pauli 'Dids' Jokela Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation diff --git a/README.md b/README.md index e0d3177..73878dc 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,19 @@ # Automated Clover Builds -[![Build Status](https://travis-ci.org/Dids/clover-builder.svg?branch=master)](https://travis-ci.org/Dids/clover-builder) +[![Build Status](https://www.bitrise.io/app/d99a8cc679de9944/status.svg?token=4iYU6RsLSXBRMno3j3GnJg&branch=master)](https://www.bitrise.io/app/d99a8cc679de9944) A simple project that automatically builds [Clover](https://clover-wiki.zetam.org) as a daily build. +Note that these builds includes the [AptioFixPkg](https://github.com/vit9696/AptioFixPkg) (`AptioMemoryFix` and `AptioInputFix`) by [vit9696](https://github.com/vit9696). + **DISCLAIMER:** Since this is a 3rd party build, anything could go wrong, so proceed with caution. That said, it should be fine. -# Releases +## Releases Releases are available [here](https://github.com/Dids/clover-builder/releases). -# License +## License See [LICENSE.md](LICENSE.md). -A big thank you to [Micky1979](https://github.com/Micky1979) for creating [Build_Clover](https://github.com/Micky1979/Build_Clover), as well as everyone else involved. +A big thank you to [Micky1979](https://github.com/Micky1979) for creating [Build_Clover](https://github.com/Micky1979/Build_Clover), as well as everyone else involved (Clover developers and contributors included!).