build: update qemu for rhel-8.6 and ubuntu-22.04

Use MVP-QEMU-6.2-v3.1 downstream patch set for qemu build. Signed-off-by: jialeie <jialei.feng@intel.com>
intel · Oct 13, 2022 · 3d7809d · 3d7809d
1 parent 84be43c
commit 3d7809d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/build/centos-stream-8/intel-mvp-tdx-qemu-kvm/build.sh b/build/centos-stream-8/intel-mvp-tdx-qemu-kvm/build.sh
@@ -4,25 +4,29 @@ set -ex
 
 CURR_DIR="$(dirname "$(readlink -f "$0")")"
 
-DOWNSTREAM_GIT_URI="https://github.com/intel/qemu-dcp.git"
-DOWNSTREAM_TAG="c8302707f6e89c955eae0883bfd97680202b8db2"
+UPSTREAM_GIT_URI="https://github.com/qemu/qemu.git"
+UPSTREAM_TAG="4c127fdbe81d66e7cafed90908d0fd1f6f2a6cd0"
 DOWNSTREAM_TARBALL="tdx-qemu.tar.gz"
 
+PATCHSET="${CURR_DIR}/../../common/patches-tdx-qemu-MVP-QEMU-6.2-v3.1.tar.gz"
 SPEC_FILE="${CURR_DIR}/tdx-qemu.spec"
 RPMBUILD_DIR="${CURR_DIR}/rpmbuild"
 
 create_tarball() {
     cd "${CURR_DIR}"
     if [[ ! -d qemu ]]; then
-        git clone ${DOWNSTREAM_GIT_URI} qemu
-    fi
-    if [[ ! -f "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} ]]; then
+        git clone ${UPSTREAM_GIT_URI} qemu
+        tar xf "${PATCHSET}"
         pushd qemu
-        git checkout ${DOWNSTREAM_TAG}
+        git checkout ${UPSTREAM_TAG}
+        git config user.name "${USER:-tdx-builder}"
+        git config user.email "${USER:-tdx-builder}"@"$HOSTNAME"
+        for i in ../patches/*; do
+           git am "$i"
+        done
         git submodule update --init
-        rm -rf .git/
         popd
-        tar czf "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} qemu
+        tar --exclude=.git -czf "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} qemu
     fi
 }
 

diff --git a/build/centos-stream-8/intel-mvp-tdx-qemu-kvm/tdx-qemu.spec b/build/centos-stream-8/intel-mvp-tdx-qemu-kvm/tdx-qemu.spec
@@ -125,8 +125,8 @@ Obsoletes: qemu-kvm-block-iscsi <= %{epoch}:%{version}           \
 Summary: QEMU is a machine emulator and virtualizer
 Name: intel-mvp-tdx-qemu-kvm
 Version: 6.2.0
-%define downstream_version v2.5
-%define patch_number mvp16
+%define downstream_version v3.1
+%define patch_number mvp18
 Release: %{downstream_version}.%{patch_number}%{?dist}
 
 Provides: qemu-kvm

diff --git a/build/common/patches-tdx-qemu-MVP-QEMU-6.2-v3.1.tar.gz b/build/common/patches-tdx-qemu-MVP-QEMU-6.2-v3.1.tar.gz
diff --git a/build/rhel-8/intel-mvp-tdx-qemu-kvm/build.sh b/build/rhel-8/intel-mvp-tdx-qemu-kvm/build.sh
@@ -4,25 +4,29 @@ set -ex
 
 CURR_DIR="$(dirname "$(readlink -f "$0")")"
 
-DOWNSTREAM_GIT_URI="https://github.com/intel/qemu-dcp.git"
-DOWNSTREAM_TAG="c8302707f6e89c955eae0883bfd97680202b8db2"
+UPSTREAM_GIT_URI="https://github.com/qemu/qemu.git"
+UPSTREAM_TAG="4c127fdbe81d66e7cafed90908d0fd1f6f2a6cd0"
 DOWNSTREAM_TARBALL="tdx-qemu.tar.gz"
 
+PATCHSET="${CURR_DIR}/../../common/patches-tdx-qemu-MVP-QEMU-6.2-v3.1.tar.gz"
 SPEC_FILE="${CURR_DIR}/tdx-qemu.spec"
 RPMBUILD_DIR="${CURR_DIR}/rpmbuild"
 
 create_tarball() {
     cd "${CURR_DIR}"
     if [[ ! -d qemu ]]; then
-        git clone ${DOWNSTREAM_GIT_URI} qemu
-    fi
-    if [[ ! -f "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} ]]; then
+        git clone ${UPSTREAM_GIT_URI} qemu
+        tar xf "${PATCHSET}"
         pushd qemu
-        git checkout ${DOWNSTREAM_TAG}
+        git checkout ${UPSTREAM_TAG}
+        git config user.name "${USER:-tdx-builder}"
+        git config user.email "${USER:-tdx-builder}"@"$HOSTNAME"
+        for i in ../patches/*; do
+           git am "$i"
+        done
         git submodule update --init
-        rm -rf .git/
         popd
-        tar czf "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} qemu
+        tar --exclude=.git -czf "${RPMBUILD_DIR}"/SOURCES/${DOWNSTREAM_TARBALL} qemu
     fi
 }
 

diff --git a/build/rhel-8/intel-mvp-tdx-qemu-kvm/tdx-qemu.spec b/build/rhel-8/intel-mvp-tdx-qemu-kvm/tdx-qemu.spec
@@ -125,8 +125,8 @@ Obsoletes: qemu-kvm-block-iscsi <= %{epoch}:%{version}           \
 Summary: QEMU is a machine emulator and virtualizer
 Name: intel-mvp-tdx-qemu-kvm
 Version: 6.2.0
-%define downstream_version v2.5
-%define patch_number mvp16
+%define downstream_version v3.1
+%define patch_number mvp18
 Release: %{downstream_version}.%{patch_number}%{?dist}
 
 Provides: qemu-kvm

diff --git a/build/ubuntu-22.04/intel-mvp-tdx-qemu-kvm/build.sh b/build/ubuntu-22.04/intel-mvp-tdx-qemu-kvm/build.sh
@@ -4,9 +4,10 @@
 
 CURR_DIR=$(dirname "$(readlink -f "$0")")
 UPSTREAM_VERSION="6.2.0"
-DOWNSTREAM_GIT_URI="https://github.com/intel/qemu-dcp.git"
-DOWNSTREAM_TAG="c8302707f6e89c955eae0883bfd97680202b8db2"
+UPSTREAM_GIT_URI="https://github.com/qemu/qemu.git"
+UPSTREAM_TAG="4c127fdbe81d66e7cafed90908d0fd1f6f2a6cd0"
 PACKAGE="mvp-tdx-qemu"
+PATCHSET="${CURR_DIR}/../../common/patches-tdx-qemu-MVP-QEMU-6.2-v3.1.tar.gz"
 
 if [[ $(grep "Ubuntu" /etc/os-release) == "" ]]; then
     echo "Please build the packages in Ubuntu"
@@ -17,12 +18,15 @@ get_source() {
     echo "Get downstream source code..."
     cd ${CURR_DIR}
     if [[ ! -d ${PACKAGE}-${UPSTREAM_VERSION} ]]; then
-	# add safe directory for running in docker
-	git config --global --add safe.directory /github/workspace
-	git config --global --add safe.directory /repo
-        git clone ${DOWNSTREAM_GIT_URI} ${PACKAGE}-${UPSTREAM_VERSION}
+        git clone ${UPSTREAM_GIT_URI} ${PACKAGE}-${UPSTREAM_VERSION}
+        tar xf "${PATCHSET}"
         cd ${PACKAGE}-${UPSTREAM_VERSION}
-        git checkout ${DOWNSTREAM_TAG}
+        git checkout ${UPSTREAM_TAG}
+        git config user.name "${USER:-tdx-builder}"
+        git config user.email "${USER:-tdx-builder}"@"$HOSTNAME"
+        for i in ../patches/*; do
+           git am "$i"
+        done
         git submodule update --init
     fi
 }

diff --git a/build/ubuntu-22.04/intel-mvp-tdx-qemu-kvm/debian/changelog b/build/ubuntu-22.04/intel-mvp-tdx-qemu-kvm/debian/changelog
@@ -1,3 +1,9 @@
+qemu (9:6.2+mvp4+31) jammy; urgency=medium
+
+  * package for qemu upstream base + downstream patches
+
+ -- Jialei Feng <jialei.feng@intel.com>  Wed, 12 Oct 2022 14:04:00 +0800
+
 qemu (9:6.2+mvp2+25) jammy; urgency=medium
 
   * package https://github.com/intel/qemu-dcp