From 39d553923355fdb0890a02ab8434c8bef4e1da36 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 23 Oct 2023 10:18:21 -0500 Subject: [PATCH] Use `git am` instead of `b4 shazam` There appears to be problems with `b4 am` with binary diffs, but there also doesn't seem to be need to use b4 in this case. Switch over to just applying the mbox directly. Signed-off-by: Mario Limonciello --- contrib/process_linux_firmware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/process_linux_firmware.py b/contrib/process_linux_firmware.py index 2b7c7f8d..ab5de8ed 100755 --- a/contrib/process_linux_firmware.py +++ b/contrib/process_linux_firmware.py @@ -168,7 +168,7 @@ def process_patch(mbox, num, remote): quiet_cmd(cmd) # apply the patch - cmd = ["b4", "shazam", "-m", "-"] + cmd = ["git", "am"] logging.debug("Running {}".format(cmd)) p = subprocess.Popen( cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE