From fae0cf4c518236c3c401a94a18406ae5c9043764 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 8 Oct 2021 14:23:59 -0700 Subject: [PATCH] Remove unofficial packaging. Unofficial packaging should be maintained externally since it is not tested in CI or used in the official release process. Maintainers of unofficial packages are better equipped with the necessary expertise and testing resources to support alternative packaging. --- .gitignore | 3 - Makefile | 99 ------------------- .../installation_guide/intro_installation.rst | 6 -- packaging/arch/README.md | 8 -- packaging/debian/Dockerfile | 20 ---- packaging/debian/README.md | 39 -------- packaging/debian/ansible-core.dirs | 4 - packaging/debian/ansible-core.install | 15 --- packaging/debian/ansible-test.install | 2 - packaging/debian/changelog | 5 - packaging/debian/compat | 1 - packaging/debian/control | 29 ------ packaging/debian/copyright | 26 ----- packaging/debian/docs | 1 - packaging/debian/pycompat | 1 - packaging/debian/rules | 9 -- packaging/gentoo/README.md | 3 - packaging/macports/.gitignore | 2 - packaging/macports/README.md | 39 -------- packaging/macports/sysutils/ansible/Portfile | 67 ------------- 20 files changed, 379 deletions(-) delete mode 100644 packaging/arch/README.md delete mode 100644 packaging/debian/Dockerfile delete mode 100644 packaging/debian/README.md delete mode 100644 packaging/debian/ansible-core.dirs delete mode 100644 packaging/debian/ansible-core.install delete mode 100644 packaging/debian/ansible-test.install delete mode 100644 packaging/debian/changelog delete mode 100644 packaging/debian/compat delete mode 100644 packaging/debian/control delete mode 100644 packaging/debian/copyright delete mode 100644 packaging/debian/docs delete mode 100644 packaging/debian/pycompat delete mode 100755 packaging/debian/rules delete mode 100644 packaging/gentoo/README.md delete mode 100644 packaging/macports/.gitignore delete mode 100644 packaging/macports/README.md delete mode 100644 packaging/macports/sysutils/ansible/Portfile diff --git a/.gitignore b/.gitignore index 6c21ad9af9f..bfd1b42a364 100644 --- a/.gitignore +++ b/.gitignore @@ -52,9 +52,6 @@ docs/docsite/searchindex.js docs/docsite/_static/*.gif docs/docsite/_static/*.png docs/docsite/_static/websupport.js -# deb building stuff... -/debian/ -deb-build # Vim swap files *.swp *.swo diff --git a/Makefile b/Makefile index e1664d5da43..b68ba055d60 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,6 @@ # make webdocs -------------- produce ansible doc at docs/docsite/_build/html # make coredocs ------------- produce core doc at docs/docsite/_build/html # make sdist ---------------- produce a tarball -# make deb-src -------------- produce a DEB source -# make deb ------------------ produce a DEB # make docs ----------------- rebuild the manpages (results are checked in) # make gettext -------------- produce POT files for docs # make generate-po ---------- generate language specific po file @@ -64,37 +62,6 @@ endif # Intenationalisation and Localisation LANGUAGES ?= -# DEB build parameters -DEBUILD_BIN ?= debuild -DEBUILD_OPTS = --source-option="-I" -DPUT_BIN ?= dput -DPUT_OPTS ?= -DEB_DATE := $(shell LC_TIME=C date +"%a, %d %b %Y %T %z") -DEB_VERSION ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debversion) -ifeq ($(OFFICIAL),yes) - DEB_RELEASE ?= $(shell $(PYTHON) packaging/release/versionhelper/version_helper.py --debrelease)ppa - # Sign OFFICIAL builds using 'DEBSIGN_KEYID' - # DEBSIGN_KEYID is required when signing - ifneq ($(DEBSIGN_KEYID),) - DEBUILD_OPTS += -k$(DEBSIGN_KEYID) - endif -else - DEB_RELEASE ?= 100.git$(DATE)$(GITINFO) - # Do not sign unofficial builds - DEBUILD_OPTS += -uc -us - DPUT_OPTS += -u -endif -DEBUILD = $(DEBUILD_BIN) $(DEBUILD_OPTS) -DEB_PPA ?= ppa -# Choose the desired Ubuntu release: lucid precise saucy trusty -DEB_DIST ?= unstable - -# pbuilder parameters -PBUILDER_ARCH ?= amd64 -PBUILDER_CACHE_DIR = /var/cache/pbuilder -PBUILDER_BIN ?= pbuilder -PBUILDER_OPTS ?= --debootstrapopts --variant=buildd --architecture $(PBUILDER_ARCH) --debbuildopts -b - # ansible-test parameters ANSIBLE_TEST ?= bin/ansible-test TEST_FLAGS ?= @@ -161,9 +128,6 @@ clean: find test/ -type f -name '*.retry' -delete @echo "Cleaning up symlink cache" rm -f SYMLINK_CACHE.json - @echo "Cleaning up Debian building stuff" - rm -rf debian - rm -rf deb-build rm -rf docs/json rm -rf docs/js @echo "Cleaning up docsite" @@ -205,73 +169,10 @@ sdist_upload: clean docs changelog: PYTHONPATH=./lib antsibull-changelog release -vv --use-ansible-doc && PYTHONPATH=./lib antsibull-changelog generate -vv --use-ansible-doc -.PHONY: debian -debian: sdist - @for DIST in $(DEB_DIST) ; do \ - mkdir -p deb-build/$${DIST} ; \ - tar -C deb-build/$${DIST} -xvf dist/$(NAME)-$(VERSION).tar.gz ; \ - cp -a packaging/debian deb-build/$${DIST}/$(NAME)-$(VERSION)/ ; \ - sed -ie "s|%VERSION%|$(DEB_VERSION)|g;s|%RELEASE%|$(DEB_RELEASE)|;s|%DIST%|$${DIST}|g;s|%DATE%|$(DEB_DATE)|g" deb-build/$${DIST}/$(NAME)-$(VERSION)/debian/changelog ; \ - done - -.PHONY: deb -deb: deb-src - @for DIST in $(DEB_DIST) ; do \ - PBUILDER_OPTS="$(PBUILDER_OPTS) --distribution $${DIST} --basetgz $(PBUILDER_CACHE_DIR)/$${DIST}-$(PBUILDER_ARCH)-base.tgz --buildresult $(CURDIR)/deb-build/$${DIST}" ; \ - $(PBUILDER_BIN) create $${PBUILDER_OPTS} --othermirror "deb http://archive.ubuntu.com/ubuntu $${DIST} universe" ; \ - $(PBUILDER_BIN) update $${PBUILDER_OPTS} ; \ - $(PBUILDER_BIN) build $${PBUILDER_OPTS} deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}.dsc ; \ - done - @echo "#############################################" - @echo "Ansible DEB artifacts:" - @for DIST in $(DEB_DIST) ; do \ - echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \ - done - @echo "#############################################" - -# Build package outside of pbuilder, with locally installed dependencies. -# Install BuildRequires as noted in packaging/debian/control. -.PHONY: local_deb -local_deb: debian - @for DIST in $(DEB_DIST) ; do \ - (cd deb-build/$${DIST}/$(NAME)-$(VERSION)/ && $(DEBUILD) -b) ; \ - done - @echo "#############################################" - @echo "Ansible DEB artifacts:" - @for DIST in $(DEB_DIST) ; do \ - echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \ - done - @echo "#############################################" - -.PHONY: deb-src -deb-src: debian - @for DIST in $(DEB_DIST) ; do \ - (cd deb-build/$${DIST}/$(NAME)-$(VERSION)/ && $(DEBUILD) -S) ; \ - done - @echo "#############################################" - @echo "Ansible DEB artifacts:" - @for DIST in $(DEB_DIST) ; do \ - echo deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \ - done - @echo "#############################################" - -.PHONY: deb-upload -deb-upload: deb - @for DIST in $(DEB_DIST) ; do \ - $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_amd64.changes ; \ - done - -.PHONY: deb-src-upload -deb-src-upload: deb-src - @for DIST in $(DEB_DIST) ; do \ - $(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$${DIST}/$(NAME)_$(DEB_VERSION)-$(DEB_RELEASE)~$${DIST}_source.changes ; \ - done - .PHONY: epub epub: (cd docs/docsite/; CPUS=$(CPUS) $(MAKE) epub) -# for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory .PHONY: webdocs webdocs: (cd docs/docsite/; CPUS=$(CPUS) $(MAKE) docs) diff --git a/docs/docsite/rst/installation_guide/intro_installation.rst b/docs/docsite/rst/installation_guide/intro_installation.rst index f99ceecffb0..fbc82b71a7c 100644 --- a/docs/docsite/rst/installation_guide/intro_installation.rst +++ b/docs/docsite/rst/installation_guide/intro_installation.rst @@ -265,12 +265,6 @@ To configure the PPA on your machine and install Ansible run these commands: .. note:: On older Ubuntu distributions, "software-properties-common" is called "python-software-properties". You may want to use ``apt-get`` instead of ``apt`` in older versions. Also, be aware that only newer distributions (in other words, 18.04, 18.10, and so on) have a ``-u`` or ``--update`` flag, so adjust your script accordingly. -Debian/Ubuntu packages can also be built from the source checkout, run: - -.. code-block:: bash - - $ make deb - Installing Ansible on Debian ---------------------------- diff --git a/packaging/arch/README.md b/packaging/arch/README.md deleted file mode 100644 index 994daca706e..00000000000 --- a/packaging/arch/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Arch Packaging Files --------------------- - -You can find the source files for [ansible-git][1] in the [Arch User Repository][2] and for the stable version [ansible][3] you can do so in \[community\]. - - [1]: https://aur.archlinux.org/packages/ansible-git/ - [2]: https://wiki.archlinux.org/index.php/Arch_User_Repository - [3]: https://www.archlinux.org/packages/community/any/ansible/ diff --git a/packaging/debian/Dockerfile b/packaging/debian/Dockerfile deleted file mode 100644 index de831d09cf1..00000000000 --- a/packaging/debian/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:xenial - -RUN apt-get update && apt-get install -y \ - python-docutils \ - cdbs \ - debootstrap \ - devscripts \ - make \ - pbuilder \ - python-jinja2 \ - python-setuptools \ - python-yaml \ - && \ - apt-get clean - -VOLUME /ansible -WORKDIR /ansible - -ENTRYPOINT ["/bin/bash", "-c"] -CMD ["make deb"] diff --git a/packaging/debian/README.md b/packaging/debian/README.md deleted file mode 100644 index 7eaa4721395..00000000000 --- a/packaging/debian/README.md +++ /dev/null @@ -1,39 +0,0 @@ -Ansible Debian Package -====================== - -To create an Ansible DEB package: - -__Note__: You must run this target as root or set `PBUILDER_BIN='sudo pbuilder'` - -``` -apt-get install python-docutils cdbs debootstrap devscripts make pbuilder python-setuptools -git clone https://github.com/ansible/ansible.git -cd ansible -DEB_DIST='xenial trusty precise' make deb -``` - -Building in Docker: - -``` -git clone https://github.com/ansible/ansible.git -cd ansible -docker build -t ansible-deb-builder -f packaging/debian/Dockerfile . -docker run --privileged -e DEB_DIST='trusty' -v $(pwd):/ansible ansible-deb-builder -``` - -The debian package file will be placed in the `deb-build` directory. This can then be added to an APT repository or installed with `dpkg -i `. - -Note that `dpkg -i` does not resolve dependencies. - -To install the Ansible DEB package and resolve dependencies: - -``` -dpkg -i -apt-get -fy install -``` - -Or, if you are running Debian Stretch (or later) or Ubuntu Xenial (or later): - -``` -apt install /path/to/ -``` diff --git a/packaging/debian/ansible-core.dirs b/packaging/debian/ansible-core.dirs deleted file mode 100644 index fba15a432f1..00000000000 --- a/packaging/debian/ansible-core.dirs +++ /dev/null @@ -1,4 +0,0 @@ -etc/ansible -etc/ansible/roles -usr/lib/python3/dist-packages/ansible -usr/share/ansible diff --git a/packaging/debian/ansible-core.install b/packaging/debian/ansible-core.install deleted file mode 100644 index d2dac7c1a57..00000000000 --- a/packaging/debian/ansible-core.install +++ /dev/null @@ -1,15 +0,0 @@ -examples/hosts etc/ansible -docs/man/man1/*.1 usr/share/man/man1 -debian/tmp/usr/bin/ansible-galaxy usr/bin -debian/tmp/usr/bin/ansible-vault usr/bin -debian/tmp/usr/bin/ansible-doc usr/bin -debian/tmp/usr/bin/ansible-console usr/bin -debian/tmp/usr/bin/ansible-connection usr/bin -debian/tmp/usr/bin/ansible-inventory usr/bin -debian/tmp/usr/bin/ansible-config usr/bin -debian/tmp/usr/bin/ansible-pull usr/bin -debian/tmp/usr/bin/ansible-playbook usr/bin -debian/tmp/usr/bin/ansible usr/bin -examples/ansible.cfg etc/ansible -debian/tmp/usr/lib/python3/dist-packages/ansible usr/lib/python3/dist-packages -debian/tmp/usr/lib/python3/dist-packages/ansible_*.egg-info diff --git a/packaging/debian/ansible-test.install b/packaging/debian/ansible-test.install deleted file mode 100644 index 92528905806..00000000000 --- a/packaging/debian/ansible-test.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/bin/ansible-test usr/bin -debian/tmp/usr/lib/python3/dist-packages/ansible_test usr/lib/python3/dist-packages diff --git a/packaging/debian/changelog b/packaging/debian/changelog deleted file mode 100644 index 799f390eeea..00000000000 --- a/packaging/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -ansible-core (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low - - * %VERSION% release - - -- Ansible, Inc. %DATE% diff --git a/packaging/debian/compat b/packaging/debian/compat deleted file mode 100644 index 7ed6ff82de6..00000000000 --- a/packaging/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/packaging/debian/control b/packaging/debian/control deleted file mode 100644 index ba724688470..00000000000 --- a/packaging/debian/control +++ /dev/null @@ -1,29 +0,0 @@ -Source: ansible-core -Section: admin -Priority: optional -Standards-Version: 3.9.3 -Maintainer: Ansible, Inc. -Build-Depends: cdbs, debhelper (>= 5.0.0), python3-docutils, python3, dh-python | python-support, python3-setuptools, lsb-release, python3-straight.plugin, python3-packaging, python3-jinja2 -Homepage: https://github.com/ansible/ansible/ - -Package: ansible-core -Architecture: all -Depends: python3-jinja2, python3-yaml, python3-paramiko, python3-cryptography, sshpass, ${misc:Depends}, ${python:Depends} -Description: Ansible IT Automation - Ansible is a radically simple model-driven configuration management, - multi-node deployment, and remote task execution system. Ansible works - over SSH and does not require any software or daemons to be installed - on remote nodes. Extension modules can be written in any language and - are transferred to managed machines automatically. - -Package: ansible-test -Architecture: all -Depends: ansible-core (= ${binary:Version}), python3-venv, ${misc:Depends} -Description: Ansible IT Automation - Ansible is a radically simple model-driven configuration management, - multi-node deployment, and remote task execution system. Ansible works - over SSH and does not require any software or daemons to be installed - on remote nodes. Extension modules can be written in any language and - are transferred to managed machines automatically. - This package installs the ansible-test command for testing modules and - plugins developed for ansible. diff --git a/packaging/debian/copyright b/packaging/debian/copyright deleted file mode 100644 index 4a17425fbb8..00000000000 --- a/packaging/debian/copyright +++ /dev/null @@ -1,26 +0,0 @@ -This package was debianized by Henry Graham (hzgraham) on -Tue, 17 Apr 2012 12:19:47 -0400. - -It was downloaded from https://github.com/ansible/ansible.git - -Copyright: Henry Graham (hzgraham) - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, - USA. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - diff --git a/packaging/debian/docs b/packaging/debian/docs deleted file mode 100644 index a1320b1b4ab..00000000000 --- a/packaging/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/packaging/debian/pycompat b/packaging/debian/pycompat deleted file mode 100644 index 0cfbf08886f..00000000000 --- a/packaging/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/packaging/debian/rules b/packaging/debian/rules deleted file mode 100755 index 2c0231c6377..00000000000 --- a/packaging/debian/rules +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/make -f -# -- makefile -- - -DEB_PYTHON3_MODULE_PACKAGES=ansible-core ansible_test -#DEB_PYTHON_INSTALL_ARGS_ALL="--install-purelib=/usr/lib/python2.7/site-packages/" -DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL = /usr/lib/python3/dist-packages/ - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/packaging/gentoo/README.md b/packaging/gentoo/README.md deleted file mode 100644 index 991692c9c79..00000000000 --- a/packaging/gentoo/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Gentoo ebuilds are available in the main tree: - -emerge ansible diff --git a/packaging/macports/.gitignore b/packaging/macports/.gitignore deleted file mode 100644 index 2af97a6f044..00000000000 --- a/packaging/macports/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -PortIndex -PortIndex.quick diff --git a/packaging/macports/README.md b/packaging/macports/README.md deleted file mode 100644 index 7984a96c243..00000000000 --- a/packaging/macports/README.md +++ /dev/null @@ -1,39 +0,0 @@ -This portfile installs ansible from the git repository, it will install the -latest and greatest version of ansible. This portfile does not install the -required dependencies to run in accelerated mode. - -## Installing the stable version of ansible via macports - -If you wish to run a stable version of ansible please do the following - -First update your macports repo to the latest versions - - $ sudo port sync - -Then install ansible - - $ sudo port install ansible - -## Installing the devel version of ansible via macports - -To use this Portfile to install the development version of ansible one should -follow the instructions at - - -The basic idea is to add the _ansible/packaging/macports_ directory to your -_/opt/local/etc/macports/sources.conf_ file. You should have something similar -to this at the end of the file - - file:///Users/jtang/develop/ansible/packaging/macports - rsync://rsync.macports.org/release/tarballs/ports.tar [default] - -In the _ansible/packaging/macports_ directory, do this - - $ portindex - -Once the index is created the _Portfile_ will override the one in the upstream -macports repository. - -Installing newer development versions should involve an uninstall, clean, -install process or else the Portfile will need its version number/epoch -bumped. diff --git a/packaging/macports/sysutils/ansible/Portfile b/packaging/macports/sysutils/ansible/Portfile deleted file mode 100644 index 9a386d779db..00000000000 --- a/packaging/macports/sysutils/ansible/Portfile +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 102428 2013-02-02 18:34:49Z blair@macports.org $ - -PortSystem 1.0 -PortGroup python 1.0 - -name ansible -version devel -categories sysutils -supported_archs noarch - -maintainers nomaintainer - -homepage https://ansible.com/ -description Ansible IT Automation -long_description \ - Ansible is a radically simple model-driven configuration \ - management, multi-node deployment, and orchestration \ - engine. Ansible works over SSH and does not require any software \ - or daemons to be installed on remote nodes. Extension modules can \ - be written in any language and are transferred to managed machines \ - automatically. - -license GPL-3+ - -platforms darwin - -fetch.type git -git.url https://github.com/ansible/ansible.git -git.branch ${version} - -python.default_version 27 -depends_lib-append port:py${python.version}-jinja2 \ - port:py${python.version}-paramiko \ - port:py${python.version}-yaml - -patch { - fs-traverse f ${worksrcpath} { - if {[file isfile ${f}]} { - reinplace -locale C "s#/etc/ansible#${prefix}/etc/ansible#g" ${f} - reinplace -locale C "s#/usr/share/ansible#${prefix}/share/ansible#g" ${f} - } - } -} - -post-destroot { - # documentation and examples - xinstall -m 644 -W ${worksrcpath} README.rst CHANGELOG.md CONTRIBUTING.md COPYING \ - ${destroot}${prefix}/share/doc/${name} - - xinstall -m 755 -d ${destroot}${prefix}/share/doc/examples - xinstall -m 755 ${worksrcpath}/examples/ansible.cfg ${destroot}${prefix}/share/doc/${name}/examples - xinstall -m 755 ${worksrcpath}/examples/hosts ${destroot}${prefix}/share/doc/${name}/examples - - file copy ${worksrcpath}/examples/playbooks ${destroot}${prefix}/share/doc/${name}/examples/ - - # man pages - xinstall -d 644 ${destroot}${prefix}/share/man/man1 - eval xinstall -m 755 [glob ${worksrcpath}/docs/man/man1/*.1] ${destroot}${prefix}/share/man/man1 - - # install sample config and hosts file - xinstall -m 755 -d ${destroot}${prefix}/etc/ansible - xinstall -m 755 ${worksrcpath}/examples/ansible.cfg ${destroot}${prefix}/etc/ansible/ansible.cfg - xinstall -m 755 ${worksrcpath}/examples/hosts ${destroot}${prefix}/etc/ansible/hosts -} - -python.link_binaries_suffix