From 075bb849cdcf06f305468f156c151493a2512773 Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:31:32 +0100 Subject: [PATCH 1/6] Change gz to xz: travis --- .travis.yml | 2 +- .travis/test_05_before_script.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7152d85cbdef4..6598da6401775 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ env: - CCACHE_COMPRESS=1 - CCACHE_DIR=$HOME/.ccache - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out - - SDK_URL=https://bitcoincore.org/depends-sources/sdks + - SDK_URL=https://github.com/gitianuser/MacOSX-SDKs/releases/download/MacOSX10.11.sdk - WINEDEBUG=fixme-all - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache" diff --git a/.travis/test_05_before_script.sh b/.travis/test_05_before_script.sh index e7a1425e396a4..b79c30f9d4651 100755 --- a/.travis/test_05_before_script.sh +++ b/.travis/test_05_before_script.sh @@ -10,11 +10,11 @@ export LC_ALL=C.UTF-8 mkdir -p depends/SDKs depends/sdk-sources -if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then - curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz +if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz ]; then + curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.xz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz fi -if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then - tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz +if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz ]; then + tar -C depends/SDKs -xJf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz fi if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\) From 5fbdbccab8151371e4254773652ae1ba0a00c778 Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:32:16 +0100 Subject: [PATCH 2/6] Change gz to xz: gitian script and descriptors --- contrib/gitian-build.py | 14 +++++++------- contrib/gitian-descriptors/gitian-linux.yml | 8 ++++---- contrib/gitian-descriptors/gitian-osx-signer.yml | 4 ++-- contrib/gitian-descriptors/gitian-osx.yml | 12 ++++++------ contrib/gitian-descriptors/gitian-win-signer.yml | 10 +++++----- contrib/gitian-descriptors/gitian-win.yml | 6 +++--- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index 7e40e8c4e40ba..fad0275fab4ec 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -55,7 +55,7 @@ def build(): os.chdir('gitian-builder') os.makedirs('inputs', exist_ok=True) - subprocess.check_call(['wget', '-O', 'inputs/osslsigncode-1.7.1.tar.gz', '-N', '-P', 'inputs', 'https://github.com/cevap/osslsigncode/archive/v1.7.1.tar.gz']) + subprocess.check_call(['wget', '-O', 'inputs/osslsigncode-1.7.1.tar.xz', '-N', '-P', 'inputs', 'https://github.com/cevap/osslsigncode/releases/download/v1.7.1/osslsigncode-1.7.1.tar.xz']) subprocess.check_call(['wget', '-O', 'inputs/osslsigncode-Backports-to-1.7.1.patch', '-N', '-P', 'inputs', 'https://github.com/cevap/osslsigncode/releases/download/v1.7.1/osslsigncode-Backports-to-1.7.1.patch']) subprocess.check_call(['make', '-C', '../ion/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common']) @@ -63,21 +63,21 @@ def build(): print('\nCompiling ' + args.version + ' Linux') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'ion='+args.commit, '--url', 'ion='+args.url, '../ion/contrib/gitian-descriptors/gitian-linux.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../ion/contrib/gitian-descriptors/gitian-linux.yml']) - subprocess.check_call('mv build/out/ion-*.tar.gz build/out/src/ion-*.tar.gz ../ion-binaries/'+args.version, shell=True) + subprocess.check_call('mv build/out/ion-*.tar.xz build/out/src/ion-*.tar.xz ../ion-binaries/'+args.version, shell=True) if args.windows: print('\nCompiling ' + args.version + ' Windows') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'ion='+args.commit, '--url', 'ion='+args.url, '../ion/contrib/gitian-descriptors/gitian-win.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../ion/contrib/gitian-descriptors/gitian-win.yml']) - subprocess.check_call('mv build/out/ion-*-win-unsigned.tar.gz inputs/', shell=True) + subprocess.check_call('mv build/out/ion-*-win-unsigned.tar.xz inputs/', shell=True) subprocess.check_call('mv build/out/ion-*.zip build/out/ion-*.exe ../ion-binaries/'+args.version, shell=True) if args.macos: print('\nCompiling ' + args.version + ' MacOS') subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'ion='+args.commit, '--url', 'ion='+args.url, '../ion/contrib/gitian-descriptors/gitian-osx.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../ion/contrib/gitian-descriptors/gitian-osx.yml']) - subprocess.check_call('mv build/out/ion-*-osx-unsigned.tar.gz inputs/', shell=True) - subprocess.check_call('mv build/out/ion-*.tar.gz build/out/ion-*.dmg ../ion-binaries/'+args.version, shell=True) + subprocess.check_call('mv build/out/ion-*-osx-unsigned.tar.xz inputs/', shell=True) + subprocess.check_call('mv build/out/ion-*.tar.xz build/out/ion-*.dmg ../ion-binaries/'+args.version, shell=True) os.chdir(workdir) @@ -100,7 +100,7 @@ def sign(): if args.windows: print('\nSigning ' + args.version + ' Windows') - subprocess.check_call('cp inputs/ion-' + args.version + '-win-unsigned.tar.gz inputs/ion-win-unsigned.tar.gz', shell=True) + subprocess.check_call('cp inputs/ion-' + args.version + '-win-unsigned.tar.xz inputs/ion-win-unsigned.tar.xz', shell=True) subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../ion/contrib/gitian-descriptors/gitian-win-signer.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../ion/contrib/gitian-descriptors/gitian-win-signer.yml']) subprocess.check_call('mv build/out/ion-*win64-setup.exe ../ion-binaries/'+args.version, shell=True) @@ -108,7 +108,7 @@ def sign(): if args.macos: print('\nSigning ' + args.version + ' MacOS') - subprocess.check_call('cp inputs/ion-' + args.version + '-osx-unsigned.tar.gz inputs/ion-osx-unsigned.tar.gz', shell=True) + subprocess.check_call('cp inputs/ion-' + args.version + '-osx-unsigned.tar.xz inputs/ion-osx-unsigned.tar.xz', shell=True) subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../ion/contrib/gitian-descriptors/gitian-osx-signer.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../ion/contrib/gitian-descriptors/gitian-osx-signer.yml']) subprocess.check_call('mv build/out/ion-osx-signed.dmg ../ion-binaries/'+args.version+'/ion-'+args.version+'-osx.dmg', shell=True) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 0f37ca5106bd7..4f338be8f19ab 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -143,13 +143,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo ion-*.tar.gz` + SOURCEDIST=`echo ion-*.tar.xz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) @@ -181,8 +181,8 @@ script: | rm -rf ${DISTNAME}/lib/pkgconfig find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; # find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; - find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz - find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz + find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ${OUTDIR}/${DISTNAME}-${i}.tar.xz + find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.xz cd ../../ rm -rf distsrc-${i} done diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index bdf4a12f148b4..828a6d403a008 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -10,7 +10,7 @@ remotes: - "url": "https://github.com/gitianuser/ion-detached-sigs.git" "dir": "signature" files: -- "ion-osx-unsigned.tar.gz" +- "ion-osx-unsigned.tar.xz" script: | WRAP_DIR=$HOME/wrapped mkdir -p ${WRAP_DIR} @@ -27,7 +27,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=ion-osx-unsigned.tar.gz + UNSIGNED=ion-osx-unsigned.tar.xz SIGNED=ion-osx-signed.dmg tar -xf ${UNSIGNED} diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index dc48587cf4078..a041a34f68ddc 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -88,7 +88,7 @@ script: | BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs - tar -C ${BASEPREFIX}/SDKs -xvf ${BUILD_DIR}/MacOSX10.11.sdk.tar.xz + tar -C ${BASEPREFIX}/SDKs -xJvf ${BUILD_DIR}/MacOSX10.11.sdk.tar.xz # Build dependencies for each host for i in $HOSTS; do @@ -105,14 +105,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo ion-*.tar.gz` + SOURCEDIST=`echo ion-*.tar.xz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) @@ -149,7 +149,7 @@ script: | cp ${BASEPREFIX}/${i}/native/bin/${i}-pagestuff unsigned-app-${i}/pagestuff mv dist unsigned-app-${i} pushd unsigned-app-${i} - find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz + find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ${OUTDIR}/${DISTNAME}-osx-unsigned.tar.xz popd make deploy @@ -159,10 +159,10 @@ script: | find . -name "lib*.la" -delete find . -name "lib*.a" -delete rm -rf ${DISTNAME}/lib/pkgconfig - find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz + find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ${OUTDIR}/${DISTNAME}-${i}.tar.xz cd ../../ done mkdir -p $OUTDIR/src mv $SOURCEDIST $OUTDIR/src - mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz + mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.xz ${OUTDIR}/${DISTNAME}-osx64.tar.xz diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 163c9eb4a2684..a4ab8b3f89a6e 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -12,21 +12,21 @@ remotes: - "url": "https://github.com/ioncoincore/ion-detached-sigs.git" "dir": "signature" files: -- "v1.7.1.tar.gz" +- "osslsigncode-1.7.1.tar.xz" - "osslsigncode-Backports-to-1.7.1.patch" -- "ion-win-unsigned.tar.gz" +- "ion-win-unsigned.tar.xz" script: | BUILD_DIR=`pwd` SIGDIR=${BUILD_DIR}/signature/win UNSIGNED_DIR=${BUILD_DIR}/unsigned - echo "f6ba53b8780a2362e91e450776eef1c16fe9a0f86abcdfdc90cf7f76e7fa4f63 v1.7.1.tar.gz" | sha256sum -c + echo "75cb7377106c423dd63843798b43fd4a7d697b3fb51a0202b1a808018283e5f3 osslsigncode-1.7.1.tar.xz" | sha256sum -c echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c mkdir -p ${UNSIGNED_DIR} - tar -C ${UNSIGNED_DIR} -xf ion-win-unsigned.tar.gz + tar -C ${UNSIGNED_DIR} -xJf ion-win-unsigned.tar.xz - tar xf tar xf v1.7.1.tar.gz + tar xJf osslsigncode-1.7.1.tar.xz cd osslsigncode-1.7.1 patch -p1 < ${BUILD_DIR}/osslsigncode-Backports-to-1.7.1.patch diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index d8599713c9a5a..b08c13fc826f3 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -121,14 +121,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo ion-*.tar.gz` + SOURCEDIST=`echo ion-*.tar.xz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find ion-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ../$SOURCEDIST mkdir -p $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src popd @@ -174,7 +174,7 @@ script: | cd $BUILD_DIR/windeploy mkdir unsigned cp $OUTDIR/ion-*setup-unsigned.exe unsigned/ - find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz + find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -9 > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.xz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip From 053fb01e0899f2bdbc1097140ef215ac3d1a441a Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:32:40 +0100 Subject: [PATCH 3/6] Change gz to xz: macdeploy scripts --- contrib/macdeploy/detached-sig-apply.sh | 2 +- contrib/macdeploy/detached-sig-create.sh | 4 ++-- contrib/macdeploy/extract-osx-sdk.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/macdeploy/detached-sig-apply.sh b/contrib/macdeploy/detached-sig-apply.sh index f8503e4de8c52..0ae4bd3ffa253 100755 --- a/contrib/macdeploy/detached-sig-apply.sh +++ b/contrib/macdeploy/detached-sig-apply.sh @@ -24,7 +24,7 @@ if [ -z "$SIGNATURE" ]; then fi rm -rf ${TEMPDIR} && mkdir -p ${TEMPDIR} -tar -C ${TEMPDIR} -xf ${UNSIGNED} +tar -C ${TEMPDIR} -xJf ${UNSIGNED} cp -rf "${SIGNATURE}"/* ${TEMPDIR} if [ -z "${PAGESTUFF}" ]; then diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index de9956b754a42..0917b33509f32 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -11,7 +11,7 @@ BUNDLE=${ROOTDIR}/Ion-Qt.app CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt -OUT=signature-osx.tar.gz +OUT=signature-osx.tar.xz OUTROOT=osx if [ ! -n "$1" ]; then @@ -47,6 +47,6 @@ done rm ${TEMPLIST} -tar -C "${TEMPDIR}" -czf "${OUT}" . +tar -C "${TEMPDIR}" -cJf "${OUT}" . rm -rf "${TEMPDIR}" echo "Created ${OUT}" \ No newline at end of file diff --git a/contrib/macdeploy/extract-osx-sdk.sh b/contrib/macdeploy/extract-osx-sdk.sh index a53ee37ebf4e7..744029d7208e3 100755 --- a/contrib/macdeploy/extract-osx-sdk.sh +++ b/contrib/macdeploy/extract-osx-sdk.sh @@ -28,7 +28,7 @@ fls "${HFSFILENAME}" -rpF ${SDKDIRINODE} | icat "${HFSFILENAME}" $inode >"$filename" fi done -echo "Building ${SDKNAME}.tar.gz ..." +echo "Building ${SDKNAME}.tar.xz ..." MTIME="$(istat "${HFSFILENAME}" "${SDKDIRINODE}" | perl -nle 'm/Content Modified:\s+(.*?)\s\(/ && print $1')" find "${SDKNAME}" | sort | tar --no-recursion --mtime="${MTIME}" --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | xz -e9 > "${SDKNAME}.tar.xz" echo 'All done!' From e006ea4a114ec372d9945486f516f6a2d563fa69 Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:32:59 +0100 Subject: [PATCH 4/6] Change gz to xz: windeploy scripts --- contrib/windeploy/detached-sig-create.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/windeploy/detached-sig-create.sh b/contrib/windeploy/detached-sig-create.sh index 15f8108cf011f..950f9ceff8702 100755 --- a/contrib/windeploy/detached-sig-create.sh +++ b/contrib/windeploy/detached-sig-create.sh @@ -14,7 +14,7 @@ if [ ! -n "$1" ]; then exit 1 fi -OUT=signature-win.tar.gz +OUT=signature-win.tar.xz SRCDIR=unsigned WORKDIR=./.tmp OUTDIR="${WORKDIR}/out" @@ -30,6 +30,6 @@ basename -a `ls -1 "${SRCDIR}"/*-unsigned.exe` | while read UNSIGNED; do done rm -f "${OUT}" -tar -C "${OUTDIR}" -czf "${OUT}" . +tar -C "${OUTDIR}" -cJf "${OUT}" . rm -rf "${WORKDIR}" echo "Created ${OUT}" From 0c0419c078c88ff3f584444df82be9f830eec151 Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:33:24 +0100 Subject: [PATCH 5/6] Change gz to xz: debian scripts --- contrib/debian/watch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/debian/watch b/contrib/debian/watch index c96d2f8e75ca4..2f7a2932f2bcb 100644 --- a/contrib/debian/watch +++ b/contrib/debian/watch @@ -2,6 +2,6 @@ version=3 # use qa.debian.org redirector; see man uscan opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/;s/\-src//,dversionmangle=s/~dfsg\d*// \ - http://sf.net/bitcoin/bitcoin-(\d.*)-linux\.tar\.gz debian + https://download.ioncore.xyz/ioncoincore/ion-(\d.*)-linux\.tar\.xz debian opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \ - http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz + http://githubredir.debian.net/github/ioncoincore/ion v(.*).tar.xz From 3a3e208d35ac14991eb0fb9608a93d07ad28aea9 Mon Sep 17 00:00:00 2001 From: cevap Date: Mon, 21 Jan 2019 01:33:51 +0100 Subject: [PATCH 6/6] Change gz to xz: README, how to create sdk --- doc/README_osx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README_osx.md b/doc/README_osx.md index 96cfe77219805..78fc12724363f 100644 --- a/doc/README_osx.md +++ b/doc/README_osx.md @@ -41,7 +41,7 @@ To create a tarball suitable for Gitian input, there are two options: Using Mac OS X, you can mount the dmg, and then create it with: ``` $ hdiutil attach Xcode_7.3.1.dmg - $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.11.sdk.tar.gz MacOSX10.11.sdk + $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -cJf MacOSX10.11.sdk.tar.xz MacOSX10.11.sdk ``` Alternatively, you can use 7zip and SleuthKit to extract the files one by one.