From 12a44a91153e9bcf947b78e6f3b5b6ff9781c942 Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Mon, 27 Jun 2016 21:01:04 +0200 Subject: [PATCH] Improve build process - Fix bug in install on directory. - Improve dependencies on RPMs. - Adds support for redfish-check-cartridge in RPMs. - Update pbconf content for new pb 0.14.x naming. Change-Id: Ifd16e06660fe5945d88ca8f8ee6999e7c8a0d3b8 --- install.sh | 2 +- pbconf/pbfilter/all.pbf | 6 ++---- pbconf/pbfilter/rpm.pbf | 4 ++-- pbconf/python-redfish/rpm/python-redfish.spec | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index dffc4d9..2a1ec2c 100755 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ export pkg=$5 # Documentation installation only if [ $python = "doc" ]; then - install -d 755 $rootdir/$prefix/share/doc/$5/manual/html/_static + install -m 755 -d $rootdir/$prefix/share/doc/$5/manual/html/_static install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/$5/manual/html install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/$5/manual/html/_static install -m 644 doc/build/latex/*.pdf $rootdir/$prefix/share/doc/$5/manual/ diff --git a/pbconf/pbfilter/all.pbf b/pbconf/pbfilter/all.pbf index 6ab2a45..5f77d31 100644 --- a/pbconf/pbfilter/all.pbf +++ b/pbconf/pbfilter/all.pbf @@ -8,12 +8,10 @@ filter PBREPO = $pb->{'repo'} # PBSRC is replaced by the source package location after the repo -filter PBSRC = src/%{name}-%{version}.tar.gz -# Used if virtual name != real name (perl, ...) -#filter PBSRC = src/%{srcname}-%{version}.tar.gz +filter PBSRC = src/%{name}-%{version}$pb->{'extdir'}.tar.gz # PBVER is replaced by the version ($pb->{'ver'} in code) -filter PBVER = $pb->{'ver'}$pb->{'extdir'} +filter PBVER = $pb->{'ver'} # PBDATE is replaced by the date ($pb->{'date'} in code) filter PBDATE = $pb->{'date'} diff --git a/pbconf/pbfilter/rpm.pbf b/pbconf/pbfilter/rpm.pbf index 0aebfbf..8b3ab66 100644 --- a/pbconf/pbfilter/rpm.pbf +++ b/pbconf/pbfilter/rpm.pbf @@ -14,9 +14,9 @@ filter PBLIC = ASL 2.0 #filter PBDEP = # PBBDEP is replaced by the list of build dependencies -filter PBPYTHON2BDEP = make,python-devel,python-setuptools >= 18,python-sphinx >= 1.2.3,python-future >= 0.15.2,python-docopt >= 0.6.2,python-requests >= 2.9.1,python-simplejson >= 3.8.1,python-configparser >= 3.3.0,texlive,python-sphinx_rtd_theme +filter PBPYTHON2BDEP = make,python-devel,python-setuptools >= 18,python-sphinx >= 1.2.3,python-future >= 0.15.2,python-docopt >= 0.6.2,python-requests >= 2.9.1,python-simplejson >= 3.8.1,python-configparser >= 3.3.0,texlive,python-sphinx_rtd_theme,python-pbr >= 0.8,python-tortilla >= 0.4.1 filter PBPYTHON2DEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-simplejson >= 3.8.1,python-requests >= 2.9.1,python-configparser >= 3.3.0,python-future >= 0.15.2 -filter PBPYTHON3BDEP = python3-devel,python3-setuptools >= 18,python3-sphinx >= 1.2.3,python3-future >= 0.15.2,python3-docopt >= 0.6.2,python3-requests >= 2.9.1,python3-simplejson >= 3.8.1,texlive,python3-sphinx_rtd_theme +filter PBPYTHON3BDEP = python3-devel,python3-setuptools >= 18,python3-sphinx >= 1.2.3,python3-future >= 0.15.2,python3-docopt >= 0.6.2,python3-requests >= 2.9.1,python3-simplejson >= 3.8.1,texlive,python3-sphinx_rtd_theme,python3-pbr >= 0.8,python3-tortilla >= 0.4.1 filter PBPYTHON3DEP = python3-docopt >= 0.6.2,python3-tortilla >= 0.4.1,python3-jinja2 >= 2.7.3,python3-simplejson >= 3.8.1,python3-requests >= 2.9.1 filter PBPYTHON3PKG = python3-redfish diff --git a/pbconf/python-redfish/rpm/python-redfish.spec b/pbconf/python-redfish/rpm/python-redfish.spec index 737713c..ba2a7ab 100644 --- a/pbconf/python-redfish/rpm/python-redfish.spec +++ b/pbconf/python-redfish/rpm/python-redfish.spec @@ -3,7 +3,6 @@ # %global with_python3 PBWITHPY3 - Name: PBREALPKG Version: PBVER Release: PBTAGPBSUF @@ -42,7 +41,7 @@ PBDESC Documentation %prep -%setup -q +%setup -q -n %{name}-%{version}PBEXTDIR # Fix for now as long as setuptools isn't more recent in distributions %if %{?with_python3} PBPYTHON3FILTER @@ -89,6 +88,7 @@ popd %exclude %{_docdir}/PBREALPKG/html %exclude %{_docdir}/PBREALPKG/*.pdf %{_bindir}/redfish-client +%{_bindir}/redfish-check-cartridge %dir %{_datadir}/redfish-client %{_datadir}/redfish-client/templates/* %config(noreplace) %{_sysconfdir}/redfish-client.conf