]> git.proxmox.com Git - mirror_linux-firmware.git/commitdiff
Use `git am` instead of `b4 shazam`
authorMario Limonciello <mario.limonciello@amd.com>
Mon, 23 Oct 2023 15:18:21 +0000 (10:18 -0500)
committerMario Limonciello <mario.limonciello@amd.com>
Mon, 23 Oct 2023 15:18:21 +0000 (10:18 -0500)
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 <mario.limonciello@amd.com>
contrib/process_linux_firmware.py

index 2b7c7f8d5fc3fc17abe6ed35f8ee65da5b55f02d..ab5de8ed8339218db02a3a53804436e7afe56e04 100755 (executable)
@@ -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