Rename realm-token -> cca-realm-measurements

Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

Config.in

-source "$BR2_EXTERNAL_LINARO_CCA_PATH/package/realm-token/Config.in"
+source "$BR2_EXTERNAL_LINARO_CCA_PATH/package/cca-realm-measurements/Config.in"
 source "$BR2_EXTERNAL_LINARO_CCA_PATH/package/cca-workload-attestation/Config.in"
 source "$BR2_EXTERNAL_LINARO_CCA_PATH/package/keybroker-demo/Config.in"

configs/cca_defconfig

@@ -28,7 +28,7 @@ BR2_PACKAGE_QEMU_FDT=y
 BR2_PACKAGE_QEMU_CHOOSE_TARGETS=y
 BR2_PACKAGE_QEMU_TARGET_AARCH64=y
 
-BR2_PACKAGE_REALM_TOKEN=y
+BR2_PACKAGE_CCA_REALM_MEASUREMENTS=y
 BR2_PACKAGE_CCA_WORKLOAD_ATTESTATION=y
 BR2_PACKAGE_KEYBROKER_DEMO=y
 
@@ -39,3 +39,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_LINARO_CCA_PATH)/scripts/post-build
 BR2_REPRODUCIBLE=y
 
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_LINARO_CCA_PATH)/patches/"
+
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_IOMMUTOOLS=y
+BR2_STRIP_strip=n
+
+BR2_PACKAGE_KVM_UNIT_TESTS=y
+
+BR2_PACKAGE_VIM=y
+BR2_PACKAGE_NETCAT=y

package/realm-token/Config.in → package/cca-realm-measurements/Config.in

-menuconfig BR2_PACKAGE_REALM_TOKEN
-	bool "realm-token"
+menuconfig BR2_PACKAGE_CCA_REALM_MEASUREMENTS
+	bool "CCA Realm Measurements"
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
 	select BR2_PACKAGE_HOST_RUSTC
 	select BR2_PACKAGE_HOST_PKGCONF
@@ -10,15 +10,13 @@ menuconfig BR2_PACKAGE_REALM_TOKEN
 	help
 	  Given a VM configuration and the payload to run in the Realm,
 	  this tool calculates the Realm Initial and Extended
-	  Measurements, needed for CCA attestation.  This is aprototype,
-	  to experiment with Realm attestation and find out what
-	  can/should be standardized.
+	  Measurements, needed for CCA attestation.
 
-	  https://git.codelinaro.org/linaro/dcap/realm-token
+	  https://github.com/veraison/cca-realm-measurements
 	  
-if BR2_PACKAGE_REALM_TOKEN
+if BR2_PACKAGE_CCA_REALM_MEASUREMENTS
 
-config BR2_PACKAGE_REALM_TOKEN_CFG
+config BR2_PACKAGE_CCA_REALM_MEASUREMENTS_CFG
 	string "Configuration file for gen-run-vmm.sh"
 	default "scripts/gen-run-vmm.cfg"
 	help
@@ -26,4 +24,4 @@ config BR2_PACKAGE_REALM_TOKEN_CFG
 	  tables to run a VM and help attest it. This is the config file that
 	  provides default paths. By default, use the one provided by realm-token.
 
-endif # BR2_PACKAGE_REALM_TOKEN
+endif # BR2_PACKAGE_CCA_REALM_MEASUREMENTS

package/realm-token/realm-token.mk → package/cca-realm-measurements/cca-realm-measurements.mk

 ################################################################################
 #
-# realm-token 
+# cca-realm-measurements
 #
 ################################################################################
 
-REALM_TOKEN_VERSION = main
-REALM_TOKEN_SITE = https://git.codelinaro.org/linaro/dcap/realm-token.git
+CCA_REALM_MEASUREMENTS_VERSION = main
+CCA_REALM_MEASUREMENTS_SITE = git@github.com:veraison/cca-realm-measurements.git
 
-REALM_TOKEN_SITE_METHOD = git
-REALM_TOKEN_LICENSE = Apache-2.0 or MIT
-REALM_TOKEN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+CCA_REALM_MEASUREMENTS_SITE_METHOD = git
+CCA_REALM_MEASUREMENTS_LICENSE = Apache-2.0 or MIT
+CCA_REALM_MEASUREMENTS_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
 
-define REALM_TOKEN_INSTALL_TARGET_CMDS
+define CCA_REALM_MEASUREMENTS_INSTALL_TARGET_CMDS
 	cd $($(PKG)_SRCDIR) && \
 		$(TARGET_MAKE_ENV) \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(PKG_CARGO_ENV) \
-		$(REALM_TOKEN_CARGO_ENV) \
+		$(CCA_REALM_MEASUREMENTS_CARGO_ENV) \
 		cargo install \
 			--offline \
 			--root $(TARGET_DIR)/usr/ \
@@ -25,13 +25,13 @@ define REALM_TOKEN_INSTALL_TARGET_CMDS
 			--force \
 			--locked \
 			-Z target-applies-to-host \
-			$(REALM_TOKEN_CARGO_INSTALL_OPTS) && \
-		install -Dt $(TARGET_DIR)/usr/share/realm-token/configs/ configs/* && \
-		install -Dt $(TARGET_DIR)/usr/share/realm-token/ $(BR2_PACKAGE_REALM_TOKEN_CFG) && \
+			$(CCA_REALM_MEASUREMENTS_CARGO_INSTALL_OPTS) && \
+		install -Dt $(TARGET_DIR)/usr/share/cca-realm-measurements/configs/ configs/* && \
+		install -Dt $(TARGET_DIR)/usr/share/cca-realm-measurements/ $(BR2_PACKAGE_CCA_REALM_MEASUREMENTS_CFG) && \
 		install -Dt $(TARGET_DIR)/usr/bin/ scripts/gen-run-vmm.sh
 endef
 
 # Depends on OpenSSL lib, so pkg-config is used during build
-REALM_TOKEN_DEPENDENCIES += host-pkgconf openssl
+CCA_REALM_MEASUREMENTS_DEPENDENCIES += host-pkgconf openssl
 
 $(eval $(cargo-package))

package/cca-workload-attestation/cca-workload-attestation.mk

@@ -15,5 +15,6 @@ CCA_WORKLOAD_ATTESTATION_GOMOD = git.codelinaro.org/linaro/dcap/cca-demos/cca-wo
 # Uncomment the next two lines for a statically linked application
 #CCA_WORKLOAD_ATTESTATION_GO_ENV = CGO_ENABLED=0 GOARCH=arm64 GOOS=linux
 #CCA_WORKLOAD_ATTESTATION_LDFLAGS = -s -w
+#CCA_WORKLOAD_ATTESTATION_GO_ENV = GOFLAGS=-mod=mod
 
 $(eval $(golang-package))

package/keybroker-demo/keybroker-demo.mk

@@ -4,13 +4,26 @@
 #
 ################################################################################
 
+# To use your own source directory during development:
+#
+# - Add a local.mk file in the buildroot build directory
+#
+#     BUILD_DIR=~/.shrinkwrap/build/cca-3world/buildroot
+#     echo "KEYBROKER_DEMO_OVERRIDE_SRCDIR = /path/to/sourcedir" > $BUILD_DIR/local.mk
+#
+# - Sync the source directory after modifications
+#
+#     make -C $BUILD_DIR keybroker-demo-rebuild
+
 KEYBROKER_DEMO_VERSION = main
 KEYBROKER_DEMO_SITE = https://github.com/veraison/keybroker-demo.git
+#KEYBROKER_DEMO_SITE = file:///home/z/src/cca/keybroker-demo
 KEYBROKER_DEMO_SITE_METHOD = git
 KEYBROKER_DEMO_LICENSE = Apache-2.0
 KEYBROKER_DEMO_LICENSE_FILES = LICENSE-APACHE
 KEYBROKER_DEMO_SUBDIR = rust-keybroker/keybroker-app
 
+# Depends on OpenSSL lib, so pkg-config is used during build
 KEYBROKER_DEMO_DEPENDENCIES += host-pkgconf openssl
 
 $(eval $(cargo-package))