Implement basic yocto build setup based on protos from jhnc-oss

2023-07-12 18:27:59 +02:00
parent 139c702d3d
commit eaed13f9a2
1 changed files with 1 additions and 0 deletions
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -56,6 +56,7 @@ if $DO_SSTATE ; then
 fi

 if $DO_DEPLOY ; then
+<<<<<<< HEAD
    DEPLOY_PATH="deploy"
    mkdir -p $DEPLOY_PATH
    rm -rf "$DEPLOY_PATH"/*