deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RPM support: simplified build process

Browse Source 
Simplified target "rpm" of Makefile, and removed rpmrc and rpmmacros to use
default settings and those from the spec file such as Distribution that has
been changed to "GitHub Build" instead of "Sourceforge Build".

Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>
This commit is contained in:
Gilles Buloz 2020-06-24 14:55:28 +02:00 committed by Alexander Amelkin
parent 8838e4b0e2
commit bc13db6304
6 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -101,14 +101,8 @@ SRCDIR = ${shell cd $(top_srcdir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
RPMDIR = $(BUILDDIR)/rpmbuild
.PHONY: rpm
rpm: control/ipmitool.spec dist
mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp}
cp control/ipmitool.spec $(RPMDIR)/SPECS
cp $(distdir).tar.gz $(RPMDIR)/SOURCES
CONFIGDIR=$(BUILDDIR)/control \
@RPMBUILD@ -ba --define "_topdir $(RPMDIR)" \
--rcfile $(SRCDIR)/control/rpmrc \
$(RPMDIR)/SPECS/ipmitool.spec
rpm: dist
@RPMBUILD@ -ta --define "_topdir $(RPMDIR)" $(distdir).tar.gz
.PHONY: clean-rpm
clean-rpm:

1
configure.ac
View File

@ -731,7 +731,6 @@ AC_CONFIG_FILES([Makefile
control/Makefile
control/pkginfo
control/prototype
control/rpmmacros
control/ipmitool.spec
lib/Makefile
include/Makefile

4
control/Makefile.am
View File

@ -31,7 +31,7 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = pkginfo.in prototype.in \
ipmitool.spec.in rpmmacros.in rpmrc
ipmitool.spec.in
dist-hook: pkginfo prototype rpmmacros
dist-hook: pkginfo prototype

3
control/ipmitool.spec.in
View File

@ -6,7 +6,8 @@ Version: @VERSION@
Release: @RPM_RELEASE@%{?_distro:.%{_distro}}
License: BSD
Group: Utilities
Packager: Jim Mankovich <jmank@hp.com>
#Packager: PackagerName <packager@example.com>
Distribution: GitHub Build
Source: %{name}-%{version}.tar.gz
Buildroot: /var/tmp/ipmitool-root

11
control/rpmmacros.in
View File

@ -1,11 +0,0 @@
%_sourcedir %{_topdir}/..
%_specdir %{_sourcedir}
%_tmppath %{_topdir}/tmp
%_builddir %{_topdir}/BUILD
%_buildroot %{_topdir}/%{_tmppath}/%{name}-%{version}-root
%_rpmdir %{_topdir}/RPMS
%_srcrpmdir %{_topdir}/SRPMS
%_distro @DISTRO@
%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
%packager jmank@hp.com
%distribution Sourceforge Build

8
control/rpmrc
View File

@ -1,8 +0,0 @@
macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:%(echo $CONFIGDIR)/rpmmacros
buildarchtranslate: athlon: i386
buildarchtranslate: i686: i386
buildarchtranslate: i586: i386
buildarchtranslate: i486: i386
buildarchtranslate: i386: i386