[Build] Update gitian descriptors

This commit is contained in:
Akshay
2019-06-08 17:56:08 +03:00
parent eca8a7d78f
commit d8192b664c
12 changed files with 31 additions and 31 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ def setup():
if not os.path.isdir('gitian-builder'): if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('bitcoin'): if not os.path.isdir('bitcoin'):
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) subprocess.check_call(['git', 'clone', 'https://github.com/nyc3coin/nyc3'])
os.chdir('gitian-builder') os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker: if args.docker:
+6 -6
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-linux-0.18" name: "nyc3-linux-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -32,8 +32,8 @@ packages:
- "ca-certificates" - "ca-certificates"
- "python" - "python"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
files: [] files: []
script: | script: |
set -e -o pipefail set -e -o pipefail
@@ -122,7 +122,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog} chmod +x ${WRAP_DIR}/${prog}
done done
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
@@ -144,13 +144,13 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd popd
# Workaround for tarball not building with the bare tag version (prep) # Workaround for tarball not building with the bare tag version (prep)
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-dmg-signer" name: "nyc3-dmg-signer"
suites: suites:
- "bionic" - "bionic"
architectures: architectures:
+6 -6
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-osx-0.18" name: "nyc3-osx-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -28,8 +28,8 @@ packages:
- "python-setuptools" - "python-setuptools"
- "fonts-tuffy" - "fonts-tuffy"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
files: files:
- "MacOSX10.11.sdk.tar.gz" - "MacOSX10.11.sdk.tar.gz"
script: | script: |
@@ -86,7 +86,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00" create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
mkdir -p ${BASEPREFIX}/SDKs mkdir -p ${BASEPREFIX}/SDKs
@@ -107,14 +107,14 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd popd
# Workaround for tarball not building with the bare tag version (prep) # Workaround for tarball not building with the bare tag version (prep)
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-win-signer" name: "nyc3-win-signer"
suites: suites:
- "bionic" - "bionic"
architectures: architectures:
+9 -9
View File
@@ -1,5 +1,5 @@
--- ---
name: "bitcoin-win-0.18" name: "nyc3-win-0.18"
enable_cache: true enable_cache: true
suites: suites:
- "bionic" - "bionic"
@@ -23,8 +23,8 @@ packages:
- "python" - "python"
- "rename" - "rename"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/nyc3coin/nyc3"
"dir": "bitcoin" "dir": "nyc3"
files: [] files: []
script: | script: |
set -e -o pipefail set -e -o pipefail
@@ -76,7 +76,7 @@ script: |
function create_per-host_linker_wrapper { function create_per-host_linker_wrapper {
# This is only needed for trusty, as the mingw linker leaks a few bytes of # This is only needed for trusty, as the mingw linker leaks a few bytes of
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900 # heap, causing non-determinism. See discussion in https://github.com/nyc3/nyc3/pull/6900
for i in $HOSTS; do for i in $HOSTS; do
mkdir -p ${WRAP_DIR}/${i} mkdir -p ${WRAP_DIR}/${i}
for prog in collect2; do for prog in collect2; do
@@ -105,7 +105,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00" create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH} export PATH=${WRAP_DIR}:${PATH}
cd bitcoin cd nyc3
BASEPREFIX=`pwd`/depends BASEPREFIX=`pwd`/depends
# Build dependencies for each host # Build dependencies for each host
for i in $HOSTS; do for i in $HOSTS; do
@@ -123,14 +123,14 @@ script: |
./autogen.sh ./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist make dist
SOURCEDIST=`echo bitcoin-*.tar.gz` SOURCEDIST=`echo nyc3-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order # Correct tar file order
mkdir -p temp mkdir -p temp
pushd temp pushd temp
tar xf ../$SOURCEDIST tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
mkdir -p $OUTDIR/src mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src
popd popd
@@ -159,7 +159,7 @@ script: |
make deploy make deploy
make install DESTDIR=${INSTALLPATH} make install DESTDIR=${INSTALLPATH}
rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
cp -f bitcoin-*setup*.exe $OUTDIR/ cp -f nyc3-*setup*.exe $OUTDIR/
cd installed cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete find . -name "lib*.la" -delete
@@ -175,7 +175,7 @@ script: |
cp -rf contrib/windeploy $BUILD_DIR cp -rf contrib/windeploy $BUILD_DIR
cd $BUILD_DIR/windeploy cd $BUILD_DIR/windeploy
mkdir unsigned mkdir unsigned
cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ cp $OUTDIR/nyc3-*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 - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip 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}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip
+1 -1
View File
@@ -13,7 +13,7 @@ You will need the following dependencies, which can be installed as root via pkg
```shell ```shell
pkg install autoconf automake boost-libs git gmake libevent libtool openssl pkgconf pkg install autoconf automake boost-libs git gmake libevent libtool openssl pkgconf
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
In order to run the test suite (recommended), you will need to have Python 3 installed: In order to run the test suite (recommended), you will need to have Python 3 installed:
+1 -1
View File
@@ -22,7 +22,7 @@ libtool
pkg-config pkg-config
python37 python37
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
See [dependencies.md](dependencies.md) for a complete overview. See [dependencies.md](dependencies.md) for a complete overview.
+1 -1
View File
@@ -17,7 +17,7 @@ pkg_add autoconf # (select highest version, e.g. 2.69)
pkg_add automake # (select highest version, e.g. 1.16) pkg_add automake # (select highest version, e.g. 1.16)
pkg_add python # (select highest version, e.g. 3.6) pkg_add python # (select highest version, e.g. 3.6)
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
``` ```
See [dependencies.md](dependencies.md) for a complete overview. See [dependencies.md](dependencies.md) for a complete overview.
+1 -1
View File
@@ -244,7 +244,7 @@ Setup and Build Example: Arch Linux
This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux: This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux:
pacman -S git base-devel boost libevent python pacman -S git base-devel boost libevent python
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
cd bitcoin/ cd bitcoin/
./autogen.sh ./autogen.sh
./configure --disable-wallet --without-gui --without-miniupnpc ./configure --disable-wallet --without-gui --without-miniupnpc
+2 -2
View File
@@ -89,7 +89,7 @@ This means you cannot use a directory that is located directly on the host Windo
Acquire the source in the usual way: Acquire the source in the usual way:
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
Once the source code is ready the build steps are below: Once the source code is ready the build steps are below:
@@ -117,7 +117,7 @@ This means you cannot use a directory that located directly on the host Windows
Acquire the source in the usual way: Acquire the source in the usual way:
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
Then build using: Then build using:
+1 -1
View File
@@ -38,7 +38,7 @@ Check out the source code in the following directory hierarchy.
git clone https://github.com/bitcoin-core/gitian.sigs.git git clone https://github.com/bitcoin-core/gitian.sigs.git
git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git
git clone https://github.com/devrandom/gitian-builder.git git clone https://github.com/devrandom/gitian-builder.git
git clone https://github.com/bitcoin/bitcoin.git git clone https://github.com/nyc3coin/nyc3
### Bitcoin maintainers/release engineers, suggestion for writing release notes ### Bitcoin maintainers/release engineers, suggestion for writing release notes