On Wed, May 9, 2018 at 7:55 PM, Geraldo Netto <geraldone...@gmail.com> wrote:
> Dear Friends, > > Just a quick thing, I was syncing my local OSv repos > and I noticed something with osv-apps: > > netto@besta01 ~/Desktop/osv/osv-clean $ git pull > remote: Counting objects: 7, done. > remote: Compressing objects: 100% (1/1), done. > remote: Total 7 (delta 6), reused 7 (delta 6), pack-reused 0 > Unpacking objects: 100% (7/7), done. > From https://github.com/cloudius-systems/osv > 54e6c42..cc6e8f5 master -> origin/master > Updating 54e6c42..cc6e8f5 > Fast-forward > core/elf.cc | 4 +++- > include/osv/elf.hh | 9 +++++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > netto@besta01 ~/Desktop/osv/osv-clean $ cd apps/ > netto@besta01 ~/Desktop/osv/osv-clean/apps $ git pull > You are not currently on a branch. > Please specify which branch you want to merge with. > See git-pull(1) for details. > > git pull <remote> <branch> > > netto@besta01 ~/Desktop/osv/osv-clean/apps $ git branch > * (HEAD detached at 7d9b71e) > master > This is how "git submodules" work. Basically the main osv.git can decide which specific version of the separate apps.git "submodule" works with it. It's not super-convenient, but it works. But it means every time we add interesting commits in apps.git, we also need to update osv.git, by doing: git add apps git commit As a non-committer, you usually don't need to do anything like that, the committers will do it for you. You can also do "cd apps; git checkout master" like you did, if you want. Or if you do in the osv/ directory "git submodule update" it will check out the one listed in the osv.git repository. > > > Also, I think we should apply problame patch on .gitmodules: > https://github.com/problame/ba-osv/commit/b679864fea150fb776117fc850b75b > 7c4ce61f4d > I don't remember why we had it relative like that, and if relative why two .. and not just one? What is the *benefit* of not making it relative? Where does this patch come from, and why do you want it? I think the benefit of relative is that if someone connects to github in a different way, not https, he'll also get the submodules via the same way. But I'm not sure here. > > @@ -1,52 +1,52 @@ > [submodule "external/x64/openjdk.bin"] > path = external/x64/openjdk.bin > - url = ../../cloudius-systems/openjdk.bin > + url = https://github.com/cloudius-systems/openjdk.bin > ignore = dirty > [submodule "external/x64/gcc.bin"] > path = external/x64/gcc.bin > - url = ../../cloudius-systems/gcc.bin > + url = https://github.com/cloudius-systems/gcc.bin > ignore = dirty > [submodule "external/x64/glibc.bin"] > path = external/x64/glibc.bin > - url = ../../cloudius-systems/glibc.bin > + url = https://github.com/cloudius-systems/glibc.bin > ignore = dirty > [submodule "external/x64/glibc-testsuite"] > path = external/x64/glibc-testsuite > - url = ../../cloudius-systems/glibc-testsuite > + url = https://github.com/cloudius-systems/glibc-testsuite > ignore = dirty > [submodule "external/x64/acpica"] > path = external/x64/acpica > - url = ../../cloudius-systems/acpica > + url = https://github.com/cloudius-systems/acpica > ignore = dirty > [submodule "external/x64/misc.bin"] > path = external/x64/misc.bin > - url = ../../cloudius-systems/misc.bin.git > + url = https://github.com/cloudius-systems/misc.bin.git > ignore = dirty > [submodule "apps"] > path = apps > - url = ../../cloudius-systems/osv-apps > + url = https://github.com/cloudius-systems/osv-apps > ignore = dirty > [submodule "external/aarch64/gcc.bin"] > path = external/aarch64/gcc.bin > - url = ../../cloudius-systems/aarch64-gcc.bin.git > + url = https://github.com/cloudius-systems/aarch64-gcc.bin.git > [submodule "external/aarch64/misc.bin"] > path = external/aarch64/misc.bin > - url = ../../cloudius-systems/aarch64-misc.bin.git > + url = https://github.com/cloudius-systems/aarch64-misc.bin.git > [submodule "external/aarch64/openjdk.bin"] > path = external/aarch64/openjdk.bin > - url = ../../cloudius-systems/aarch64-openjdk.bin.git > + url = https://github.com/cloudius-systems/aarch64-openjdk.bin.git > [submodule "modules/httpserver/swagger-ui"] > path = modules/httpserver-html5-gui/swagger-ui > - url = ../../cloudius-systems/swagger-ui.git > + url = https://github.com/cloudius-systems/swagger-ui.git > [submodule "musl"] > path = musl > - url = ../../cloudius-systems/musl.git > + url = https://github.com/cloudius-systems/musl.git > [submodule "modules/httpserver/osv-gui"] > path = modules/httpserver-html5-gui/osv-gui > - url = ../../cloudius-systems/osv-gui.git > + url = https://github.com/cloudius-systems/osv-gui.git > [submodule "external/fs/libnfs"] > path = external/fs/libnfs > url = https://github.com/sahlberg/libnfs.git > > > > > Kind Regards, > > Geraldo Netto > Sapere Aude => Non dvcor, dvco > http://exdev.sf.net/ > > -- > You received this message because you are subscribed to the Google Groups > "OSv Development" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to osv-dev+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to osv-dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
