Skip to content

Commit

Permalink
Minimizing changes from Nitrokey#1 to at least reuse the musl-cross c…
Browse files Browse the repository at this point in the history
…ache on CI. Removed x230-hotp-verification changes to hack it more up to review Nitrokey PR against heads' current master
  • Loading branch information
tlaurion committed Aug 22, 2020
1 parent 2be02f3 commit 76d3d20
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Install dependencies
command: |
apt update
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev doxygen graphviz udev libudev1 libudev-dev automake libtool
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev
- checkout

- run:
Expand Down
4 changes: 2 additions & 2 deletions boards/x230-hotp-verification/x230-hotp-verification.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CONFIG_PCIUTILS=y
CONFIG_POPT=y
CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y
CONFIG_DROPBEAR=n
CONFIG_DROPBEAR=y
CONFIG_NKSTORECLI=y

#CONFIG_SLANG=y
Expand All @@ -29,7 +29,7 @@ CONFIG_FBWHIPTAIL=y
CONFIG_HOTPKEY=y

CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=n
CONFIG_LINUX_E1000E=y

export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init
Expand Down
5 changes: 2 additions & 3 deletions modules/musl-cross
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ musl-cross_target := --version

# Ask the compiler where to find its own libc.so
musl-cross_libraries := \
$(shell $(CROSS)gcc --print-file-name=libc.so)
$(shell $(CROSS)gcc --print-file-name=libc.so) \

else

Expand All @@ -47,8 +47,7 @@ musl-cross_target := \
both

CROSS := $(CROSS_PATH)/bin/x86_64-linux-musl-
musl-cross_libraries := \
$(CROSS_PATH)/x86_64-linux-musl/lib/libc.so
musl-cross_libraries := $(CROSS_PATH)/x86_64-linux-musl/lib/libc.so

endif

Expand Down

0 comments on commit 76d3d20

Please sign in to comment.