>From 07371fae4842d85587b2c4f9085d301c30481ecc Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@xxxxxxxxxx>
Date: Thu, 22 Oct 2015 17:30:52 +0200
Subject: [PATCH 3/3] Makefile: Remove anything to do with rpms, specs etc
Remove anything to do with rpm, spec, release and so on that should be
maintained in distribution specific ways. One exception is make tarball,
which is useful in a more general way.
Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
---
Makefile | 56 +++-----------------------------------------------------
1 file changed, 3 insertions(+), 53 deletions(-)
diff --git a/Makefile b/Makefile
index 1e4b7d1b0d3a..908187202ba3 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ LIBOBJS =$(addprefix $(OBJDIR)/,error.o rt-get_cpu.o rt-sched.o rt-utils.o)
$(OBJDIR)/librttest.a: $(LIBOBJS)
$(AR) rcs $@ $^
-CLEANUP = $(TARGETS) *.o .depend *.*~ *.orig *.rej rt-tests.spec *.d *.a
+CLEANUP = $(TARGETS) *.o .depend *.*~ *.orig *.rej *.d *.a
CLEANUP += $(if $(wildcard .git), ChangeLog)
.PHONY: clean
@@ -153,17 +153,13 @@ clean:
RPMDIRS = BUILD BUILDROOT RPMS SRPMS SPECS
.PHONY: distclean
distclean: clean
- rm -rf $(RPMDIRS) releases *.tar.gz *.tar.asc rt-tests.spec tmp
+ rm -rf $(RPMDIRS) releases *.tar.gz *.tar.asc tmp
.PHONY: rebuild
rebuild:
$(MAKE) clean
$(MAKE) all
-.PHONY: changelog
-changelog:
- git log >ChangeLog
-
.PHONY: install
install: all install_hwlatdetect
mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
@@ -191,56 +187,11 @@ install_hwlatdetect: hwlatdetect
ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
fi
-.PHONY: release
-release: distclean changelog
- mkdir -p releases
- mkdir -p tmp/rt-tests
- cp -r Makefile COPYING ChangeLog MAINTAINERS doc README.markdown src tmp/rt-tests
- rm -f rt-tests-$(VERSION).tar rt-tests-$(VERSION).tar.asc
- tar -C tmp -cf rt-tests-$(VERSION).tar rt-tests
- gpg2 --default-key clrkwllms@xxxxxxxxxx --detach-sign --armor rt-tests-$(VERSION).tar
- gzip rt-tests-$(VERSION).tar
- rm -f ChangeLog
- cp rt-tests-$(VERSION).tar.gz rt-tests-$(VERSION).tar.asc releases
.PHONY: tarball
tarball:
git archive --worktree-attributes --prefix=rt-tests-${VERSION}/ -o rt-tests-${VERSION}.tar v${VERSION}
-.PHONY: push
-push: release
- scripts/do-git-push $(VERSION)
-
-.PHONY: pushtest
-pushtest: release
- scripts/do-git-push --test $(VERSION)
-
-rt-tests.spec: Makefile rt-tests.spec-in
- sed s/__VERSION__/$(VERSION)/ <$@-in >$@
-ifeq ($(NUMA),1)
- sed -i -e 's/__MAKE_NUMA__/NUMA=1/' $@
- sed -i -e 's/__BUILDREQUIRES_NUMA__/numactl-devel/' $@
-else
- sed -i -e 's/__MAKE_NUMA__//' $@
- sed -i -e 's/__BUILDREQUIRES_NUMA__//' $@
-endif
-
-
-HERE := $(shell pwd)
-RPMARGS := --define "_topdir $(HERE)" \
- --define "_sourcedir $(HERE)/releases" \
- --define "_builddir $(HERE)/BUILD" \
-
-.PHONY: rpm
-rpm: rpmdirs release rt-tests.spec
- rpmbuild -ba $(RPMARGS) rt-tests.spec
-
-.PHONY: rpmdirs
-rpmdirs:
- @[ -d BUILD ] || mkdir BUILD
- @[ -d RPMS ] || mkdir RPMS
- @[ -d SRPMS ] || mkdir SRPMS
-
.PHONY: help
help:
@echo ""
@@ -248,10 +199,9 @@ help:
@echo ""
@echo " all : build all tests (default"
@echo " install : install tests to local filesystem"
- @echo " release : build source tarfile"
- @echo " rpm : build RPM package"
@echo " clean : remove object files"
@echo " distclean : remove all generated files"
+ @echo " tarball : make a rt-tests tarball suitable for release
@echo " help : print this message"
.PHONY: tags
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
