starlingx/integ
Code Issues Proposed changes

CentOS 8: Fix spec file for libvirt

Browse Source 
(1) Change python to python3

(2) Add "rm -rf .git" command
Clear git information after tarball decompression

(3) Add dependency "rpcgen, libtirpc-devel"
Add "rpcgen" modify build error rpcgen command not found
Add "libtirpc-devel" modify build error "XDR library" not found

(4) Upgrade gnulib version
Since the dependent gnulib-devel version is upgraded
(gnulib-devel-0-26.20180720git.fc29.noarch.rpm),
the tarball must also be upgraded to a matching version

Story: 2006728
Task: 37912
Depends-On: https://review.opendev.org/#/c/700793/
Depends-On: https://review.opendev.org/#/c/701162/
Change-Id: I11159c53ff9deab552e5eeab96a51732ec72815b
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
This commit is contained in:
Dongqi Chen 2019-12-30 17:57:54 +08:00
parent 6cf6e96910
commit 568e8f5027
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt/libvirt/centos/build_srpm.data
View File

@ -2,7 +2,7 @@ SRC_DIR="$CGCS_BASE/git/libvirt"
COPY_LIST="\ COPY_LIST="\
libvirt/* \ libvirt/* \
libvirt/hooks/* \ libvirt/hooks/* \
$CGCS_BASE/downloads/gnulib-ffc927e.tar.gz \ $CGCS_BASE/downloads/gnulib-68df637.tar.gz \
$CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz" $CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz"
TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b
TIS_PATCH_VER=101 TIS_PATCH_VER=101

12
virt/libvirt/centos/libvirt.spec
View File

@ -263,7 +263,7 @@ Source2: libvirt.logrotate
Source3: libvirt.lxc Source3: libvirt.lxc
Source4: libvirt.qemu Source4: libvirt.qemu
Source5: libvirt.uml Source5: libvirt.uml
Source6: gnulib-ffc927e.tar.gz Source6: gnulib-68df637.tar.gz
Source7: keycodemapdb-16e5b07.tar.gz Source7: keycodemapdb-16e5b07.tar.gz
Source8: qemu Source8: qemu
@ -309,7 +309,10 @@ BuildRequires: /usr/bin/pod2man
%endif %endif
BuildRequires: git BuildRequires: git
BuildRequires: perl BuildRequires: perl
BuildRequires: python BuildRequires: python3
BuildRequires: rpcgen
BuildRequires: libtirpc-devel
%if %{with_systemd} %if %{with_systemd}
BuildRequires: systemd-units BuildRequires: systemd-units
%endif %endif
@ -1126,6 +1129,9 @@ exit 1
print("PATCHLIST="..tmp.."\n") print("PATCHLIST="..tmp.."\n")
} }
# Clear git information after tarball decompression
rm -rf .git
git init -q git init -q
git config user.name rpm-build git config user.name rpm-build
git config user.email rpm-build git config user.email rpm-build
@ -1308,7 +1314,7 @@ rm -rf .git
# STX: Generate configure script. Default is to do a "git clone" of gnulib. # STX: Generate configure script. Default is to do a "git clone" of gnulib.
# Use the tar ball gnulib tarball instead. # Use the tar ball gnulib tarball instead.
tar zxf %{SOURCE6} tar zxf %{SOURCE6}
./bootstrap --no-git --gnulib-srcdir=gnulib-ffc927e --copy ./bootstrap --no-git --gnulib-srcdir=gnulib-68df637 --copy
tar zxf %{SOURCE7} -C src tar zxf %{SOURCE7} -C src
%if 0%{?enable_autotools} %if 0%{?enable_autotools}