Fix dtsi patching in zephyr

kemtls · May 29, 2022 · 4cb1ed7 · 4cb1ed7
1 parent de0eafe
commit 4cb1ed7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/scripts/pqtls/generate_certificates.sh b/scripts/pqtls/generate_certificates.sh
@@ -19,5 +19,7 @@ fi
 cd $OQS_FOLDER
 echo "Running certificate builder in Docker."
 docker-compose run builder sh /mnt/scripts/gen_certs.sh
+cd ..
+
 echo "Fixing Permissions"
-sudo chmod a+r ${OQS_FOLDER}/certs/*
+sudo chmod a+r $CERT_FOLDER/*
diff --git a/scripts/pqtls/run_experiments.sh b/scripts/pqtls/run_experiments.sh
@@ -47,8 +47,9 @@ scripts/pqtls/build_wolfssl.sh --init
 echo "Fixing Permissions"
 sudo chown -R $(whoami): ${WORKSPACE_PATH}/modules/crypto/wolfssl/
 
-cmp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi
-if [ "$?" -ne "0" ]; then
+RES=0
+cmp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi||RES=$(echo $?)
+if [ "$RES" -ne "0" ]; then
     echo "Patching dts file so west knows GG11 has 512KB RAM"
     sudo cp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi
 fi

diff --git a/scripts/run_experiments.sh b/scripts/run_experiments.sh
@@ -50,8 +50,9 @@ echo "Changeing permissions on relevante files."
 sudo chmod a+w ${WORKSPACE_PATH}/modules/crypto/wolfssl/zephyr/kemtlsexperiments.h
 sudo chmod a+w ${WORKSPACE_PATH}/modules/crypto/wolfssl/zephyr/kemtls_ca.h
 
-cmp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi
-if [ "$?" -ne "0" ]; then 
+RES=0
+cmp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi||RES=$(echo $?)
+if [ "$RES" -ne "0" ]; then 
     echo "Patching dts file so west knows GG11 has 512KB RAM"
     sudo cp scripts/templates/efm32gg11b820f2048gl192.dtsi ${WORKSPACE_PATH}/zephyr/dts/arm/silabs/efm32gg11b820f2048gl192.dtsi
 fi