Bug 1570796 - Use a fetch task for hfsplus-tools source code. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D40329

MANUAL PUSH: avoid closing autoland while all docker images and
toolchains are rebuilt.
This commit is contained in:
Mike Hommey 2019-08-02 07:15:19 +09:00
Родитель 6e5fc78628
Коммит c638ab3c85
3 изменённых файлов: 16 добавлений и 16 удалений

Просмотреть файл

@ -8,8 +8,7 @@ set -e
set -x
hfplus_version=540.1.linux3
md5sum=0435afc389b919027b69616ad1b05709
filename=diskdev_cmds-${hfplus_version}.tar.gz
dirname=diskdev_cmds-${hfplus_version}
make_flags="-j$(nproc)"
root_dir="$1"
@ -22,19 +21,8 @@ if test -z $TMPDIR; then
TMPDIR=/tmp/
fi
# Set an md5 check file to validate input
echo "${md5sum} *${TMPDIR}/${filename}" > $TMPDIR/hfsplus.MD5
# Most-upstream is https://opensource.apple.com/source/diskdev_cmds/
# Download the source of the specified version of hfsplus
wget -c --progress=dot:mega -P $TMPDIR https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/${filename}/${md5sum}/${filename} || exit 1
md5sum -c $TMPDIR/hfsplus.MD5 || exit 1
mkdir hfsplus-source
tar xzf $TMPDIR/${filename} -C hfsplus-source --strip-components=1
# Build
cd hfsplus-source
cd $dirname
# We want to statically link against libcrypto. On CentOS, that requires zlib
# and libdl, because of FIPS functions pulling in more than necessary from
# libcrypto (only SHA1 functions are used), but not on Debian, thus
@ -52,9 +40,9 @@ make $make_flags || exit 1
cd ..
mkdir hfsplus-tools
cp hfsplus-source/newfs_hfs.tproj/newfs_hfs hfsplus-tools/newfs_hfs
cp $dirname/newfs_hfs.tproj/newfs_hfs hfsplus-tools/newfs_hfs
## XXX fsck_hfs is unused, but is small and built from the package.
cp hfsplus-source/fsck_hfs.tproj/fsck_hfs hfsplus-tools/fsck_hfs
cp $dirname/fsck_hfs.tproj/fsck_hfs hfsplus-tools/fsck_hfs
# Make a package of the built utils
cd $root_dir

Просмотреть файл

@ -269,6 +269,15 @@ libdmg-hfsplus:
repo: https://github.com/mozilla/libdmg-hfsplus/
revision: 2ee327795680101d36f9700bd0fb618362237718
hfsplus-tools:
description: hfstools-plus source code
fetch:
type: static-url
# Most-upstream is https://opensource.apple.com/source/diskdev_cmds/
url: https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-540.1.linux3.tar.gz/0435afc389b919027b69616ad1b05709/diskdev_cmds-540.1.linux3.tar.gz
sha256: b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497
size: 411205
llvm-for-dsymutil:
description: llvm source code for dsymutil
fetch:

Просмотреть файл

@ -64,6 +64,9 @@ linux64-hfsplus:
toolchain-artifact: public/build/hfsplus-tools.tar.xz
toolchains:
- linux64-clang-8
fetches:
fetch:
- hfsplus-tools
linux64-libdmg:
description: "libdmg-hfsplus toolchain build"