rpms/realtime-setup
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add srpm target and sync version style between Makefile and specfile

Browse Source 
Remove dropped package 'annobin' as build requirement
sync Makefile and specfile versioning

Signed-off-by: Clark Williams <williams@redhat.com>

Signed-off-by: Clark Williams <williams@redhat.com>
This commit is contained in:
Clark Williams 2023-07-05 08:57:36 -05:00
parent 684db02d31
commit 25ad440b2a
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-or-later
VERSION := $(shell awk '/^Version:/ { print $$2 }' realtime-setup.spec) VERSION := $(shell awk '/^Version:/ { print $$2 }' realtime-setup.spec)
$(info "Version: $(VERSION)") $(info "Version: $(VERSION)")
RPMDIR := $(shell pwd)/rpm RPMDIR := $(shell pwd)/rpm
@ -27,21 +28,24 @@ FILES := realtime-setup-kdump \
realtime-setup.service \ realtime-setup.service \
realtime-setup.spec realtime-setup.spec
EXT := bz2
TARBALL := realtime-setup-v$(VERSION).tar.$(EXT)
all: realtime-entsk all: realtime-entsk
realtime-entsk: enable-netsocket-tstamp-static-key.c realtime-entsk: enable-netsocket-tstamp-static-key.c
$(CC) $(CFLAGS) -c enable-netsocket-tstamp-static-key.c $(CC) $(CFLAGS) -c enable-netsocket-tstamp-static-key.c
$(CC) $(LDFLAGS) -o realtime-entsk enable-netsocket-tstamp-static-key.o $(CC) $(LDFLAGS) -o realtime-entsk enable-netsocket-tstamp-static-key.o
rpm: rpmdir tarball rpm: srpm
cp realtime-setup-$(VERSION).tar.bz2 rpm/SOURCES
rpmbuild $(RPMARGS) -ba realtime-setup.spec rpmbuild $(RPMARGS) -ba realtime-setup.spec
rpmdir: rpmdir:
@[ -d rpm ] || mkdir -p rpm/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} @[ -d rpm ] || mkdir -p rpm/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
srpm: clean rpmdir tarball srpm: clean rpmdir tarball
mv realtime-setup-$(VERSION).tar.bz2 rpm/SOURCES mv realtime-setup-v$(VERSION).tar.bz2 rpm/SOURCES
rpmbuild $(RPMARGS) -bs realtime-setup.spec rpmbuild $(RPMARGS) -bs realtime-setup.spec
clean: clean:
@ -50,7 +54,8 @@ clean:
rm -f realtime-entsk *.o rm -f realtime-entsk *.o
tarball: rpmdir tarball: rpmdir
git archive --format=tar --prefix=realtime-setup-$(VERSION)/ HEAD | bzip2 >realtime-setup-$(VERSION).tar.bz2 git archive --format=tar --prefix=realtime-setup-v$(VERSION)/ HEAD | \
bzip2 >realtime-setup-v$(VERSION).tar.bz2
install: install:
install -m 755 -D realtime-setup-kdump $(DEST)/usr/bin/realtime-setup-kdump install -m 755 -D realtime-setup-kdump $(DEST)/usr/bin/realtime-setup-kdump

12
realtime-setup.spec
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
Name: realtime-setup Name: realtime-setup
Version: 2.2.3 Version: 2.3.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Summary: Setup RT/low-latency environment details Summary: Setup RT/low-latency environment details
@ -10,7 +11,6 @@ BuildRequires: gcc
BuildRequires: make BuildRequires: make
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: annobin
Requires: pam Requires: pam
Requires: kexec-tools Requires: kexec-tools
Requires: tuna Requires: tuna
@ -71,9 +71,15 @@ Neither the slub script or realtime-entsk are active by default.
%{_unitdir}/realtime-setup.service %{_unitdir}/realtime-setup.service
%{_bindir}/realtime-setup %{_bindir}/realtime-setup
%{_unitdir}/realtime-entsk.service %{_unitdir}/realtime-entsk.service
%license gpl-2.0.txt %{_bindir}/realtime-setup-kdump
%changelog %changelog
* Wed Jul 05 2023 Clark Williams <williams@redhatcom> - 2.3.1-1
- Remove build require of annobin package
- Update all files with SPDX identifier
- add srpm target in Makefile
- fix versioning in Makefile targets and specfile
* Thu Jul 14 2022 Jiri Kastner<jkastner@fedoraproject.org> - 2.2.3-1 * Thu Jul 14 2022 Jiri Kastner<jkastner@fedoraproject.org> - 2.2.3-1
- polish source url - polish source url