diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch2/gitsm.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index a4527bf364..a7110a988d 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py | |||
@@ -140,16 +140,6 @@ class GitSM(Git): | |||
140 | if Git.need_update(self, ud, d): | 140 | if Git.need_update(self, ud, d): |
141 | return True | 141 | return True |
142 | 142 | ||
143 | try: | ||
144 | # Check for the nugget dropped by the download operation | ||
145 | known_srcrevs = runfetchcmd("%s config --get-all bitbake.srcrev" % \ | ||
146 | (ud.basecmd), d, workdir=ud.clonedir) | ||
147 | |||
148 | if ud.revisions[ud.names[0]] in known_srcrevs.split(): | ||
149 | return False | ||
150 | except bb.fetch2.FetchError: | ||
151 | pass | ||
152 | |||
153 | need_update_list = [] | 143 | need_update_list = [] |
154 | def need_update_submodule(ud, url, module, modpath, workdir, d): | 144 | def need_update_submodule(ud, url, module, modpath, workdir, d): |
155 | url += ";bareclone=1;nobranch=1" | 145 | url += ";bareclone=1;nobranch=1" |
@@ -172,11 +162,6 @@ class GitSM(Git): | |||
172 | shutil.rmtree(tmpdir) | 162 | shutil.rmtree(tmpdir) |
173 | else: | 163 | else: |
174 | self.process_submodules(ud, ud.clonedir, need_update_submodule, d) | 164 | self.process_submodules(ud, ud.clonedir, need_update_submodule, d) |
175 | if len(need_update_list) == 0: | ||
176 | # We already have the required commits of all submodules. Drop | ||
177 | # a nugget so we don't need to check again. | ||
178 | runfetchcmd("%s config --add bitbake.srcrev %s" % \ | ||
179 | (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) | ||
180 | 165 | ||
181 | if len(need_update_list) > 0: | 166 | if len(need_update_list) > 0: |
182 | logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) | 167 | logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list))) |
@@ -209,9 +194,6 @@ class GitSM(Git): | |||
209 | shutil.rmtree(tmpdir) | 194 | shutil.rmtree(tmpdir) |
210 | else: | 195 | else: |
211 | self.process_submodules(ud, ud.clonedir, download_submodule, d) | 196 | self.process_submodules(ud, ud.clonedir, download_submodule, d) |
212 | # Drop a nugget for the srcrev we've fetched (used by need_update) | ||
213 | runfetchcmd("%s config --add bitbake.srcrev %s" % \ | ||
214 | (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) | ||
215 | 197 | ||
216 | def unpack(self, ud, destdir, d): | 198 | def unpack(self, ud, destdir, d): |
217 | def unpack_submodules(ud, url, module, modpath, workdir, d): | 199 | def unpack_submodules(ud, url, module, modpath, workdir, d): |