From 426b70370737cf7294181c55597c503448ee1a15 Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Fri, 19 Apr 2019 16:08:26 +0200 Subject: [PATCH] Add debian/ubuntu packages built with project-builder.org - tested with Ubuntu 18.04 Change-Id: Ibe1b549bd7a67dd481bd89b15f601ea48937c0cb --- pbconf/pbfilter/deb.yml | 16 ++++---- pbconf/pbfilter/ubuntu-12.04.yml | 37 +++++++++++++++++++ pbconf/pbfilter/ubuntu.yml | 7 ++-- pbconf/python-redfish.yml | 12 +++--- pbconf/python-redfish/deb/control | 33 +++++++++++++++-- .../deb/python-redfish-data.dirs | 7 ++++ .../deb/python-redfish-data.install | 7 ++++ pbconf/python-redfish/deb/rules | 7 ++-- pbconf/python-redfish/pbcl | 2 +- 9 files changed, 102 insertions(+), 26 deletions(-) create mode 100644 pbconf/pbfilter/ubuntu-12.04.yml create mode 100644 pbconf/python-redfish/deb/python-redfish-data.dirs create mode 100644 pbconf/python-redfish/deb/python-redfish-data.install diff --git a/pbconf/pbfilter/deb.yml b/pbconf/pbfilter/deb.yml index 7343cbf..3ba23c5 100644 --- a/pbconf/pbfilter/deb.yml +++ b/pbconf/pbfilter/deb.yml @@ -6,20 +6,20 @@ # # PBGRP is replaced by the group of apps filter: - PBDEP: python-docopt, python-tortilla, python-jinja2, python-pbr, python-docopt, python-simplejson - PBLIC: ASL 2.0 - PBBDEP: python-dev, python-setuptools, python-pbr, python-tortilla, python-jinja2, python-sphinx PBGRP: utils # # PBLIC is replaced by the license of the application # Cf: http://www.debian.org/legal/licenses/ -# -# PBDEP is replaced by the list of dependencies + PBLIC: ASL 2.0 # # PBBDEP is replaced by the list of build dependencies -# + PBBDEP: python (>= 2.7), dh-python, python-all, python3-all, python-setuptools, python3-setuptools, python-dev, python-sphinx, python-pbr, python3-pbr, python-future, python3-future, python-simplejson, python3-simplejson, python-tortilla, python3-tortilla, python-docopt, python3-docopt,latexmk,texlive-latex-recommended,texlive-latex-extra,texlive-fonts-recommended + PBPYBUILD: --buildsystem=pybuild + PBDEP: python-docopt, python-tortilla, python-jinja2, python-pbr, python-simplejson, python-setuptools + PBDEP3: python3-docopt, python3-tortilla, python3-jinja2, python3-pbr, python3-simplejson, python3-setuptools + # PBSUG is replaced by the list of suggestions -#filter PBSUG = +# PBSUG: # # PBREC is replaced by the list of recommandations -#filter PBREC = +# PBREC: diff --git a/pbconf/pbfilter/ubuntu-12.04.yml b/pbconf/pbfilter/ubuntu-12.04.yml new file mode 100644 index 0000000..c9f8807 --- /dev/null +++ b/pbconf/pbfilter/ubuntu-12.04.yml @@ -0,0 +1,37 @@ +--- +# +# $Id$ +# +--- +# +# $Id$ +# +# Filter for ubuntu build +# + filter: +# PBDEBSTD is replaced by the Debian standard version + PBDEBSTD: 3.8.3 +# +# PBDEBCOMP is replaced by the Debian Compatibility value + PBDEBCOMP: 7 + +# PBGRP is replaced by the group of apps + PBGRP: utils + PBPYBUILD: !!str "" +# +# PBLIC is replaced by the license of the application +# Cf: http://www.debian.org/legal/licenses/ +# PBLIC: GPL +# +# PBDEP is replaced by the list of dependencies +# PBDEP: +# +# PBBDEP is replaced by the list of build dependencies + PBBDEP: python (>= 2.7), python-all, python-setuptools + PBBDEP3: python (>= 3.5), python3-all, python3-setuptools +# +# PBSUG is replaced by the list of suggestions +# PBSUG: +# +# PBREC is replaced by the list of recommandations +# PBREC: diff --git a/pbconf/pbfilter/ubuntu.yml b/pbconf/pbfilter/ubuntu.yml index 6f4235e..33a00f5 100644 --- a/pbconf/pbfilter/ubuntu.yml +++ b/pbconf/pbfilter/ubuntu.yml @@ -5,9 +5,8 @@ # Filter for ubuntu build # # PBDEBSTD is replaced by the Debian standard version -filter: - PBDEBCOMP: 7 - PBDEBSTD: 3.8.3 + filter: + PBDEBSTD: 3.8.3 # # PBDEBCOMP is replaced by the Debian Compatibility value -# + PBDEBCOMP: 9 diff --git a/pbconf/python-redfish.yml b/pbconf/python-redfish.yml index 191e0ab..ea2fefc 100644 --- a/pbconf/python-redfish.yml +++ b/pbconf/python-redfish.yml @@ -50,13 +50,11 @@ pbpackager: # Needs hostname, account and directory # sshhost: - python-redfish: www.mondorescue.org + python-redfish: www.project-builder.org sshlogin: - python-redfish: bruno + python-redfish: account sshdir: - python-redfish: /prj/ftp -sshport: - python-redfish: 22 + python-redfish: /path/to/ftp # # # @@ -102,7 +100,7 @@ vmlist: # # Supported distribution for python-redfish velist: - python-redfish: centos-6-x86_64,centos-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64 + python-redfish: centos-6-x86_64,centos-7-x86_64,debian-8-x86_64,debian-9-x86_64,ubuntu-12.04-x86_64,ubuntu-14.04-x86_64,ubuntu-16.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64 # # VE params vetype: @@ -141,6 +139,8 @@ addrepo: mageia-5-x86_64: ftp://ftp.project-builder.org/mageia/5/x86_64/pb.addmedia fedora-25-x86_64: ftp://ftp.project-builder.org/fedora/25/x86_64/pb.repo opensuse-42.2-x86_64: ftp://ftp.project-builder.org/opensuse/42.2/x86_64/pb.repo,http://download.opensuse.org/repositories/devel:languages:python3/openSUSE_Leap_42.2/devel:languages:python3.repo,http://download.opensuse.org/repositories/Virtualization:containers/openSUSE_Leap_42.2/Virtualization:containers.repo,http://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_42.2/devel:languages:python.repo + ubuntu-12.04-x86_64: ftp://ftp.project-builder.org/ubuntu/12.04/python-tortilla.sources.list + ubuntu-18.04-x86_64: ftp://ftp.project-builder.org/ubuntu/18.04/python-tortilla.sources.list # # Adapt to your needs: # Optional if you need to overwrite the global values above diff --git a/pbconf/python-redfish/deb/control b/pbconf/python-redfish/deb/control index a6a3aea..b0496b5 100644 --- a/pbconf/python-redfish/deb/control +++ b/pbconf/python-redfish/deb/control @@ -3,22 +3,47 @@ Source: PBPKG Section: PBGRP Priority: optional Maintainer: PBPACKAGER -Build-Depends: debhelper (>= 4.2.20), python-dev (>= 2.7), PBBDEP -X-Python-Version: >= 2.7 +Build-Depends: debhelper (>= 4.2.20), PBBDEP Standards-Version: PBDEBSTD Vcs-Svn: https://review.openstack.org/p/openstack/PBPROJ.git Vcs-Browser: https://review.openstack.org/p/openstack/PBPROJ.git Homepage: PBURL Package: PBPKG -Architecture: amd64 i386 ia64 +Architecture: all # http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections Section: PBGRP Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), PBDEP +Depends: ${python:Depends}, PBDEP, python-redfish-data +X-Python-Version: >= 2.7 Recommends: PBREC Suggests: PBSUG Description: PBSUMMARY PBDESC + python2 version + . + +Package: python3-redfish +Architecture: all +# http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections +Section: PBGRP +Priority: optional +Depends: ${python3:Depends}, PBDEP3, python-redfish-data +X-Python3-Version: >= 3.5 +Recommends: PBREC +Suggests: PBSUG +Description: PBSUMMARY + PBDESC + python3 version + . + +Package: python-redfish-data +Architecture: all +# http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections +Section: PBGRP +Priority: optional +Description: PBSUMMARY + PBDESC + Data for PBPKG . diff --git a/pbconf/python-redfish/deb/python-redfish-data.dirs b/pbconf/python-redfish/deb/python-redfish-data.dirs new file mode 100644 index 0000000..332c306 --- /dev/null +++ b/pbconf/python-redfish/deb/python-redfish-data.dirs @@ -0,0 +1,7 @@ +etc/ +etc/bash_completion.d/ +usr/share/redfish-client/ +usr/share/redfish-client/templateas/ +usr/share/doc/redfish-client/ +usr/share/doc/redfish-client/manual/ +usr/share/doc/redfish-client/manual/html diff --git a/pbconf/python-redfish/deb/python-redfish-data.install b/pbconf/python-redfish/deb/python-redfish-data.install new file mode 100644 index 0000000..d69a310 --- /dev/null +++ b/pbconf/python-redfish/deb/python-redfish-data.install @@ -0,0 +1,7 @@ +redfish-client/templates/* usr/share/python-redfish/templates/ +redfish-client/*.txt usr/share/python-redfish/ +redfish-client/etc/redfish-client.conf etc/ +./redfish-client/etc/bash_completion.d/redfish-client.bash etc/bash_completion.d/ +doc/build/singlehtml/_static/* usr/share/doc/python-redfish/manual/html/_static/ +doc/build/singlehtml/* usr/share/doc/python-redfish/manual/html/ +doc/build/latex/*.pdf usr/share/doc/python-redfish/manual/ diff --git a/pbconf/python-redfish/deb/rules b/pbconf/python-redfish/deb/rules index 035b57c..f797fd2 100644 --- a/pbconf/python-redfish/deb/rules +++ b/pbconf/python-redfish/deb/rules @@ -1,11 +1,12 @@ #!/usr/bin/make -f -export PYBUILD_NAME=PBPKG -export PYBUILD_AFTER_INSTALL_python3=rm -rf {destdir}/usr/bin +export PYBUILD_NAME=redfish +export DH_VERBOSE=1 +#export PYBUILD_DISABLE=install %: dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild - #dh $@ --with python2,python3 --buildsystem=python_distutils + cd doc ; make man ; make singlehtml ; make latexpdf PYPI_DESC = PBSUMMARY DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') diff --git a/pbconf/python-redfish/pbcl b/pbconf/python-redfish/pbcl index 20ba45b..6ff8596 100644 --- a/pbconf/python-redfish/pbcl +++ b/pbconf/python-redfish/pbcl @@ -2,7 +2,7 @@ PYTHON-REDFISH CHANGES -v0.5 (2050-01-01) +v0.4.2 (2050-01-01) - TBD () v0.4.1 (2017-03-08)