From 0e02ad6f65f2760b693055a55ffe51b40fcd81c2 Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Thu, 5 Mar 2020 12:41:05 +0800
Subject: [PATCH] Get tpm/integrity source code from CentOS 8.1 kernel tarball

The CentOS 4.18.0-147.3.1 kernel is not the same as upstream 4.18
kernel, and cause tpm/integrity from upstream cannot pass build.
There are many patches need be cherry-picked or reverted in order
to pass build with CentOS 8.1 kernel.
So switch to get tpm/integrity code from CentOS 8.1 kernel tarball.
With it, we just need focus on STX's patch.

Story: 2007308
Task: 38950
Depends-On: https://review.opendev.org/720325

Change-Id: I8090bc1aff7d5fe194567520093738099464b572
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 centos-mirror-tools/dl_tarball.sh | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/centos-mirror-tools/dl_tarball.sh b/centos-mirror-tools/dl_tarball.sh
index 61914620..09a67a36 100755
--- a/centos-mirror-tools/dl_tarball.sh
+++ b/centos-mirror-tools/dl_tarball.sh
@@ -270,19 +270,22 @@ for line in $(cat $tarball_file); do
     if [[ "$line" =~ ^'!' ]]; then
         echo $tarball_name
         pushd $output_tarball > /dev/null
-        if [ "$tarball_name" = "integrity-kmod-e6aef069.tar.gz" ]; then
+        if [ "$tarball_name" = "linux-4.18.0-147.3.1.el8_1.tar.gz" ]; then
             download_package "$tarball_name" "$tarball_url"
             if [ $? -ne 0 ]; then
                 error_count=$((error_count + 1))
                 popd > /dev/null   # pushd $output_tarball
                 continue
             fi
-
+            version="147.3.1"
             tar xf "$tarball_name"
-            rm "$tarball_name"
-            mv linux-tpmdd-e6aef06/security/integrity/ $directory_name
-            tar czvf $tarball_name $directory_name
-            rm -rf linux-tpmdd-e6aef06
+            rm -rf integrity integrity-kmod-${version}.tar.gz
+            mv ${directory_name}/security/integrity/ integrity
+            tar czvf integrity-kmod-${version}.tar.gz integrity
+            rm -rf tpm tpm-kmod-${version}.tar.gz
+            mv ${directory_name}/drivers/char/tpm tpm
+            tar czvf tpm-kmod-${version}.tar.gz tpm
+            rm -rf $directory_name tpm integrity
         elif [ "$tarball_name" = "mariadb-10.1.28.tar.gz" ]; then
             download_package "$tarball_name" "$tarball_url"
             if [ $? -ne 0 ]; then
@@ -328,21 +331,6 @@ for line in $(cat $tarball_file); do
                 popd > /dev/null  # pushd $output_tarball
                 continue
             fi
-
-        elif [ "$tarball_name" = "tpm-kmod-e6aef069.tar.gz" ]; then
-            download_package "$tarball_name" "$tarball_url"
-            if [ $? -ne 0 ]; then
-                error_count=$((error_count + 1))
-                popd > /dev/null  # pushd $output_tarball
-                continue
-            fi
-
-            tar xf "$tarball_name"
-            rm "$tarball_name"
-            mv linux-tpmdd-e6aef06/drivers/char/tpm $directory_name
-            tar czvf $tarball_name $directory_name
-            rm -rf linux-tpmdd-e6aef06
-            rm -rf $directory_name
         elif [ "$tarball_name" = "tss2-930.tar.gz" ]; then
             dest_dir=ibmtpm20tss-tss
             for dl_src in $dl_source; do