diff options
-rw-r--r-- | dist/vespa.spec | 11 | ||||
-rw-r--r-- | screwdriver.yaml | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 8620a26d945..999451314b8 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -6,6 +6,11 @@ # Only strip debug info %global _find_debuginfo_opts -g +# Go binaries' build-ids are not recognized by RPMs yet, see +# https://github.com/rpm-software-management/rpm/issues/367 and +# https://github.com/tpokorra/lbs-mono-fedora/issues/3#issuecomment-219857688. +%undefine _missing_build_ids_terminate_build + # Force special prefix for Vespa %define _prefix /opt/vespa %define _vespa_deps_prefix /opt/vespa-deps @@ -547,8 +552,7 @@ rm -rf %{buildroot} cp -r %{installdir} %{buildroot} %else make install DESTDIR=%{buildroot} -# TODO: Include the vespa program -#cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa +cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa %endif %if %{_create_vespa_service} @@ -766,8 +770,7 @@ fi %dir %{_prefix}/conf/vespa-feed-client %dir %{_prefix}/lib %dir %{_prefix}/lib/jars -# TODO: Include the vespa program -#%{_prefix}/bin/vespa +%{_prefix}/bin/vespa %{_prefix}/bin/vespa-feed-client %{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar diff --git a/screwdriver.yaml b/screwdriver.yaml index 049656b4c00..597f5f2678e 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -139,6 +139,7 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) + 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 cmake3 -DVESPA_UNPRIVILEGED=no . |