Skip to content

Commit 10356a2

Browse files
committed
remove unused stuff
1 parent 422dcb3 commit 10356a2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/docker-images/openwrt-x64-openjdk8/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN mkdir -p /usr/local/bin
77
RUN opkg update
88

99
# packages in openwrt
10-
RUN opkg install git-http ca-bundle curl python3 python3-pip gcc make bash sudo perl perlbase-essential
10+
RUN opkg install git-http ca-bundle curl python3 python3-pip gcc make bash sudo perl
1111

1212
# packages we have to get from alpine
1313

@@ -36,4 +36,6 @@ RUN ar -rc /usr/lib/libm.a
3636
###############################################################################
3737
# Install entrypoint
3838
###############################################################################
39-
RUN perl --version
39+
ADD entrypoint.sh /usr/local/bin/builder
40+
RUN chmod a+x /usr/local/bin/builder
41+
ENTRYPOINT ["/usr/local/bin/builder"]

builder/imports/awslc.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'targets': ['linux', 'android'],
1212
'test_steps': [],
1313
'build_tests': False,
14-
'cmake_args': ['-DFIPS=ON', '-DBUILD_LIBSSL=OFF']
14+
'cmake_args': ['-DDISABLE_GO=ON', '-DBUILD_LIBSSL=OFF']
1515
}
1616

1717

@@ -23,7 +23,6 @@ def __init__(self, **kwargs):
2323
library=True,
2424
account='aws',
2525
name='aws-lc',
26-
imports=['golang'],
2726
config=config,
2827
**kwargs)
2928

@@ -51,7 +50,6 @@ def __init__(self, **kwargs):
5150
super().__init__(
5251
account='aws',
5352
name='aws-lc',
54-
imports=['golang'],
5553
**config,
5654
**kwargs)
5755

@@ -61,4 +59,4 @@ def cmake_args(self, env):
6159
# Not disable PERL for old GCC to avoid the pre-compiled binary with AVX512
6260
return super().cmake_args(env) + ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON']
6361
else:
64-
return super().cmake_args(env)
62+
return super().cmake_args(env)+ ['-DDISABLE_PERL=ON']

0 commit comments

Comments
 (0)