From 7c756f7ff386f832da11bff9505a67be3fdf9f14 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Fri, 23 Mar 2018 09:52:30 -0400
Subject: [PATCH] Kickstart updates to resolve prepatching issues

The prepatching feature changed how kickstarts are delivered. Where
before, they were generated as part of build-iso and copied during
installation, they are now delivered in packages. However, when the
controller kickstart mirrors the feed directory from the active
controller after installation, it may overwrite these installed files.
This update changes the wget command options to protect against this.

In addition, testing with an RT kernel patch showed Anaconda was also
installing the mlnx-ofa_kernel-rt-modules package from the patching
repo on a standard note, as it attempts to resolve a packaging
requirement. This update also adds explicit exclusions to the package
lists in the standard and lowlatency kickstarts to avoid installing
rt modules on the standard nodes, and vice versa.

Change-Id: I56b22fb0846db05a96004184c1060c05566d5363
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 bsp-files/kickstarts/post_net_controller.cfg    |  2 +-
 bsp-files/kickstarts/pre_pkglist.cfg            | 14 ++++++++++++++
 bsp-files/kickstarts/pre_pkglist_lowlatency.cfg | 11 +++++++++++
 kickstart/centos/build_srpm.data                |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/bsp-files/kickstarts/post_net_controller.cfg b/bsp-files/kickstarts/post_net_controller.cfg
index c3e4b8f6..e07cc901 100644
--- a/bsp-files/kickstarts/post_net_controller.cfg
+++ b/bsp-files/kickstarts/post_net_controller.cfg
@@ -22,7 +22,7 @@ anaconda_logdir=/var/log/anaconda
 mkdir -p $anaconda_logdir
 
 echo "Mirroring software repository (may take several minutes)..." >/dev/console
-wget --mirror --no-parent --no-host-directories --reject 'index.html*' --reject '*.log' $feed_url/ -o $anaconda_logdir/wget-feed-mirror.log \
+wget --recursive --no-parent --no-host-directories --no-clobber --reject 'index.html*' --reject '*.log' $feed_url/ -o $anaconda_logdir/wget-feed-mirror.log \
     || report_post_failure_with_logfile $anaconda_logdir/wget-feed-mirror.log
 
 # Sync patching repository
diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg
index 021f0d35..ffa069b5 100644
--- a/bsp-files/kickstarts/pre_pkglist.cfg
+++ b/bsp-files/kickstarts/pre_pkglist.cfg
@@ -1,6 +1,20 @@
 %packages
 @core
 @base
+-kernel-module-igb-uio-rt
+-kernel-module-wrs-avp-rt
+-kernel-rt
+-kernel-rt-kvm
+-kernel-rt-tools
+-kernel-rt-tools-libs
+-kmod-drbd-rt
+-kmod-e1000e-rt
+-kmod-i40e-rt
+-kmod-ixgbe-rt
+-kmod-tpm-rt
+-mlnx-ofa_kernel
+-mlnx-ofa_kernel-rt-modules
+-qat16-rt
 xxxPACKAGE_LISTxxx
 %end
 
diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
index 49e7d395..956e88a1 100644
--- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
+++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg
@@ -1,8 +1,19 @@
 %packages
 @core
 @base
+-kernel-module-igb-uio
+-kernel-module-wrs-avp
 -kernel
 -kernel-tools
+-kernel-tools-libs
+-kmod-drbd
+-kmod-e1000e
+-kmod-i40e
+-kmod-ixgbe
+-kmod-tpm
+-mlnx-ofa_kernel
+-mlnx-ofa_kernel-modules
+-qat16
 xxxPACKAGE_LISTxxx
 %end
 
diff --git a/kickstart/centos/build_srpm.data b/kickstart/centos/build_srpm.data
index 15b87a79..4f70f963 100644
--- a/kickstart/centos/build_srpm.data
+++ b/kickstart/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="${CGCS_BASE}/mwa-beas/bsp-files"
 COPY_LIST="$PKG_BASE/LICENSE"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=1