diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-11-30 13:35:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 13:35:37 +0100 |
| commit | 01897e85ce899c9649e9e0b60d9cca9d3c5c3273 (patch) | |
| tree | a79b2667787f34989c17a0218a128b1b0cb43e9f | |
| parent | 60fe9565af131821bc100af2e5c4d5852bc0f04a (diff) | |
| parent | 6d93c95476bad6662be68d848998954401a556b1 (diff) | |
Merge pull request #20289 from vespa-engine/hakonhall/strip-vespa-cli
Strip vespa cli
| -rw-r--r-- | dist/vespa.spec | 5 | ||||
| -rw-r--r-- | screwdriver.yaml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index e53444c9d13..83b80c2cbc0 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -554,6 +554,11 @@ cp -r %{installdir} %{buildroot} make install DESTDIR=%{buildroot} cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa %endif +# Otherwise installation may fail for find-debuginfo.sh/dwz: +# dwz: dwz.c:9899: read_dwarf: Assertion `data != ((void *)0) && data->d_buf != ((void *)0)' failed. +%if 0%{?el7} +strip %{buildroot}%{_prefix}/bin/vespa +%endif %if %{_create_vespa_service} mkdir -p %{buildroot}/usr/lib/systemd/system diff --git a/screwdriver.yaml b/screwdriver.yaml index 93fe3a934c3..597f5f2678e 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -139,9 +139,6 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) - git --version - which git - go version time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin time ./bootstrap.sh java time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install |