Skip to content

Commit 2d03596

Browse files
zhangsoledadzhangsoledad
authored
Merge pull request #4320 from eval-exec/exec/enable-openssl-vendored
Enable the `openssl-vendored` feature for the `tentacle` package to allow CKB to statically link with OpenSSL.
2 parents ecda90b + 21999c8 commit 2d03596

File tree

3 files changed

+13
-69
lines changed

3 files changed

+13
-69
lines changed

‎.github/workflows/package.yaml

+2-68
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
6262
run: |
6363
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
64-
docker run --rm -i -w /ckb -v $(pwd):/ckb -e OPENSSL_STATIC=1 -e OPENSSL_LIB_DIR=/usr/local/lib64 -e OPENSSL_INCLUDE_DIR=/usr/local/include $BUILDER_IMAGE make ${{ matrix.build_target }}
64+
docker run --rm -i -w /ckb -v $(pwd):/ckb -e $BUILDER_IMAGE make ${{ matrix.build_target }}
6565
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
6666
gpg --import devtools/ci/signer.asc
6767
devtools/ci/package.sh target/prod/ckb
@@ -94,24 +94,6 @@ jobs:
9494
run: rustup target add aarch64-unknown-linux-gnu
9595
- name: Install dependencies
9696
run: sudo apt-get update && sudo apt-get install -y gcc-multilib && sudo apt-get install -y build-essential clang gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
97-
- name: Install OpenSSL
98-
run: |
99-
mkdir target && cd target
100-
101-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz
102-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.asc
103-
104-
gpg --keyserver keys.openpgp.org --recv-keys EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
105-
gpg --verify openssl-3.1.3.tar.gz.asc openssl-3.1.3.tar.gz
106-
107-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.sha256
108-
echo $(cat openssl-3.1.3.tar.gz.sha256) openssl-3.1.3.tar.gz | sha256sum --check
109-
110-
tar -xzf openssl-3.1.3.tar.gz
111-
cd openssl-3.1.3
112-
CC=aarch64-linux-gnu-gcc ./Configure --prefix=$(pwd)/openssl-3.1.3/build linux-aarch64 no-shared
113-
CC=aarch64-linux-gnu-gcc make -j $(nproc)
114-
CC=aarch64-linux-gnu-gcc make -j $(nproc) install_sw
11597
- name: Build CKB and Package CKB
11698
env:
11799
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
@@ -122,10 +104,6 @@ jobs:
122104
run: |
123105
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
124106
125-
export OPENSSL_DIR=$(pwd)/target/openssl-3.1.3/build
126-
export OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include
127-
export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib64
128-
export OPENSSL_STATIC=1
129107
PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc CKB_BUILD_TARGET="--target=aarch64-unknown-linux-gnu" make prod_portable
130108
131109
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
@@ -168,7 +146,7 @@ jobs:
168146
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
169147
run: |
170148
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
171-
docker run --rm -i -w /ckb -v $(pwd):/ckb -e OPENSSL_STATIC=1 -e OPENSSL_LIB_DIR=/usr/local/lib64 -e OPENSSL_INCLUDE_DIR=/usr/local/include $BUILDER_IMAGE make ${{ matrix.build_target }}
149+
docker run --rm -i -w /ckb -v $(pwd):/ckb -e $BUILDER_IMAGE make ${{ matrix.build_target }}
172150
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
173151
gpg --import devtools/ci/signer.asc
174152
devtools/ci/package.sh target/prod/ckb
@@ -204,35 +182,13 @@ jobs:
204182
run: |
205183
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
206184
echo "GIT_TAG_NAME=$GIT_TAG_NAME" >> $GITHUB_ENV
207-
- name: Install Dependencies
208-
run: |
209-
mkdir target && cd target
210-
211-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz
212-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.asc
213-
214-
gpg --keyserver keys.openpgp.org --recv-keys EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
215-
gpg --verify openssl-3.1.3.tar.gz.asc openssl-3.1.3.tar.gz
216-
217-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.sha256
218-
echo $(cat openssl-3.1.3.tar.gz.sha256) openssl-3.1.3.tar.gz | sha256sum --check
219-
220-
tar -xzf openssl-3.1.3.tar.gz
221-
cd openssl-3.1.3
222-
./Configure --prefix=$(pwd)/openssl-3.1.3/build no-shared
223-
make
224-
make install_sw
225185
- name: Build CKB and Package CKB
226186
env:
227187
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
228188
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
229189
run: |
230190
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
231191
232-
export OPENSSL_DIR=$(pwd)/target/openssl-3.1.3/build
233-
export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib
234-
export OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include
235-
export OPENSSL_STATIC=1
236192
make ${{ matrix.build_target }}
237193
238194
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
@@ -282,35 +238,13 @@ jobs:
282238
if ! [ -f "$HOME/.cargo/bin/rustup" ]; then
283239
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
284240
fi
285-
286-
mkdir target && cd target
287-
288-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz
289-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.asc
290-
291-
gpg --keyserver keys.openpgp.org --recv-keys EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5
292-
gpg --verify openssl-3.1.3.tar.gz.asc openssl-3.1.3.tar.gz
293-
294-
curl -LO https://www.openssl.org/source/openssl-3.1.3.tar.gz.sha256
295-
echo $(cat openssl-3.1.3.tar.gz.sha256) openssl-3.1.3.tar.gz | sha256sum --check
296-
297-
tar -xzf openssl-3.1.3.tar.gz
298-
cd openssl-3.1.3
299-
./Configure --prefix=$(pwd)/openssl-3.1.3/build no-shared
300-
make
301-
make install_sw
302-
303241
- name: Build CKB and Package CKB
304242
env:
305243
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
306244
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
307245
run: |
308246
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
309247
310-
export OPENSSL_DIR=$(pwd)/target/openssl-3.1.3/build
311-
export OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib
312-
export OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include
313-
export OPENSSL_STATIC=1
314248
make ${{ matrix.build_target }}
315249
316250
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg

‎Cargo.lock

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎network/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ckb-spawn = { path = "../util/spawn", version = "= 0.114.0-pre" }
3636
socket2 = "0.4"
3737
bitflags = "1.0"
3838

39-
p2p = { version="0.4.0", package="tentacle", features = ["upnp", "parking_lot"] }
39+
p2p = { version="0.4.0", package="tentacle", features = ["upnp", "parking_lot", "openssl-vendored"] }
4040

4141
[features]
4242
with_sentry = ["sentry"]

0 commit comments

Comments
 (0)