Hello community, here is the log from the commit of package bcc for openSUSE:Factory checked in at 2018-03-20 22:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcc (Old) and /work/SRC/openSUSE:Factory/.bcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcc" Tue Mar 20 22:00:51 2018 rev:20 rq:588840 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bcc/bcc.changes 2018-03-16 10:44:57.277004547 +0100 +++ /work/SRC/openSUSE:Factory/.bcc.new/bcc.changes 2018-03-20 22:01:17.155681902 +0100 @@ -1,0 +2,7 @@ +Tue Mar 20 03:26:35 UTC 2018 - [email protected] + +- Only enable bcc-lua for openSUSE (bsc#1085810) +- Amend the spec file to enable bps only for Tumbleweed + (bsc#1085403) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcc.spec ++++++ --- /var/tmp/diff_new_pack.phbePm/_old 2018-03-20 22:01:18.279641435 +0100 +++ /var/tmp/diff_new_pack.phbePm/_new 2018-03-20 22:01:18.283641291 +0100 @@ -17,10 +17,14 @@ %define libversion 0.5.0 -%ifarch ppc64 aarch64 ppc64le s390x +%if 0%{?is_opensuse} == 1 +%ifarch %ix86 x86_64 +%{!?with_lua: %global with_lua 1} +%else %{!?with_lua: %global with_lua 0} +%endif %else -%{!?with_lua: %global with_lua 1} +%{!?with_lua: %global with_lua 0} %endif Name: bcc @@ -177,6 +181,11 @@ # Those programs are statically linked and huge in binary size. sed -i "/add_subdirectory(cpp)/d" examples/CMakeLists.txt +# Remove the lua scripts if bcc-lua is disabled +%if %{with_lua} == 0 +sed -i "/add_subdirectory(lua)/d" examples/CMakeLists.txt +%endif + # Install bps to /usr/bin sed -i "s,share/bcc/introspection,bin," introspection/CMakeLists.txt @@ -207,6 +216,11 @@ pushd build make install DESTDIR=%{buildroot} +%if 0%{?suse_version} <= 1500 +# Remove bps due to the incomplete support in kernel (bsc#1085403) +rm -f %{buildroot}/%{_bindir}/bps +%endif + # For python2-bcc (should be removed in the future) cmake -DPYTHON_CMD=python2 .. pushd src/python/ @@ -261,7 +275,9 @@ %{_datadir}/bcc/tools/* %dir %{_datadir}/bcc/man/ %{_datadir}/bcc/man/* +%if 0%{?suse_version} > 1500 %{_bindir}/bps +%endif %files docs %doc README.md FAQ.txt
