diff --git a/attestation/rim_ref/README.md b/attestation/rim_ref/README.md index 62822ea92d1965e005d0c6231241d43ce605d64f..dac2797e8610bdd0e98cdc2d9762836528fce9e7 100644 --- a/attestation/rim_ref/README.md +++ b/attestation/rim_ref/README.md @@ -12,6 +12,7 @@ cd inc/qemu_generator go mod tidy # compile +cd ../../ mkdir build && cd build cmake .. make diff --git a/attestation/rim_ref/inc/qemu_generator/src/main.go b/attestation/rim_ref/inc/qemu_generator/src/main.go index 98ebd5c7f6e800ff6e7df4ec35c57c0e8ab0e2fa..db5c1de4312ab58106e1218fa09532f273715516 100644 --- a/attestation/rim_ref/inc/qemu_generator/src/main.go +++ b/attestation/rim_ref/inc/qemu_generator/src/main.go @@ -3601,13 +3601,13 @@ func (config *Config) appendMemory() { memoryParams = append(memoryParams, config.Memory.Size) - if config.Memory.Slots > 0 { - memoryParams = append(memoryParams, fmt.Sprintf("slots=%d", config.Memory.Slots)) - } + // if config.Memory.Slots > 0 { + // memoryParams = append(memoryParams, fmt.Sprintf("slots=%d", config.Memory.Slots)) + // } - if config.Memory.MaxMem != "" { - memoryParams = append(memoryParams, fmt.Sprintf("maxmem=%s", config.Memory.MaxMem)) - } + // if config.Memory.MaxMem != "" { + // memoryParams = append(memoryParams, fmt.Sprintf("maxmem=%s", config.Memory.MaxMem)) + // } config.qemuParams = append(config.qemuParams, "-m") config.qemuParams = append(config.qemuParams, strings.Join(memoryParams, ",")) diff --git "a/kata-v3.15.0/doc/\345\256\271\345\231\250\351\225\234\345\203\217\347\255\276\345\220\215\351\252\214\347\255\276.md" "b/kata-v3.15.0/doc/\345\256\271\345\231\250\351\225\234\345\203\217\347\255\276\345\220\215\351\252\214\347\255\276.md" index f2b41fbbe36fa0d84438c61b327de9cc710d42e3..9eb8d97c2d0dc74376e078637064583713159eb9 100644 --- "a/kata-v3.15.0/doc/\345\256\271\345\231\250\351\225\234\345\203\217\347\255\276\345\220\215\351\252\214\347\255\276.md" +++ "b/kata-v3.15.0/doc/\345\256\271\345\231\250\351\225\234\345\203\217\347\255\276\345\220\215\351\252\214\347\255\276.md" @@ -77,7 +77,7 @@ EOF ``` >![](public_sys-resources/icon-note.gif) **说明:** ->virtcca.realm.rim 添加的RIM基线值(列表)可通过基线值生成工具生成。 +>virtcca.realm.rim 添加的RIM基线值(列表)可通过[`基线值生成工具`](../../attestation/rim_ref/README.md)生成。 ## 容器镜像签名验签 diff --git a/kata-v3.15.0/tools/build.sh b/kata-v3.15.0/tools/build.sh index b91803d95aafaaff8dcbe83debbca7a4e9108fa4..fe8783fad976b67c63d9e9356665097cbe7d9311 100644 --- a/kata-v3.15.0/tools/build.sh +++ b/kata-v3.15.0/tools/build.sh @@ -507,6 +507,7 @@ echo "===== Copying VirtCCA configuration files =====" cd "$KATA_SRC_DIR" cp -v ./build/virtCCA_sdk/kata-v"$KATA_VERSION"/conf/virtcca.config ./build/ cp -v ./build/virtCCA_sdk/kata-v"$KATA_VERSION"/conf/hosts ./build/ +echo "$IP_ADDR $REGISTRY_DOMAIN" | sudo tee -a ./build/hosts # 7. Prepare certificates echo "===== Generating SSL certificates ====="