From 6e48dedeb89821e8622cb1d9cb266f9b40151705 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 12 Jul 2018 00:24:12 +0200 Subject: [PATCH] scripts: include binaries in patch This commit allows for binary content in patches created via 'make update-patches'. Binary patches are needed for BDFs required for al boards on the new ipq40xx target. Before this commit, binaries were omitted from the generated patch which resulted in the patch not able to apply. Patches without binary content do not differ in case they are created with the '--binary' flag. --- scripts/update-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-patches.sh b/scripts/update-patches.sh index c8464646..cb38c37d 100755 --- a/scripts/update-patches.sh +++ b/scripts/update-patches.sh @@ -19,6 +19,6 @@ for module in $GLUON_MODULES; do for commit in $(git rev-list --reverse --no-merges base..patched); do let n=n+1 mkdir -p "$GLUONDIR"/patches/"$module" - git -c core.abbrev=40 show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames "$commit" > "$GLUONDIR/patches/$module/$(printf '%04u' $n)-$(git show -s --pretty=format:%f "$commit").patch" + git -c core.abbrev=40 show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames --binary "$commit" > "$GLUONDIR/patches/$module/$(printf '%04u' $n)-$(git show -s --pretty=format:%f "$commit").patch" done done