diff options
author | Damjan Marion <damarion@cisco.com> | 2018-08-02 22:19:21 +0200 |
---|---|---|
committer | Damjan Marion <damarion@cisco.com> | 2018-08-02 23:39:18 +0200 |
commit | c76d6e2c4a659f3d142274561b50507e85412fca (patch) | |
tree | fe1b617abb783f15f5fa1691a860a5b9803f7c3f | |
parent | 9686eacfa4eb7ed136ab52e1db7c8586faba2318 (diff) |
Temporrary disable japi packaging for opensuse
To unbreak verify job, caused by following message:
19:06:58 RPM build errors:
19:06:58 File not found: /w/workspace/vpp-verify-master-osleap15/build-root/rpmbuild/BUILDROOT/vpp-18.10-rc0~105_g0578e3f9~b1992.x86_64/usr/share/java/*
19:06:58 make[2]: *** [Makefile:50: RPM] Error 1
19:06:58 make[2]: Leaving directory '/w/workspace/vpp-verify-master-osleap15/extras/rpm'
19:06:58 make[1]: *** [Makefile:476: pkg-rpm] Error 2
19:06:58 make[1]: Leaving directory '/w/workspace/vpp-verify-master-osleap15'
19:06:58 make: *** [Makefile:541: verify] Error 2
19:06:58 Build step 'Execute shell' marked build as failure
Change-Id: Ie1300cbf70bedb9dd861a3f31feeddf1eb810eaf
Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r-- | extras/rpm/vpp-suse.spec | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index 7fea9fe5331..3da2383218c 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -125,17 +125,17 @@ Provides: %{name}-any-api-lua = %{version} %description api-lua This package contains the lua bindings for the vpp api -%package api-java -Summary: VPP api java bindings -Group: Development/Libraries/Java -Requires: %{lname} = %{version} -Requires: %{name} = %{version} -Requires: %{name}-devel = %{version} -Conflicts: otherproviders(%{name}-any-api-java) -Provides: %{name}-any-api-java = %{version} - -%description api-java -This package contains the java bindings for the vpp api +#%package api-java +#Summary: VPP api java bindings +#Group: Development/Libraries/Java +#Requires: %%{lname} = %%{version} +#Requires: %%{name} = %%{version} +#Requires: %%{name}-devel = %%{version} +#Conflicts: otherproviders(%%{name}-any-api-java) +#Provides: %%{name}-any-api-java = %%{version} + +#%description api-java +#This package contains the java bindings for the vpp api %package api-python Summary: VPP api python bindings @@ -226,11 +226,11 @@ do done # Java bindings -mkdir -p -m755 %{buildroot}%{_datadir}/java -for file in $(find %{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print ) -do - install -p -m 644 $file %{buildroot}%{_datadir}/java -done +#mkdir -p -m755 %{buildroot}%{_datadir}/java +#for file in $(find %{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print ) +#do +# install -p -m 644 $file %{buildroot}%{_datadir}/java +#done # Python bindings cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_install} @@ -257,11 +257,11 @@ do done done -mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen -install -p -m755 %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin -for i in $(ls %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do - install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen -done; +#mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen +#install -p -m755 %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin +#for i in $(ls %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do +# install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen +#done; # sample plugin mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/sample-plugin/sample @@ -333,20 +333,20 @@ export NO_BRP_CHECK_RPATH=true %files api-lua %{_datadir}/doc/vpp/examples/lua -%files api-java -%{_datadir}/java/* +#%files api-java +#%%{_datadir}/java/* %files api-python %dir %{python_sitelib}/vpp_papi* %{python_sitelib}/vpp_papi* %files devel -%dir %{python_sitelib}/jvppgen -%{python_sitelib}/jvppgen/* +#%dir %{python_sitelib}/jvppgen +#%{python_sitelib}/jvppgen/* %dir %{_datadir}/doc/vpp %dir %{_datadir}/doc/vpp/examples %{_libdir}/*.so -%{_bindir}/jvpp_gen.py +#%{_bindir}/jvpp_gen.py %{_includedir}/* %{_datadir}/doc/vpp/examples/sample-plugin %dir %{_datadir}/vpp |