From 147a71453663e887e69d40dddc10dd0a407828dc Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Thu, 15 Jul 2010 16:25:27 +0300 Subject: [PATCH] gitmodules: Use relative path so modules can also work with http: clones Thanks to the guys at the git mailing list Peter Krefting & Jonathan Nieder One can use a relative patch (Starting with an ./ or ../) to support both http: or git: protocols given the sub-module is hosted on the same root address. Also update documentation for the use of "git clone --recursive" which now works for both protocols. Signed-off-by: Boaz Harrosh --- .gitmodules | 2 +- README | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0a317f5..85df4ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "tgt"] path = tgt - url = git://git.open-osd.org/osc-osd/tgt + url = ../tgt/.git diff --git a/README b/README index 34541ba..5cac397 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ a submodule, so a user that needs an OSD2 target need only clone one head and everything will sync automatically. The git tree is here: - git-clone git://git.open-osd.org/osc-osd + git-clone --recursive git://git.open-osd.org/osc-osd or viewed http://git.open-osd.org/gitweb.cgi?p=osc-osd/.git;a=summary @@ -91,26 +91,29 @@ needed is the sqlite-devel package. For example: all a user need is to follow these steps: - at some parent folder do -[]$ git clone git://git.open-osd.org/osc-osd +[]$ git clone --recursive git://git.open-osd.org/osc-osd + +If behind a firewall and in need of "http:" access do: +[]$ git clone --recursive http://git.open-osd.org/trees/osc-osd/.git + (Please use relatively new git version) []$ cd osc-osd/ -- At this point we need one additional step +- The above "--recursive" switch cloned everything for us. If you forgot + You'll need one additional step []$ git submodule init []$ git submodule update - This last command will auto clone the tgt git tree and will - checkout the exact point of the tree needed at that point of - the osc-osd tree. + These last commands will auto clone the tgt git tree. -- That's it we are ready you should now do +- That's it we are ready and should now do: []$ make And it should all compile. See the osd-target/README for additional information. - For running the target also read osd-target/README and tgt/doc/. But basically you should run ./up for a debug - load of an OSD2 target. The backing store of the target - will be at the default /tmp/... + load of an OSD2 target. Edit the ./up script to specify + the backing store of the target, default is at /var/osd-tgt/... From time to time if you want to update on osc-osd progress you might do: