Skip to content

Commit

Permalink
ci: added depends options for enclave targets
Browse files Browse the repository at this point in the history
ci: updated OP-TEE target for ARMv8 QEMU
depends: added enclave options for yubikey and libusb
  • Loading branch information
edtubbs committed Nov 12, 2024
1 parent 4d7df9c commit 7ed4325
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run-tests: true
run-container: true
packages: g++-aarch64-linux-gnu qemu-user-static qemu-user
dep-opts: "CROSS_COMPILE='yes' SPEED=slow V=1"
dep-opts: "CROSS_COMPILE='yes' SPEED=slow OPTEE=yes V=1"
config-opts: "LIBS=-levent_pthreads --enable-static --disable-shared --enable-test-passwd --enable-optee CFLAGS=-U_FORTIFY_SOURCE"
goal: install
- name: aarch64-android
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
run-tests: true
run-container: true
packages: python3-dev python3-dbg python
dep-opts: "DEBUG=1 SPEED=slow V=1"
dep-opts: "DEBUG=1 SPEED=slow OE=yes V=1"
config-opts: "--enable-openenclave --enable-test-passwd CFLAGS=-U_FORTIFY_SOURCE"
goal: install
- name: x86_64-macos
Expand Down
2 changes: 2 additions & 0 deletions depends/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ NO_QT ?=
NO_WALLET ?=
NO_UPNP ?=
MULTIPROCESS ?=
OPTEE ?=
OE ?=
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources

BUILD = $(shell ./config.guess)
Expand Down
10 changes: 9 additions & 1 deletion depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:=libevent libunistring libyubikey libusb ykpers
packages:=libevent libunistring
native_packages := native_ccache

wallet_packages=
Expand All @@ -15,3 +15,11 @@ darwin_native_packages+= native_clang
endif

endif

ifneq ($(OPTEE),)
packages+= libyubikey libusb ykpers
endif

ifneq ($(OE),)
packages+= libyubikey libusb ykpers
endif

0 comments on commit 7ed4325

Please sign in to comment.