From 1ec5de9534c50dde57aca9715ee8668273d13c39 Mon Sep 17 00:00:00 2001 From: vectorsigma Date: Thu, 5 Sep 2019 13:30:12 +0200 Subject: [PATCH] Make Clover compilable in UNIX Systems using git ebuild.sh/buildme update --- BaseTools/Source/Python/build/BuildReport.pyc | Bin 58334 -> 58789 bytes CloverPackage/CloverPrefpane/install.sh | 0 .../CloverPrefpane/translate_source.sh | 0 CloverPackage/CloverPrefpane/translate_xib.sh | 0 .../CloverUpdater/CloverUpdaterUtility | 0 .../CloverUpdater/CloverUpdaterUtility.plist | 0 .../CloverUpdater/install-updater.sh | 0 CloverPackage/CloverUpdater/translate_xib.sh | 0 CloverPackage/makeiso | 0 CloverPackage/makepkg | 9 +- .../package/Scripts.libraries/rc_scripts.lib | 0 .../Scripts.templates/AltBoot/postinstall | 0 .../AppleUiSupport/postinstall | 0 .../Scripts.templates/CloverEFI/postinstall | 0 .../CloverThemeManager/preinstall | 0 .../Scripts.templates/EFIFolder/MountESP | 0 .../Scripts.templates/EFIFolder/postinstall | 0 .../Scripts.templates/EFIFolder/preinstall | 0 .../Scripts.templates/FileSystem/postinstall | 0 .../InstallBootsectors/postinstall | 0 .../Scripts.templates/InstallTheme/preinstall | 0 .../Scripts.templates/MarkChoice/preinstall | 0 .../Scripts.templates/MemoryFix/postinstall | 0 .../OptRcScripts/postinstall | 0 .../Scripts.templates/Post/postinstall | 0 .../package/Scripts.templates/Pre/preinstall | 0 .../Scripts.templates/RcScripts/postinstall | 0 .../Scripts.templates/VirtualSMC/postinstall | 0 .../Scripts.templates/bootNo/postinstall | 0 .../package/Scripts.templates/off/postinstall | 0 CloverPackage/package/bin/clean_po_headers.sh | 0 CloverPackage/package/bin/po4a/po4a | 0 .../package/bin/po4a/po4a-gettextize | 0 CloverPackage/package/bin/po4a/po4a-normalize | 0 CloverPackage/package/bin/po4a/po4a-translate | 0 CloverPackage/package/bin/po4a/po4a-updatepo | 0 CloverPackage/package/buildpkg.sh | 0 CloverPackage/package/translate.sh | 2 +- CloverPackage/revision | 1 + CloverPackage/version | 1 + Conf/.cache/.PlatformBuild | 4 +- Conf/BuildEnv.sh | 12 +- buildme | 109 ++++-------------- ebuild.sh | 19 +-- vers.txt | 2 +- 45 files changed, 45 insertions(+), 114 deletions(-) mode change 100644 => 100755 CloverPackage/CloverPrefpane/install.sh mode change 100644 => 100755 CloverPackage/CloverPrefpane/translate_source.sh mode change 100644 => 100755 CloverPackage/CloverPrefpane/translate_xib.sh mode change 100644 => 100755 CloverPackage/CloverUpdater/CloverUpdaterUtility mode change 100644 => 100755 CloverPackage/CloverUpdater/CloverUpdaterUtility.plist mode change 100644 => 100755 CloverPackage/CloverUpdater/install-updater.sh mode change 100644 => 100755 CloverPackage/CloverUpdater/translate_xib.sh mode change 100644 => 100755 CloverPackage/makeiso mode change 100644 => 100755 CloverPackage/makepkg mode change 100644 => 100755 CloverPackage/package/Scripts.libraries/rc_scripts.lib mode change 100644 => 100755 CloverPackage/package/Scripts.templates/AltBoot/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/AppleUiSupport/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/CloverEFI/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/CloverThemeManager/preinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/EFIFolder/MountESP mode change 100644 => 100755 CloverPackage/package/Scripts.templates/EFIFolder/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/EFIFolder/preinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/FileSystem/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/InstallBootsectors/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/InstallTheme/preinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/MarkChoice/preinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/MemoryFix/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/OptRcScripts/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/Post/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/Pre/preinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/RcScripts/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/VirtualSMC/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/bootNo/postinstall mode change 100644 => 100755 CloverPackage/package/Scripts.templates/off/postinstall mode change 100644 => 100755 CloverPackage/package/bin/clean_po_headers.sh mode change 100644 => 100755 CloverPackage/package/bin/po4a/po4a mode change 100644 => 100755 CloverPackage/package/bin/po4a/po4a-gettextize mode change 100644 => 100755 CloverPackage/package/bin/po4a/po4a-normalize mode change 100644 => 100755 CloverPackage/package/bin/po4a/po4a-translate mode change 100644 => 100755 CloverPackage/package/bin/po4a/po4a-updatepo mode change 100644 => 100755 CloverPackage/package/buildpkg.sh mode change 100644 => 100755 CloverPackage/package/translate.sh create mode 100644 CloverPackage/revision create mode 100644 CloverPackage/version mode change 100644 => 100755 buildme diff --git a/BaseTools/Source/Python/build/BuildReport.pyc b/BaseTools/Source/Python/build/BuildReport.pyc index 7eedf9aa1182c7d44f9033bfbc464a1a12138b37..641d71ea805bc0f27014bf4e8735b1a551e10bc1 100644 GIT binary patch delta 2675 zcmcb2oO$VKW_IS!yj;px3O2IWaw~czAb_m*f`}XQt;S>K7L!>pSP< zm!%d>-Z)=x^BHaqW+Ii!@cXb3sdR(z2PPtwz7Ufm)&YJ}O^kBIY(RfGxw`oWxfZhm znT~EDu0h2tKvqC#u*c;4(wB&{c=At~0%BC|(A&IGb}do9*HyqLxC)N$BMp2B!nF@BpX=4ZCRBsM8 zVPhjosnO=8R^~iJDTRcChWiELRBv|hFe1`(n|FCC6Xyn_&6;8ML?s(wV%!jsE67*O z1WfM+6%Z<7vw9XME0ON6$Y&%nfowil#Lr@aYLf=YUV=iCf0Ugj#yP;^hr8k^e?1lh zgQS5L1<3&k;;bY^6{rAliS!E#Z~>PkF08H*K=x*n4qYPSVDZW>V#DxbZ#_}T1y~;J z=)X!#paGM>)d^`txpcnX;^xUjSr04@PESc8()#kLHta+xHQM}t&I}@4x_RULHAH1> zV1ik?Y!Wdh2Cnobs<;A%`;)aFi1H1z#9Z$~oa)V6)@Kmm(#acv5t_2emX4oXEeF|<^;lqZdSbYo47cDq}YtR;e-tZCqwpoTZqjx I%#Uva0Nv)Px&QzG delta 2230 zcmZ2_n)%*wW_IS!yjElw>e)&~;lsg?T0MalZ9DcMGo19f#b zU*hIuCZtA_-6M8NFHhO&kD zmFR8$D7%(`6ZJN~Rd`Q8jqYSEl~O`hy;HeQAjI@G%V>!Z2#p>>*68So6SQWMQ5+*a za|BI_@JR>i>TSMc!p25Ojk>ip4}LX9lefBGz^_Da^A!&xysiZ~C)7)sfK_^%kB2!E zh)1K%v5}dATtU+rfvIdJkl1`Bi<6a*`*aEz2}GLS=9*%D77c{C8cd*c47Uc2J9&Tk zY5bPzZoW}*jK3b;1Zj||azFyjKr*;8Afx0#MrndrOF$u_1R{JuTq6*Xve~v%h(L(y zEuPm+FmT@X)f0$d-N^+~tdsXoxQHiMHgB9bg@9`y#>|-V2ahqp5>RjQJtIdg*#ekFRFSvF=6 zaE;#P-J6XG_)2fH?XCm@YIHZhJ}`?w(lDBQ;}Ah77atBG=wz{DJ_J+h#*o zhfoMIo>@$=RQY_-l|bkiP42!?N64y(o8<&ttT$Qi_7wca=x(}mjzIVsO;)@gj^7ku R34DJG!88iW=;xkX2LOJ3x*h-k diff --git a/CloverPackage/CloverPrefpane/install.sh b/CloverPackage/CloverPrefpane/install.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverPrefpane/translate_source.sh b/CloverPackage/CloverPrefpane/translate_source.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverPrefpane/translate_xib.sh b/CloverPackage/CloverPrefpane/translate_xib.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverUpdater/CloverUpdaterUtility b/CloverPackage/CloverUpdater/CloverUpdaterUtility old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverUpdater/CloverUpdaterUtility.plist b/CloverPackage/CloverUpdater/CloverUpdaterUtility.plist old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverUpdater/install-updater.sh b/CloverPackage/CloverUpdater/install-updater.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/CloverUpdater/translate_xib.sh b/CloverPackage/CloverUpdater/translate_xib.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/makeiso b/CloverPackage/makeiso old mode 100644 new mode 100755 diff --git a/CloverPackage/makepkg b/CloverPackage/makepkg old mode 100644 new mode 100755 index 1a65e517b..c88f80e5e --- a/CloverPackage/makepkg +++ b/CloverPackage/makepkg @@ -32,12 +32,7 @@ done cd "$(dirname $0)" version=v2.5k -if [[ -d ../.git ]]; then - revision=$(git svn info | grep Revision | tr -cd [:digit:]) -else -# revision=$(svnversion -n | tr -d [:alpha:]) - revision=$(svn info | grep "Revision" | tr -cd [:digit:]) -fi +revision=$(cat ../Version.h | grep REVISION_STR | awk '{print $NF}' | tr -cd '[[:digit:]]') SRCROOT="${PWD}" SYMROOT="${SRCROOT}"/sym @@ -50,7 +45,7 @@ echo "${revision}" > revision cp -f ../BootHFS/boot1f32-install.sh CloverV2/EFI/CLOVER/doc/boot1f32-install.sh -# Workspace = edk2/Clover/CloverPackage +# Workspace = Clover/CloverPackage # Prepare i386 for building package installer. if [[ -d "$PKG_BUILD_DIR" && $(stat -f '%u' "$PKG_BUILD_DIR") -eq 0 ]]; then diff --git a/CloverPackage/package/Scripts.libraries/rc_scripts.lib b/CloverPackage/package/Scripts.libraries/rc_scripts.lib old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/AltBoot/postinstall b/CloverPackage/package/Scripts.templates/AltBoot/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/AppleUiSupport/postinstall b/CloverPackage/package/Scripts.templates/AppleUiSupport/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/CloverEFI/postinstall b/CloverPackage/package/Scripts.templates/CloverEFI/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/CloverThemeManager/preinstall b/CloverPackage/package/Scripts.templates/CloverThemeManager/preinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/EFIFolder/MountESP b/CloverPackage/package/Scripts.templates/EFIFolder/MountESP old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/EFIFolder/postinstall b/CloverPackage/package/Scripts.templates/EFIFolder/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/EFIFolder/preinstall b/CloverPackage/package/Scripts.templates/EFIFolder/preinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/FileSystem/postinstall b/CloverPackage/package/Scripts.templates/FileSystem/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/InstallBootsectors/postinstall b/CloverPackage/package/Scripts.templates/InstallBootsectors/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/InstallTheme/preinstall b/CloverPackage/package/Scripts.templates/InstallTheme/preinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/MarkChoice/preinstall b/CloverPackage/package/Scripts.templates/MarkChoice/preinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/MemoryFix/postinstall b/CloverPackage/package/Scripts.templates/MemoryFix/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/OptRcScripts/postinstall b/CloverPackage/package/Scripts.templates/OptRcScripts/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/Post/postinstall b/CloverPackage/package/Scripts.templates/Post/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/Pre/preinstall b/CloverPackage/package/Scripts.templates/Pre/preinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/RcScripts/postinstall b/CloverPackage/package/Scripts.templates/RcScripts/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/VirtualSMC/postinstall b/CloverPackage/package/Scripts.templates/VirtualSMC/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/bootNo/postinstall b/CloverPackage/package/Scripts.templates/bootNo/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/Scripts.templates/off/postinstall b/CloverPackage/package/Scripts.templates/off/postinstall old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/clean_po_headers.sh b/CloverPackage/package/bin/clean_po_headers.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/po4a/po4a b/CloverPackage/package/bin/po4a/po4a old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/po4a/po4a-gettextize b/CloverPackage/package/bin/po4a/po4a-gettextize old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/po4a/po4a-normalize b/CloverPackage/package/bin/po4a/po4a-normalize old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/po4a/po4a-translate b/CloverPackage/package/bin/po4a/po4a-translate old mode 100644 new mode 100755 diff --git a/CloverPackage/package/bin/po4a/po4a-updatepo b/CloverPackage/package/bin/po4a/po4a-updatepo old mode 100644 new mode 100755 diff --git a/CloverPackage/package/buildpkg.sh b/CloverPackage/package/buildpkg.sh old mode 100644 new mode 100755 diff --git a/CloverPackage/package/translate.sh b/CloverPackage/package/translate.sh old mode 100644 new mode 100755 index 8eb74527b..ee118f431 --- a/CloverPackage/package/translate.sh +++ b/CloverPackage/package/translate.sh @@ -9,7 +9,7 @@ packagename="Clover" cd "$(dirname $0)" declare -r PKGROOT="$PWD" -declare -r SRCROOT="$PWD"/../../../.. +declare -r SRCROOT="$PWD"/../../.. declare -r SYMROOT=../sym declare -r PKG_RESOURCES_DIR="${SYMROOT}"/Resources diff --git a/CloverPackage/revision b/CloverPackage/revision new file mode 100644 index 000000000..739d79706 --- /dev/null +++ b/CloverPackage/revision @@ -0,0 +1 @@ +0000 diff --git a/CloverPackage/version b/CloverPackage/version new file mode 100644 index 000000000..aaf9b8eaa --- /dev/null +++ b/CloverPackage/version @@ -0,0 +1 @@ +v2.5k diff --git a/Conf/.cache/.PlatformBuild b/Conf/.cache/.PlatformBuild index 8cb8797e8..688fa97ae 100644 --- a/Conf/.cache/.PlatformBuild +++ b/Conf/.cache/.PlatformBuild @@ -1,2 +1,2 @@ -# DO NOT EDIT -# FILE auto-generated +# DO NOT EDIT +# FILE auto-generated diff --git a/Conf/BuildEnv.sh b/Conf/BuildEnv.sh index a06f95131..0d4acfcc2 100644 --- a/Conf/BuildEnv.sh +++ b/Conf/BuildEnv.sh @@ -1,16 +1,16 @@ -# Auto-generated by /Users/sergey/Documents/Projects/Clover/BaseTools/BuildEnv +# Auto-generated by /Users/vectorsigma/src/Clover/BaseTools/BuildEnv if [ -z "$WORKSPACE" ] then - export WORKSPACE=/Users/sergey/Documents/Projects/Clover + export WORKSPACE=/Users/vectorsigma/src/Clover fi if [ -z "$EDK_TOOLS_PATH" ] then - export EDK_TOOLS_PATH=/Users/sergey/Documents/Projects/Clover/BaseTools + export EDK_TOOLS_PATH=/Users/vectorsigma/src/Clover/BaseTools fi -if [ -e /Users/sergey/Documents/Projects/Clover/BaseTools/Bin/Darwin-x86_64 ] +if [ -e /Users/vectorsigma/src/Clover/BaseTools/Bin/Darwin-x86_64 ] then - if [ ${PATH//Users/sergey/Documents/Projects/Clover/BaseTools/Bin/Darwin-x86_64/} == $PATH ] + if [ ${PATH//Users/vectorsigma/src/Clover/BaseTools/Bin/Darwin-x86_64/} == $PATH ] then - export PATH=/Users/sergey/Documents/Projects/Clover/BaseTools/Bin/Darwin-x86_64:$PATH + export PATH=/Users/vectorsigma/src/Clover/BaseTools/Bin/Darwin-x86_64:$PATH fi fi diff --git a/buildme b/buildme old mode 100644 new mode 100755 index 5c744e1b6..8b6d55bd4 --- a/buildme +++ b/buildme @@ -7,20 +7,9 @@ fi cd "$(dirname $0)" declare -r CLOVERROOT="$PWD" -declare -r EDK2ROOT=$(dirname $CLOVERROOT) declare -r TOOLCHAIN=XCODE8 -declare -r PATCHES=Patches_for_UDK2018 - -TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $EDK2ROOT)/opt/local} - -if [[ $PATCHES == Patches_for_UDK2018 ]]; then - declare -r edk2Rel=vUDK2018 - edk2Link=https://codeload.github.com/tianocore/edk2/zip/vUDK2018 # UDK2018 -else - declare -r edk2Rel=edk2-stable201905 - edk2Link=https://github.com/tianocore/edk2/archive/${edk2Rel}.zip # edk2-stable201905 -fi +TOOLCHAIN_DIR=${TOOLCHAIN_DIR:-$(dirname $CLOVERROOT)/opt/local} # Functions pathmunge() { @@ -33,24 +22,6 @@ if [[ ! $PATH =~ (^|:)$1(:|$) ]]; then fi } -checkSRCName() { -local srcName=$(basename $(dirname $EDK2ROOT)) -if [[ $srcName != src ]] && [[ ! -d "${EDK2ROOT}"/BaseTools ]]; then - echo "Usually Clover is inside a folder called src (../src/edk2/), but yours is called $srcName" - echo "is:" - echo "${EDK2ROOT}/" - echo "the right path where all edk2 files will be decompressed?" - read -p "Are you sure? " -n 1 -r - echo # (optional) move to a new line - if [[ $REPLY =~ ^[Yy]$ ]]; then - echo "ok, proceeding.." - else - echo "Is advised that Clover will stay inside this path:" - echo "$HOME/src/edk2/" - exit 1 - fi -fi -} checkXCODE() { echo "[CHECK XCODE]" @@ -124,7 +95,7 @@ exportPaths() { pathmunge "$(xcode-select --print-path)"/usr/bin pathmunge "$TOOLCHAIN_DIR"/bin export TOOLCHAIN_DIR=$TOOLCHAIN_DIR -export DIR_MAIN=${DIR_MAIN:-$(dirname $EDK2ROOT)} +export DIR_MAIN=${DIR_MAIN:-$(dirname $CLOVERROOT)} export DIR_TOOLS=${DIR_TOOLS:-$DIR_MAIN/tools} export DIR_BUILD=${DIR_BUILD:-$RAMDISK_MNT_PT} export DIR_DOWNLOADS=${DIR_DOWNLOADS:-$DIR_TOOLS/download} @@ -138,47 +109,25 @@ checkNASM checkGETTEXT } -updateEDK2() { -echo "[UPDATE EDKII]" -checkSRCName -checkXCODE -exportPaths -rm -f "${DIR_DOWNLOADS}/${edk2Rel}.zip" -curl -o "${DIR_DOWNLOADS}/${edk2Rel}.zip" $edk2Link || exit 1 -cd "${EDK2ROOT}" -find . -maxdepth 1 ! -name $(basename $CLOVERROOT) -delete -echo "extracting files from edk2 archive:" -bsdtar -vxf "${DIR_DOWNLOADS}/${edk2Rel}.zip" -s'|[^/]*/||' -rm -f "${DIR_DOWNLOADS}/${edk2Rel}.zip" -} -patchEDK2() { -echo "[$PATCHES]" -cp -R "${CLOVERROOT}"/$PATCHES/* "${EDK2ROOT}"/ -} - -updateClover() { +updateCloverTakeTheirs() { echo "[UPDATE CLOVER]" cd "${CLOVERROOT}" -svn up +git fetch --all +git reset --hard origin/master +git pull origin master +} + +updateCloverTakeYours() { +echo "[UPDATE CLOVER]" +cd "${CLOVERROOT}" +git stash +git pull origin master +git stash apply } buildClover() { checkTools -if [[ ! -d "${EDK2ROOT}"/BaseTools ]];then - updateEDK2 -fi - -if [[ -f "${EDK2ROOT}"/BaseTools/Conf/tools_def.txt ]]; then - # tools_def.txt exist, but is patched? - if ! grep -q XCODE8 "${EDK2ROOT}"/Conf/tools_def.txt; then - # no, patch it! - patchEDK2 - fi -else - # tools_def.txt didn't exists. BaseTool is vanilla.. - patchEDK2 -fi cd "${CLOVERROOT}" echo "[BUILD CLOVER]" @@ -198,31 +147,27 @@ echo "[BUILD ISO]" make iso } -checkChanges() { -cd "${CLOVERROOT}" -svn log -r BASE:HEAD -v -} - checkStatus() { cd "${CLOVERROOT}" -svn status +git fetch origin +git status } showdiff() { cd "${CLOVERROOT}" -svn diff -r head +git fetch origin +git diff } menu() { echo echo '------------------------------------------------------------------------' cd "${CLOVERROOT}" -echo "buildme Beta, Clover v2.5k r$(svn info | grep "Revision" | tr -cd [:digit:])" -echo "EDKII in use: $edk2Rel" -echo "Patches in use: $PATCHES" +echo "buildme Beta, Clover v2.5k r$(cat Version.h | grep REVISION_STR | awk '{print $NF}' | tr -cd '[[:digit:]]') (SHA: $(git rev-parse --short HEAD))" +echo "Remote SHA: $(git rev-parse --short origin/master)" echo PS3='Please enter your choice: ' -options=('build Clover' 'make pkg' 'make iso' 'build all' 'update Clover' 'update edk2' 'status' 'check remote changes' 'show diff' 'quit') +options=('build Clover' 'make pkg' 'make iso' 'build all' 'update Clover (discard local changes)' 'update Clover (stash local changes)' 'status' 'show diff' 'quit') select opt in "${options[@]}" do case $opt in @@ -244,22 +189,18 @@ do buildIso break ;; - "update Clover") - updateClover + "update Clover (discard changes)") + updateCloverTakeTheirs break ;; - "update edk2") - updateEDK2 + "update Clover (stash local changes)") + updateCloverTakeYours break ;; "status") checkStatus break ;; - "check remote changes") - checkChanges - break - ;; "show diff") showdiff break diff --git a/ebuild.sh b/ebuild.sh index c88050beb..731d05cf9 100755 --- a/ebuild.sh +++ b/ebuild.sh @@ -519,7 +519,7 @@ checkCmdlineArguments() { done # Update variables - PLATFORMFILE="${PLATFORMFILE:-Clover/Clover.dsc}" + PLATFORMFILE="${PLATFORMFILE:-Clover.dsc}" if [ ! -z "${MODULEFILE}" ]; then MODULEFILE=" -m Clover/$MODULEFILE" fi @@ -542,8 +542,8 @@ checkToolchain() { # Main build script MainBuildScript() { checkCmdlineArguments $@ - #checkToolchain - checkPatch +# checkToolchain +# checkPatch # echo "NASM_PREFIX: ${NASM_PREFIX}" @@ -551,8 +551,8 @@ MainBuildScript() { if [[ -d .svn ]]; then # repoRev=$(svnversion -n | tr -d [:alpha:]) repoRev=$(svn info | grep "Revision" | tr -cd [:digit:]) - elif [[ -d .git ]]; then - repoRev=$(git svn find-rev git-svn | tr -cd [:digit:]) +# elif [[ -d .git ]]; then +# repoRev=$(git svn find-rev git-svn | tr -cd [:digit:]) fi echo -n "${repoRev}" > "${VERSTXT}" @@ -573,24 +573,17 @@ MainBuildScript() { # # Setup workspace if it is not set # - local EDK2DIR=$(cd "$CLOVERROOT"/.. && echo "$PWD") if [[ -z "$WORKSPACE" ]]; then echo "Initializing workspace" - if [[ ! -x "${EDK2DIR}"/edksetup.sh ]]; then - echo "Error: Can't find edksetup.sh script !" >&2 - exit 1 - fi - # This version is for the tools in the BaseTools project. # this assumes svn pulls have the same root dir # export EDK_TOOLS_PATH=`pwd`/../BaseTools # This version is for the tools source in edk2 - cd "$EDK2DIR" + cd "$CLOVERROOT" export EDK_TOOLS_PATH="${PWD}"/BaseTools set +u source ./edksetup.sh BaseTools set -u - cd "$CLOVERROOT" else echo "Building from: $WORKSPACE" fi diff --git a/vers.txt b/vers.txt index 5239a759f..af2e09a3e 100644 --- a/vers.txt +++ b/vers.txt @@ -1 +1 @@ -5069 +0000 \ No newline at end of file