From a5982d275b1fc84156bed7cc2ac3c332b7debbc2 Mon Sep 17 00:00:00 2001 From: Mike Beaton Date: Tue, 7 Nov 2023 07:24:57 +0000 Subject: [PATCH] efibuild: Add support for DISCARD_SUBMODULES --- efibuild.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/efibuild.sh b/efibuild.sh index 47f270f..11175ae 100755 --- a/efibuild.sh +++ b/efibuild.sh @@ -33,6 +33,12 @@ prompt() { fi } +setcommitauthor() { + git config user.name ocbuild + git config user.email ocbuild@acidanthera.local + git config commit.gpgsign false +} + updaterepo() { if [ ! -d "$2" ]; then git clone "$1" -b "$3" --depth=1 "$2" || exit 1 @@ -47,6 +53,13 @@ updaterepo() { exit 1 fi fi + if [ "$2" = "UDK" ] && [ "$DISCARD_SUBMODULES" != "" ]; then + setcommitauthor + for module_to_discard in "${DISCARD_SUBMODULES[@]}" ; do + git rm "${module_to_discard}" + done + git commit -m "Discarded submodules" + fi git submodule update --init --recommend-shallow || exit 1 popd >/dev/null || exit 1 } @@ -393,9 +406,7 @@ fi if [ "$NEW_BUILDSYSTEM" != "1" ]; then if [ -d ../Patches ]; then if [ ! -f patches.ready ]; then - git config user.name ocbuild - git config user.email ocbuild@acidanthera.local - git config commit.gpgsign false + setcommitauthor for i in ../Patches/* ; do git apply --ignore-whitespace "$i" || exit 1 git add .