From a6bbf5b56bf9b5bfa6240578c3cc08a8ba4e6e1b Mon Sep 17 00:00:00 2001 From: Mike Shal Date: Thu, 30 Mar 2017 16:30:59 -0400 Subject: [PATCH] Bug 1351474 - use Mozilla fork of libdmg-hfsplus; r=ted The latest upstream version produces .dmg files that have fsck errors, and some versions of OSX complain that the image is corrupted. The previous version of libdmg-hfsplus that we were using (1d72dd62a) doesn't have fsck errors, but it also doesn't preserve file permissions. Our fork is based on the older version and backports the file permission commits. MozReview-Commit-ID: Bjwy6MJ98Ud --HG-- extra : rebase_source : 5ecb3a3bbe9d8fe655fda7c1ce615bac91dc26fb --- taskcluster/scripts/misc/build-libdmg-hfsplus.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/taskcluster/scripts/misc/build-libdmg-hfsplus.sh b/taskcluster/scripts/misc/build-libdmg-hfsplus.sh index 37357fc720c5..61b7ec5d26fb 100755 --- a/taskcluster/scripts/misc/build-libdmg-hfsplus.sh +++ b/taskcluster/scripts/misc/build-libdmg-hfsplus.sh @@ -8,11 +8,12 @@ WORKSPACE=$HOME/workspace STAGE=$WORKSPACE/dmg UPLOAD_DIR=$WORKSPACE/artifacts -# There's no single well-maintained fork of libdmg-hfsplus, but this -# branch currently has some fixes we need. -: LIBDMG_REPOSITORY ${LIBDMG_REPOSITORY:=https://github.com/andreas56/libdmg-hfsplus} -# This is the current head of the `from_zarvox` branch. -: LIBDMG_REV ${LIBDMG_REV:=81dd75fd1549b24bf8af9736ac25518b367e6b63} +# There's no single well-maintained fork of libdmg-hfsplus, so we forked +# https://github.com/andreas56/libdmg-hfsplus/ to get a specific version and +# backport some patches. +: LIBDMG_REPOSITORY ${LIBDMG_REPOSITORY:=https://github.com/mozilla/libdmg-hfsplus} +# The `mozilla` branch contains our fork. +: LIBDMG_REV ${LIBDMG_REV:=mozilla} mkdir -p $UPLOAD_DIR $STAGE