summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-13 17:35:38 -0400
committerTim Rozet <trozet@redhat.com>2017-09-14 12:43:45 -0400
commit2e6b2fa375c2356f8af894c88f23d9738d8cf9c0 (patch)
tree5cb1d193cef15706f83f8cf2988050c1e0e4fda5
parent7b3a8455baa35bdde4d7e078d88f9b17a6df9195 (diff)
Fix broken build dependency
libguestfs-tools is failing to install because libvirt-client is installed and there is a package conflict. Removing libvirt-client from image before installing libguestfs-tools. NSH build is failing in overcloud because the CentOS repos updated with newer kernel source and headers, and we are still using older kernel. This patch adds the old kernel source and headers. Upgrading to new kernel causes NSH OVS to fail when compiling. Change-Id: Ifd500ad138116cfecafb2268ccb580bd44d5efd5 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--build/CentOS-Updates.repo5
-rwxr-xr-xbuild/build_ovs_nsh.sh7
-rwxr-xr-xbuild/overcloud-full.sh4
-rwxr-xr-xbuild/undercloud.sh1
4 files changed, 15 insertions, 2 deletions
diff --git a/build/CentOS-Updates.repo b/build/CentOS-Updates.repo
new file mode 100644
index 0000000..8fc45d8
--- /dev/null
+++ b/build/CentOS-Updates.repo
@@ -0,0 +1,5 @@
+#released updates
+[updates-old]
+name=CentOS-$releasever - Old Updates
+baseurl=http://mirror.centos.org/centos/7.3.1611/updates/x86_64/
+gpgcheck=0
diff --git a/build/build_ovs_nsh.sh b/build/build_ovs_nsh.sh
index 52d4701..2fba43f 100755
--- a/build/build_ovs_nsh.sh
+++ b/build/build_ovs_nsh.sh
@@ -9,7 +9,10 @@
##############################################################################
set -e
-yum -y install rpm-build autoconf automake libtool systemd-units openssl openssl-devel python python-twisted-core python-zope-interface python-six desktop-file-utils groff graphviz procps-ng libcap-ng libcap-ng-devel PyQt4 selinux-policy-devel kernel-devel kernel-headers kernel-tools
+yum -y install rpm-build autoconf automake libtool systemd-units \
+openssl openssl-devel python python-twisted-core python-zope-interface \
+python-six desktop-file-utils groff graphviz procps-ng libcap-ng \
+libcap-ng-devel PyQt4 selinux-policy-devel
./boot.sh
libtoolize --force
aclocal
@@ -19,7 +22,7 @@ autoconf
./configure
yum -y install rpmdevtools
# hack due to build pulling in kernel vxlan header
-kernel_vxlan="/usr/src/kernels/$(rpm -q kernel-headers | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h"
+kernel_vxlan="/usr/src/kernels/$(rpm -q kernel | grep -Eo '[0-9].*x86_64')/include/net/vxlan.h"
sed -i '/struct vxlan_metadata {/a\ u32 gpe;' $kernel_vxlan
make rpm-fedora RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\" --without check"
make rpm-fedora-kmod RPMBUILD_OPT="\"-D kversion `rpm -q kernel | rpmdev-sort | tail -n -1 | sed 's/^kernel-//'`\""
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 36e9565..6fdc32d 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -170,6 +170,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
LIBGUESTFS_BACKEND=direct virt-customize \
+ --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \
+ --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
+ --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
+ --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
--upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \
--upload ovs.tar.gz:/root/ \
--run-command "cd /root/ && tar xzf ovs.tar.gz" \
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 3c3d3c0..05cbf55 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -51,6 +51,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \
+ --uninstall "libvirt-client" \
--install "libguestfs-tools" \
-a undercloud_build.qcow2