diff options
| author | Mario Limonciello <mario.limonciello@amd.com> | 2023-10-23 10:18:21 -0500 |
|---|---|---|
| committer | Mario Limonciello <mario.limonciello@amd.com> | 2023-10-23 10:18:21 -0500 |
| commit | 39d553923355fdb0890a02ab8434c8bef4e1da36 (patch) | |
| tree | 8ef5b0eb7b5725f64cbcf0b3e599e19dbfe585cd | |
| parent | d983107a2dfa60d70df4101b69bfe7054db9704c (diff) | |
| download | linux-firmware-39d553923355fdb0890a02ab8434c8bef4e1da36.tar.gz | |
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 <mario.limonciello@amd.com>
| -rwxr-xr-x | contrib/process_linux_firmware.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |