diff options
| author | Gilles Buloz <gilles.buloz@kontron.com> | 2020-06-24 14:55:22 +0200 |
|---|---|---|
| committer | Alexander Amelkin <mocbuhtig@amelkin.msk.ru> | 2020-07-04 01:48:50 +0300 |
| commit | 8838e4b0e258f953a38c8913db63747009997b1f (patch) | |
| tree | 49cee3031edb57869e0b40a807dbf9304b9af889 | |
| parent | 055719b7b931c21576d778257a6b0f9c2964ece7 (diff) | |
| download | ipmitool-8838e4b0e258f953a38c8913db63747009997b1f.tar.gz | |
RPM support: fixed broken RPM build
The command "make rpm" was failing for the following reasons :
- setting the build directory to ./rpmbuild/ instead of default
~/rpmbuild/ was ignored.
- errors in the spec file : wrong dates and characters in the
changelog, and unpackaged files under misc/*
- debug package built even if unneeded but failing to build because
of missing requisites.
Using "rpmbuild -tb ipmitool-*.tar.gz" instead of 'make rpm" builds
under ~/rpmbuild/ but also fails because of the last two reasons.
Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | control/ipmitool.spec.in | 9 | ||||
| -rw-r--r-- | control/rpmmacros.in | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 2d19374..4fdb3c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,8 +104,10 @@ RPMDIR = $(BUILDDIR)/rpmbuild rpm: control/ipmitool.spec dist mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp} cp control/ipmitool.spec $(RPMDIR)/SPECS - BUILDDIR=$(RPMDIR) CONFIGDIR=$(BUILDDIR)/control \ - @RPMBUILD@ -ba --rcfile $(SRCDIR)/control/rpmrc \ + cp $(distdir).tar.gz $(RPMDIR)/SOURCES + CONFIGDIR=$(BUILDDIR)/control \ + @RPMBUILD@ -ba --define "_topdir $(RPMDIR)" \ + --rcfile $(SRCDIR)/control/rpmrc \ $(RPMDIR)/SPECS/ipmitool.spec .PHONY: clean-rpm diff --git a/control/ipmitool.spec.in b/control/ipmitool.spec.in index 85e61f9..31a7171 100644 --- a/control/ipmitool.spec.in +++ b/control/ipmitool.spec.in @@ -1,3 +1,5 @@ +%define debug_package %{nil} + Name: ipmitool Summary: ipmitool - Utility for IPMI control Version: @VERSION@ @@ -56,6 +58,7 @@ fi %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/* %{_datadir}/ipmitool/* +%{_datadir}/misc/* %{_mandir}/man*/* %doc %{_datadir}/doc/ipmitool @@ -257,7 +260,7 @@ fi - Make ipmievd generate pidfile - Add initscripts for ipmievd -* Mon Jan 17 2006 <duncan@iceblink.org> 1.8.6-1 +* Tue Jan 17 2006 <duncan@iceblink.org> 1.8.6-1 - Fix memory corruption when sending encrypted SOL traffic - Add keepalive timer to IPMIv2 SOL sessions @@ -325,7 +328,7 @@ fi - new "shell" and "exec" commands - lots of other contributed patches -* Sat May 27 2004 <duncan@iceblink.org> 1.5.9-1 +* Thu May 27 2004 <duncan@iceblink.org> 1.5.9-1 - Add ability to get a particular sensor by name - Add ability to set a particular sensor threshold - Add support for displaying V2 channel authentication levels @@ -359,7 +362,7 @@ fi - Fix SEL event decoding for generic events - Handle empty SEL gracefully when doing "sel list" - Fix sdr handling of sensors that do not return a reading - - Fix for CSV display of sensor readings/units from Fredrik Öhrn + - Fix for CSV display of sensor readings/units from Fredrik Öhrn * Tue Nov 25 2003 <duncan@iceblink.org> 1.5.5-1 - Add -U option for setting LAN username diff --git a/control/rpmmacros.in b/control/rpmmacros.in index 429e098..09883a6 100644 --- a/control/rpmmacros.in +++ b/control/rpmmacros.in @@ -1,4 +1,3 @@ -%_topdir %(echo $BUILDDIR) %_sourcedir %{_topdir}/.. %_specdir %{_sourcedir} %_tmppath %{_topdir}/tmp |