diff options
author | Rick Elrod <rick@elrod.me> | 2020-05-15 20:29:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-15 20:29:05 -0500 |
commit | 3dedf95dbdf1fa170ad7256bc2dfa2a12228bc32 (patch) | |
tree | 6d04725d857b108483319d2cbb755fddfb8bf6d6 /Makefile | |
parent | c495c92a6e0d2b094588e1de517f20c3394e4889 (diff) | |
download | ansible-3dedf95dbdf1fa170ad7256bc2dfa2a12228bc32.tar.gz |
Remove RPM packaging infrastructure (#69554)
Change:
- Nuke `make rpm` and friends from Makefile
- Nuke packaging/rpm
We are no longer going to be pushing RPMs to releases.ansible.com
post-2.10, so this is no longer necessary for us, and users should
prefer RPMs from their distro instead.
Test Plan:
Grepped the Makefile for all of: /rpm/i, /mock/i, /fedora/i
Tickets:
Refs #69539
Signed-off-by: Rick Elrod <rick@elrod.me>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 108 |
1 files changed, 0 insertions, 108 deletions
@@ -6,8 +6,6 @@ # make clean ---------------- clean up # make webdocs -------------- produce ansible doc at docs/docsite/_build/html # make sdist ---------------- produce a tarball -# make srpm ----------------- produce a SRPM -# make rpm ----------------- produce RPMs # make deb-src -------------- produce a DEB source # make deb ------------------ produce a DEB # make docs ----------------- rebuild the manpages (results are checked in) @@ -35,20 +33,12 @@ endif PYTHON=python GENERATE_CLI = hacking/build-ansible.py generate-man -SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - # fetch version from project release.py as single source-of-truth VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --raw || echo error) ifeq ($(findstring error,$(VERSION)), error) $(error "version_helper failed") endif -MAJOR_VERSION := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --majorversion) -CODENAME := $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --codename) - -# if a specific release was not requested, set to 1 (RPMs have "fancier" logic for this further down) -RELEASE ?= 1 - # Get the branch information from git ifneq ($(shell which git),) GIT_DATE := $(shell git log -n 1 --format="%ci") @@ -98,32 +88,6 @@ PBUILDER_CACHE_DIR = /var/cache/pbuilder PBUILDER_BIN ?= pbuilder PBUILDER_OPTS ?= --debootstrapopts --variant=buildd --architecture $(PBUILDER_ARCH) --debbuildopts -b -# RPM build parameters -RPMSPECDIR= packaging/rpm -RPMSPEC = $(RPMSPECDIR)/ansible.spec -RPMDIST = $(shell rpm --eval '%{?dist}') - -ifneq ($(OFFICIAL),yes) - RPMRELEASE = 100.git$(DATE)$(GITINFO) -endif -ifeq ($(PUBLISH),nightly) - # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots - RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH) -endif - -RPMVERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --baseversion) -RPMRELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --rpmrelease) -RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)$(REPOTAG)" - -# MOCK build parameters -MOCK_BIN ?= mock -MOCK_CFG ?= - -# dynamically add repotag define only if specified -ifneq ($(REPOTAG),) - EXTRA_RPM_DEFINES += --define "repotag $(REPOTAG)" -endif - # ansible-test parameters ANSIBLE_TEST ?= bin/ansible-test TEST_FLAGS ?= @@ -189,8 +153,6 @@ clean: rm -f test/units/.coverage* rm -rf test/results/*/* find test/ -type f -name '*.retry' -delete - @echo "Cleaning up RPM building stuff" - rm -rf MANIFEST rpm-build @echo "Cleaning up Debian building stuff" rm -rf debian rm -rf deb-build @@ -235,76 +197,6 @@ sdist_upload: clean docs changelog: PYTHONPATH=./lib packaging/release/changelogs/changelog.py release -vv && PYTHONPATH=./lib packaging/release/changelogs/changelog.py generate -vv -.PHONY: rpmcommon -rpmcommon: sdist - @mkdir -p rpm-build - @cp dist/*.gz rpm-build/ - @cp $(RPMSPEC) rpm-build/$(NAME).spec - -.PHONY: mock-srpm -mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon - $(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/ \ - --define "rpmversion $(RPMVERSION)" \ - --define "upstream_version $(VERSION)" \ - --define "rpmrelease $(RPMRELEASE)" \ - $(EXTRA_RPM_DEFINES) - @echo "#############################################" - @echo "Ansible SRPM is built:" - @echo rpm-build/*.src.rpm - @echo "#############################################" - -.PHONY: mock-rpm -mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm - $(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --bootstrap-chroot --old-chroot --rebuild rpm-build/$(NAME)-*.src.rpm \ - --define "rpmversion $(RPMVERSION)" \ - --define "upstream_version $(VERSION)" \ - --define "rpmrelease $(RPMRELEASE)" \ - $(EXTRA_RPM_DEFINES) - @echo "#############################################" - @echo "Ansible RPM is built:" - @echo rpm-build/*.noarch.rpm - @echo "#############################################" - -.PHONY: srpm -srpm: rpmcommon - @rpmbuild --define "_topdir %(pwd)/rpm-build" \ - --define "_builddir %{_topdir}" \ - --define "_rpmdir %{_topdir}" \ - --define "_srcrpmdir %{_topdir}" \ - --define "_specdir $(RPMSPECDIR)" \ - --define "_sourcedir %{_topdir}" \ - --define "upstream_version $(VERSION)" \ - --define "rpmversion $(RPMVERSION)" \ - --define "rpmrelease $(RPMRELEASE)" \ - $(EXTRA_RPM_DEFINES) \ - -bs rpm-build/$(NAME).spec - @rm -f rpm-build/$(NAME).spec - @echo "#############################################" - @echo "Ansible SRPM is built:" - @echo " rpm-build/$(RPMNVR).src.rpm" - @echo "#############################################" - -.PHONY: rpm -rpm: rpmcommon - @rpmbuild --define "_topdir %(pwd)/rpm-build" \ - --define "_builddir %{_topdir}" \ - --define "_rpmdir %{_topdir}" \ - --define "_srcrpmdir %{_topdir}" \ - --define "_specdir $(RPMSPECDIR)" \ - --define "_sourcedir %{_topdir}" \ - --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ - --define "__python `which $(PYTHON)`" \ - --define "upstream_version $(VERSION)" \ - --define "rpmversion $(RPMVERSION)" \ - --define "rpmrelease $(RPMRELEASE)" \ - $(EXTRA_RPM_DEFINES) \ - -ba rpm-build/$(NAME).spec - @rm -f rpm-build/$(NAME).spec - @echo "#############################################" - @echo "Ansible RPM is built:" - @echo " rpm-build/$(RPMNVR).noarch.rpm" - @echo "#############################################" - .PHONY: debian debian: sdist @for DIST in $(DEB_DIST) ; do \ |