diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index bfb668b1..b9d138f2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b'df5f6f66de80085249d392be5efa085e6ee056a0'" + echo "df5f6f66de80085249d392be5efa085e6ee056a0" } # Show version information diff --git a/staging/patchupdate.py b/staging/patchupdate.py index 51a86dd0..5aa95c8c 100755 --- a/staging/patchupdate.py +++ b/staging/patchupdate.py @@ -735,7 +735,7 @@ def generate_script(all_patches, resolved): template = template_fp.read() with open(config.path_script, "w") as fp: fp.write(template.format(staging_version=_staging_version(), - upstream_commit=upstream_commit, + upstream_commit=upstream_commit.decode(), patch_helpers="".join(lines_helpers).rstrip("\n"), patch_resolver="".join(lines_resolver).rstrip("\n"), patch_apply="".join(lines_apply).rstrip("\n")))