Skip to contentSkip to conversation

setup-targetfs-nfs: Update command to replace Rules.make variables

PATCH In review Nikhil Devshatwar 2 participants 2 messages Dec 9, 2019 – Dec 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 setup-targetfs-nfs: Update command to replace Rules.make variables

Update the setup-targetfs-nfs.sh to replace Rules.make variables so that they are initialized conditionally.

---
 setup-targetfs-nfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
setup-targetfs-nfs.sh +2 -2
index 60817ca..ac1611c 100644
@@ -145,10 +145,10 @@ echo "EXEC_DIR or DESTDIR variable (depending on your SDK)."
 echo
 read -p "Press return to continue" REPLY
 
-sed -i "s=EXEC_DIR\=.*$=EXEC_DIR\=$dst/home/root/$platform=g" $cwd/../Rules.make
+sed -i "s=EXEC_DIR ?\=.*$=EXEC_DIR ?\=$dst/home/root/$platform=g" $cwd/../Rules.make
 check_status
 
-sed -i "s=DESTDIR\=.*$=DESTDIR\=$dst=g" $cwd/../Rules.make
+sed -i "s=DESTDIR ?\=.*$=DESTDIR ?\=$dst=g" $cwd/../Rules.make
 check_status
 
 echo "Rules.make edited successfully.."
Signature · 1 line
2.17.1
#1 lore raw

This has been pushed to master.

Thank you,

Jake

Quoted 25 lines · Nikhil Devshatwar

Update the setup-targetfs-nfs.sh to replace Rules.make variables so that they are initialized conditionally.

---
  setup-targetfs-nfs.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
setup-targetfs-nfs.sh +2 -2
index 60817ca..ac1611c 100644
@@ -145,10 +145,10 @@ echo "EXEC_DIR or DESTDIR variable (depending on your SDK)."
  echo
  read -p "Press return to continue" REPLY
 
-sed -i "s=EXEC_DIR\=.*$=EXEC_DIR\=$dst/home/root/$platform=g" $cwd/../Rules.make
+sed -i "s=EXEC_DIR ?\=.*$=EXEC_DIR ?\=$dst/home/root/$platform=g" $cwd/../Rules.make
  check_status
 
-sed -i "s=DESTDIR\=.*$=DESTDIR\=$dst=g" $cwd/../Rules.make
+sed -i "s=DESTDIR ?\=.*$=DESTDIR ?\=$dst=g" $cwd/../Rules.make
  check_status
 
  echo "Rules.make edited successfully.."