Merge pull request #68 from dongx1x/fix-build-version

tools: fix build version error and rtmr parameter error
cc-api · May 9, 2024 · 641645f · 641645f
2 parents b097878 + 3cbcd79
commit 641645f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/tools/build/build.sh b/tools/build/build.sh
@@ -45,8 +45,13 @@ build_ubuntu_kernel() {
     else
         CHANGELOG="debian.master/changelog"
     fi
-    LATEST_VERSION=$(sed -n '1 s/linux.*(\(.*\)) noble.*$/\1/p' ${CHANGELOG})
-    CCNP_VERSION=${LATEST_VERSION}${CCNP_VERSION_SUFFIX}
+
+    # For generic kernel, the default version in changelog is linux (6.8.0-31.31),
+    #   we want to change to ccnp version linux (6.8.0-31.31+ccnp1)
+    # For intel kernel, the default version in changelog is linux-intel (6.8.0-1001.7)
+    #   we want to change it to linux-intel (6.8.0-1001.7+ccnp1)
+    LATEST_VERSION=$(sed -n '1 s/\(linux.*(.*\)) noble.*$/\1/p' ${CHANGELOG})
+    CCNP_VERSION="${LATEST_VERSION}${CCNP_VERSION_SUFFIX})"
     sed "s/CCNP_VERSION/${CCNP_VERSION}/" \
         "${KERNEL_DIR}/ubuntu/changelog" > "${KERNEL_DIR}/ubuntu/changelog.tmp"
     sed -i "0 r ${KERNEL_DIR}/ubuntu/changelog.tmp" debian/changelog ${CHANGELOG}

diff --git a/tools/build/kernel/patches/0006-x86-tdx-rtmr-extend-TDX-RTMR-interface-for-kernel-IM.patch b/tools/build/kernel/patches/0006-x86-tdx-rtmr-extend-TDX-RTMR-interface-for-kernel-IM.patch
@@ -116,7 +116,7 @@ index 000000000000..3ed78ad754dd
 +    memcpy(data, digests[DEFAULT_SHA384_IDX].digest, sizeof(digests[DEFAULT_SHA384_IDX].digest));
 +
 +    /* Extend RTMR registers using "TDG.MR.RTMR.EXTEND" TDCALL */
-+    rc = tdx_mcall_rtmr_extend(data, (u8)rtmr_idx);
++    rc = tdx_mcall_rtmr_extend((u8)rtmr_idx, data);
 +    kfree(data);
 +
 +    return rc;

diff --git a/tools/build/kernel/ubuntu/changelog b/tools/build/kernel/ubuntu/changelog
@@ -1,4 +1,4 @@
-linux (CCNP_VERSION) noble; urgency=medium
+CCNP_VERSION noble; urgency=medium
 
   * [CCNP] Add CCNP kernel patches