cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes for building ansible-base .debs, using py3 (#69534)

Browse source 
Change:
- Changes for ansible -> ansible base
- Bump to py3 for 2.10 PPA release

Test Plan:
- Local VM; Jenkins after merge.

Tickets:
- Refs #57342

Signed-off-by: Rick Elrod <rick@elrod.me>
This commit is contained in:
Rick Elrod 2020-05-15 20:30:08 -05:00 committed by GitHub
parent 3dedf95dbd
commit 04ec72160a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -14,7 +14,7 @@
######################################################## ########################################################
# variable section # variable section
NAME = ansible NAME = ansible-base
OS = $(shell uname -s) OS = $(shell uname -s)
PREFIX ?= '/usr/local' PREFIX ?= '/usr/local'
SDIST_DIR ?= 'dist' SDIST_DIR ?= 'dist'

2
packaging/debian/ansible-test.install
View file

@ -1,2 +1,2 @@
debian/tmp/usr/bin/ansible-test usr/bin debian/tmp/usr/bin/ansible-test usr/bin
debian/tmp/usr/lib/python2.7/dist-packages/ansible_test usr/lib/python2.7/dist-packages debian/tmp/usr/lib/python3/dist-packages/ansible_test usr/lib/python3/dist-packages

2
packaging/debian/changelog
View file

@ -1,4 +1,4 @@
ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low ansible-base (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
* %VERSION% release * %VERSION% release

10
packaging/debian/control
View file

@ -1,14 +1,14 @@
Source: ansible Source: ansible-base
Section: admin Section: admin
Priority: optional Priority: optional
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Maintainer: Ansible, Inc. <info@ansible.com> Maintainer: Ansible, Inc. <info@ansible.com>
Build-Depends: cdbs, debhelper (>= 5.0.0), python-docutils, python, dh-python | python-support, python-setuptools, lsb-release Build-Depends: cdbs, debhelper (>= 5.0.0), python3-docutils, python3, dh-python | python-support, python3-setuptools, lsb-release
Homepage: https://github.com/ansible/ansible/ Homepage: https://github.com/ansible/ansible/
Package: ansible Package: ansible-base
Architecture: all Architecture: all
Depends: python-jinja2, python-yaml, python-paramiko, python-httplib2, python-six, python-crypto (>= 2.6), python-setuptools, sshpass, ${misc:Depends}, ${python:Depends} Depends: python3-jinja2, python3-yaml, python3-paramiko, python3-cryptography, sshpass, ${misc:Depends}, ${python:Depends}
Description: Ansible IT Automation Description: Ansible IT Automation
Ansible is a radically simple model-driven configuration management, Ansible is a radically simple model-driven configuration management,
multi-node deployment, and remote task execution system. Ansible works multi-node deployment, and remote task execution system. Ansible works
@ -18,7 +18,7 @@ Description: Ansible IT Automation
Package: ansible-test Package: ansible-test
Architecture: all Architecture: all
Depends: ansible (= ${binary:Version}), python-virtualenv, ${misc:Depends} Depends: ansible-base (= ${binary:Version}), python3-venv, ${misc:Depends}
Description: Ansible IT Automation Description: Ansible IT Automation
Ansible is a radically simple model-driven configuration management, Ansible is a radically simple model-driven configuration management,
multi-node deployment, and remote task execution system. Ansible works multi-node deployment, and remote task execution system. Ansible works

4
packaging/debian/rules
View file

@ -1,9 +1,9 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -- makefile -- # -- makefile --
DEB_PYTHON2_MODULE_PACKAGES=ansible ansible_test DEB_PYTHON3_MODULE_PACKAGES=ansible-base ansible_test
#DEB_PYTHON_INSTALL_ARGS_ALL="--install-purelib=/usr/lib/python2.7/site-packages/" #DEB_PYTHON_INSTALL_ARGS_ALL="--install-purelib=/usr/lib/python2.7/site-packages/"
DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL = /usr/lib/@PYTHONBINARY@/dist-packages/ DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL = /usr/lib/python3/dist-packages/
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/class/python-distutils.mk