<div dir="ltr"><div class="gmail_default" style="font-family:monospace,monospace">Hello, Tim. I agree that having fuego-core inside fuego</div><div class="gmail_default" style="font-family:monospace,monospace">should make things simpler.</div><div class="gmail_default" style="font-family:monospace,monospace"><br></div><div class="gmail_default" style="font-family:monospace,monospace">I saw that you're explicitly cloning fuego-core inside the</div><div class="gmail_default" style="font-family:monospace,monospace">install script. Did you consider using a git submodule</div><div class="gmail_default" style="font-family:monospace,monospace">instead? This would allow us to make fuego track a specific</div><div class="gmail_default" style="font-family:monospace,monospace">version (commit hash) of fuego-core, locking it into that version.</div><div class="gmail_default" style="font-family:monospace,monospace"><br></div><div class="gmail_default" style="font-family:monospace,monospace">Comes with the downside that we would need to create a commit</div><div class="gmail_default" style="font-family:monospace,monospace">to update the hash that's being tracked, every time that changes</div><div class="gmail_default" style="font-family:monospace,monospace">are pushed to fuego-core, though. So I'm not sure if this would be</div><div class="gmail_default" style="font-family:monospace,monospace">the best option.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 21, 2018 at 10:03 PM, <span dir="ltr"><<a href="mailto:Tim.Bird@sony.com" target="_blank">Tim.Bird@sony.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The following is a patch I'm considering, to move fuego-core<br>
inside the 'fuego' directory, at the top level, parallel to<br>
fuego-ro and fuego-rw. I think this simplifies our current<br>
installation a bit. This setup still allows us to upgrade fuego<br>
and fuego-core separately, if needed. But IMHO it's easier<br>
to understand.<br>
<br>
Note - I'm aware that profusion developers are working<br>
to eliminate the need for the image build, which might<br>
make this patch unnecessary. But I thought I'd throw this<br>
out there for the Fuego 1.3 release (which I'd like to cut soon).<br>
<br>
Please let me know if you have any feedback.<br>
-----<br>
Modify install.sh to automatically download fuego-core if it's<br>
not already present, into the current directory. Use a nested<br>
directory instead of having fuego-core in a parallel directory<br>
because it's simplifies the install (removes one step), and<br>
keeps things more nicely contained.<br>
<br>
Alter the create-container scripts to use the new location.<br>
<br>
Signed-off-by: Tim Bird <<a href="mailto:tim.bird@sony.com">tim.bird@sony.com</a>><br>
---<br>
.gitignore | 1 +<br>
fuego-host-scripts/docker-<wbr>create-container.sh | 2 +-<br>
.../docker-create-usb-<wbr>privileged-container.sh | 2 +-<br>
install.sh | 19 ++++++++++++++++++-<br>
4 files changed, 21 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/.gitignore b/.gitignore<br>
index 408537a..6f33f41 100644<br>
--- a/.gitignore<br>
+++ b/.gitignore<br>
@@ -1 +1,2 @@<br>
fuego-rw<br>
+fuego-core<br>
diff --git a/fuego-host-scripts/docker-<wbr>create-container.sh b/fuego-host-scripts/docker-<wbr>create-container.sh<br>
index 20f4b59..1224ae2 100755<br>
--- a/fuego-host-scripts/docker-<wbr>create-container.sh<br>
+++ b/fuego-host-scripts/docker-<wbr>create-container.sh<br>
@@ -21,6 +21,6 @@ sudo docker create -it --name ${DOCKERCONTAINER} \<br>
-v /boot:/boot:ro \<br>
-v $DIR/../fuego-rw:/fuego-rw \<br>
-v $DIR/../fuego-ro:/fuego-ro:ro \<br>
- -v $DIR/../../fuego-core:/fuego-<wbr>core:ro \<br>
+ -v $DIR/../fuego-core:/fuego-<wbr>core:ro \<br>
--net="host" ${DOCKERIMAGE} || \<br>
echo "Could not create fuego-container. See error messages."<br>
diff --git a/fuego-host-scripts/docker-<wbr>create-usb-privileged-<wbr>container.sh b/fuego-host-scripts/docker-<wbr>create-usb-privileged-<wbr>container.sh<br>
index b3a55c4..58e7d8d 100755<br>
--- a/fuego-host-scripts/docker-<wbr>create-usb-privileged-<wbr>container.sh<br>
+++ b/fuego-host-scripts/docker-<wbr>create-usb-privileged-<wbr>container.sh<br>
@@ -27,6 +27,6 @@ sudo docker create -it --name ${DOCKERCONTAINER} \<br>
-v /dev/serial:/dev/serial \<br>
-v $DIR/../fuego-rw:/fuego-rw \<br>
-v $DIR/../fuego-ro:/fuego-ro:ro \<br>
- -v $DIR/../../fuego-core:/fuego-<wbr>core:ro \<br>
+ -v $DIR/../fuego-core:/fuego-<wbr>core:ro \<br>
--net="host" ${DOCKERIMAGE} || \<br>
echo "Could not create fuego-container. See error messages."<br>
diff --git a/install.sh b/install.sh<br>
index 2193559..caf128f 100755<br>
--- a/install.sh<br>
+++ b/install.sh<br>
@@ -1,2 +1,19 @@<br>
-source fuego-host-scripts/docker-<wbr>build-image.sh $1<br>
+#!/bin/bash<br>
+<br>
+# Fuego install.sh<br>
+# clone fuego-core (nested inside current dir) if not present<br>
+# this requires that install.sh be executed at the top fuego dir.<br>
+if [ ! -e fuego-core/engine/scripts/ftc ] ; then<br>
+ git clone<div class="gmail_default" style="font-family:monospace,monospace;display:inline"></div> <a href="http://bitbucket.org/tbird20d/fuego-core.git" rel="noreferrer" target="_blank">http://bitbucket.org/tbird20d/<wbr>fuego-core.git</a><br>
+fi<br></blockquote><div><br></div><div><div class="gmail_default" style="font-family:monospace,monospace">I suggest using --depth and --single-branch on this one as follows:</div><div class="gmail_default" style="font-family:monospace,monospace"><br></div><div class="gmail_default"><font face="monospace, monospace">git clone --depth 1 --single-branch --branch master<span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><span> </span></span><a href="http://bitbucket.org/tbird20d/fuego-core.git" rel="noreferrer" target="_blank" style="color:rgb(17,85,204);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255)">http://bitbucket.org/tbird20d/<wbr>fuego-core.git</a></font><br></div><div class="gmail_default"><br></div><div class="gmail_default">The fuego-core repo is large enough that we might save some megabytes by doing that.</div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+<br>
+# indicate fuego-core version, just to remind user<br>
+# (in case they are using an existing repo)<br>
+pushd fuego-core<br>
+CORE_VERSION=$(git describe)<br>
+echo "Using fuego-core version: $CORE_VERSION"<br>
+popd<br>
+<br>
sudo /bin/sh -c "if [ -f /etc/ttc.conf -a ! -f fuego-ro/conf/ttc.conf ] ; then cp /etc/ttc.conf fuego-ro/conf/ttc.conf ; fi"<br>
+<br>
+source fuego-host-scripts/docker-<wbr>build-image.sh $1<br>
<span class="gmail-HOEnZb"><font color="#888888">--<br>
1.9.1<br>
<br>
______________________________<wbr>_________________<br>
Fuego mailing list<br>
<a href="mailto:Fuego@lists.linuxfoundation.org">Fuego@lists.linuxfoundation.<wbr>org</a><br>
<a href="https://lists.linuxfoundation.org/mailman/listinfo/fuego" rel="noreferrer" target="_blank">https://lists.linuxfoundation.<wbr>org/mailman/listinfo/fuego</a></font></span></blockquote><div><br></div><div class="gmail_default" style="font-family:monospace,monospace">Thanks</div></div><br></div></div>