0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-28 22:52:30 +00:00

RPM: Added elfutils-libelf-devel for build with eBPF ()

Find issue with x86_64 mock build

```bash
+ /builddir/build/BUILD/netdata-v1.38.1/packaging/bundle-libbpf.sh /builddir/build/BUILD/netdata-v1.38.1 centos8
cp: cannot stat '/builddir/build/BUILD/netdata-v1.38.1/packaging/current_libbpf.checksums': No such file or directory
cp: cannot stat '/builddir/build/BUILD/netdata-v1.38.1/packaging/current_libbpf.version': No such file or directory
v1.1_netdata.tar.gz: OK
make: Entering directory '/builddir/build/BUILD/netdata-v1.38.1/externaldeps/libbpf/libbpf-1.1_netdata/src'
Package libelf was not found in the pkg-config search path.
Perhaps you should add the directory containing `libelf.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libelf', required by 'virtual:world', not found
  MKDIR    build//staticobjs
  CC       build//staticobjs/bpf.o
  CC       build//staticobjs/btf.o
btf.c:18:10: fatal error: gelf.h: No such file or directory
 #include <gelf.h>
          ^~~~~~~~
compilation terminated.
make: *** [Makefile:131: build//staticobjs/btf  .o] Error 1
make: Leaving directory '/builddir/build/BUILD/netdata-v1.38.1/externaldeps/libbpf/libbpf-1.1_netdata/src'
error: Bad exit status from /var/tmp/rpm-tmp.2itZZI (%prep)
RPM build errors:
    bogus date in %changelog: Wed Feb 03 2022 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-16
    Bad exit status from /var/tmp/rpm-tmp.2itZZI (%prep)
Child return code was: 1
```

The conditional BuildDeps fixed this issue
This commit is contained in:
Konstantin Shalygin 2023-03-14 20:09:40 +07:00 committed by GitHub
parent 127538a838
commit ce664af13d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -185,9 +185,19 @@ Requires(pre): /usr/sbin/useradd
# #####################################################################
# Functionality-dependent package dependencies
# #####################################################################
# Note: Some or all of the Packages may be found in the EPEL repo,
# Note: Some or all of the Packages may be found in the EPEL repo,
# rather than the standard ones
# epbf dependencies
%if 0%{?_have_ebpf}
%if 0%{?suse_version}
BuildRequires: libelf-devel
%else
BuildRequires: elfutils-libelf-devel
%endif
%endif
# end - ebpf dependencies
# nfacct plugin dependencies
BuildRequires: libmnl-devel
%if 0%{?fedora} || 0%{?suse_version} >= 1140
@ -565,14 +575,16 @@ Requires: netdata = %{version}
%description plugin-freeipmi
The IPMI specification defines a set of interfaces for platform management.
It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
%files plugin-freeipmi
%attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
%changelog
* Wed Feb 03 2022 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-16
* Thu Feb 16 2023 Konstantin Shalygin <k0ste@k0ste.ru> 0.0.0-17
- Added eBPF build dependency
* Fri Feb 03 2022 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-16
- Bundle updater script in native packages.
* Mon Oct 11 2021 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-15
- Remove support code for legacy ACLK implementation.
@ -609,9 +621,8 @@ First draft refactor on package dependencies section
* Wed Jan 02 2019 Pawel Krupa <pkrupa@redhat.com> - 0.0.0-3
- Temporary set version statically
- Fix changelog ordering
- Comment-out node.d configuration directory
- Comment-out node.d configuration directory
* Wed Jan 02 2019 Pawel Krupa <pkrupa@redhat.com> - 0.0.0-2
- Fix permissions for log files
* Sun Nov 15 2015 Alon Bar-Lev <alonbl@redhat.com> - 0.0.0-1
- Initial add.