From 10356a22c2cfa078fe9a9e0d0eb09a4d37c4564d Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Mon, 19 Feb 2024 21:26:12 +0000 Subject: [PATCH] remove unused stuff --- .github/docker-images/openwrt-x64-openjdk8/Dockerfile | 6 ++++-- builder/imports/awslc.py | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/docker-images/openwrt-x64-openjdk8/Dockerfile b/.github/docker-images/openwrt-x64-openjdk8/Dockerfile index 85fccb29e..05f551e83 100644 --- a/.github/docker-images/openwrt-x64-openjdk8/Dockerfile +++ b/.github/docker-images/openwrt-x64-openjdk8/Dockerfile @@ -7,7 +7,7 @@ RUN mkdir -p /usr/local/bin RUN opkg update # packages in openwrt -RUN opkg install git-http ca-bundle curl python3 python3-pip gcc make bash sudo perl perlbase-essential +RUN opkg install git-http ca-bundle curl python3 python3-pip gcc make bash sudo perl # packages we have to get from alpine @@ -36,4 +36,6 @@ RUN ar -rc /usr/lib/libm.a ############################################################################### # Install entrypoint ############################################################################### -RUN perl --version \ No newline at end of file +ADD entrypoint.sh /usr/local/bin/builder +RUN chmod a+x /usr/local/bin/builder +ENTRYPOINT ["/usr/local/bin/builder"] \ No newline at end of file diff --git a/builder/imports/awslc.py b/builder/imports/awslc.py index b61f5386c..d180f31a9 100644 --- a/builder/imports/awslc.py +++ b/builder/imports/awslc.py @@ -11,7 +11,7 @@ 'targets': ['linux', 'android'], 'test_steps': [], 'build_tests': False, - 'cmake_args': ['-DFIPS=ON', '-DBUILD_LIBSSL=OFF'] + 'cmake_args': ['-DDISABLE_GO=ON', '-DBUILD_LIBSSL=OFF'] } @@ -23,7 +23,6 @@ def __init__(self, **kwargs): library=True, account='aws', name='aws-lc', - imports=['golang'], config=config, **kwargs) @@ -51,7 +50,6 @@ def __init__(self, **kwargs): super().__init__( account='aws', name='aws-lc', - imports=['golang'], **config, **kwargs) @@ -61,4 +59,4 @@ def cmake_args(self, env): # Not disable PERL for old GCC to avoid the pre-compiled binary with AVX512 return super().cmake_args(env) + ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] else: - return super().cmake_args(env) + return super().cmake_args(env)+ ['-DDISABLE_PERL=ON']