[oe-commits] [bitbake] 13/18: fetch2: add symlinks for mirror tarballs
git at git.openembedded.org
git at git.openembedded.org
Tue Oct 16 20:01:13 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit b786190ccc3361372feac4c0eced07ecd9b9bd87
Author: Urs Fässler <urs.fassler at bbv.ch>
AuthorDate: Mon Oct 15 13:43:21 2018 +0000
fetch2: add symlinks for mirror tarballs
In the unpack step the mirror tarball is not found when the mirrored
tarball is named differently than the original tarball. This happens
due to mirror rewrite rules. To solve the problem we add symlinks for
the differently named tarballs.
Signed-off-by: Urs Fässler <urs.fassler at bbv.ch>
Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/fetch2/__init__.py | 4 ++++
lib/bb/tests/fetch.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 9aea08b..ccd3469 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1019,6 +1019,10 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
return origud.localpath
# Otherwise the result is a local file:// and we symlink to it
ensure_symlink(ud.localpath, origud.localpath)
+
+ if os.path.exists(ud.fullmirror):
+ ensure_symlink(ud.fullmirror, origud.fullmirror)
+
update_stamp(origud, ld)
return ud.localpath
diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
index 9bed06b..1cd4c65 100644
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -29,6 +29,20 @@ from bb.fetch2 import URI
from bb.fetch2 import FetchMethod
import bb
+
+def get_broken_symlinks(directory):
+ result = []
+
+ dir = os.listdir(directory)
+ for filename in dir:
+ fullname = directory + '/' + filename
+ broken = (not os.path.exists(fullname)) and os.path.islink(fullname)
+ if broken:
+ result += [filename]
+
+ return result
+
+
def skipIfNoNetwork():
if os.environ.get("BB_SKIP_NETTESTS") == "yes":
return unittest.skip("Network tests being skipped")
@@ -536,7 +550,7 @@ class TarballNamingTest(FetcherTest):
self.assertIn(self.recipe_tarball, dir)
@skipIfNoNetwork()
- def test_that_the_mirror_tarball_is_created_when_mirroring_is_used(self):
+ def test_that_tarball_for_mirrored_url_and_recipe_url_exists_when_mirroring_is_used(self):
self.setup_mirror_rewrite()
fetcher = bb.fetch.Fetch([self.recipe_url], self.d)
@@ -544,6 +558,7 @@ class TarballNamingTest(FetcherTest):
dir = os.listdir(self.dldir)
self.assertIn(self.mirror_tarball, dir)
+ self.assertIn(self.recipe_tarball, dir)
class GitShallowTarballNamingTest(FetcherTest):
@@ -882,6 +897,12 @@ class FetcherNetworkTest(FetcherTest):
self.gitfetcher(recipeurl, recipeurl)
@skipIfNoNetwork()
+ def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_mirror(self):
+ recipeurl = "git://git.wrong.org/bitbake"
+ self.d.setVar("MIRRORS", "git://git.wrong.org/bitbake git://git.openembedded.org/bitbake \n")
+ self.gitfetcher(recipeurl, recipeurl)
+
+ @skipIfNoNetwork()
def test_gitfetch_finds_local_repository_when_premirror_rewrites_the_recipe_url(self):
realurl = "git://git.openembedded.org/bitbake"
recipeurl = "git://someserver.org/bitbake"
@@ -892,6 +913,36 @@ class FetcherNetworkTest(FetcherTest):
self.gitfetcher(recipeurl, recipeurl)
@skipIfNoNetwork()
+ def test_gitfetch_uses_the_git_tarball_when_using_mirror_rewrite_rules_and_the_git_clone_does_not_exist(self):
+ self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0')
+ self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1')
+ self.d.setVar('PREMIRRORS', 'git://git.yoctoproject.org/.* git://git.yoctoproject.org/git/PATH;protocol=https \n')
+ fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests"], self.d)
+ fetcher.download()
+ bb.utils.prunedir(self.dldir + '/git2')
+ bb.utils.prunedir(self.unpackdir)
+ self.d.setVar('PREMIRRORS', '')
+ self.d.setVar('BB_FETCH_PREMIRRORONLY', '1')
+
+ fetcher.download()
+
+ fetcher.unpack(self.unpackdir)
+ dir = os.listdir(self.unpackdir + "/git/")
+ self.assertIn("fstests.doap", dir)
+
+ @skipIfNoNetwork()
+ def test_that_no_broken_symlinks_exist_when_using_mirror_rewrite_rules_and_no_tarball(self):
+ self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0')
+ self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '0')
+ self.d.setVar('PREMIRRORS', 'git://git.yoctoproject.org/.* git://git.yoctoproject.org/git/PATH;protocol=https \n')
+ fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests"], self.d)
+
+ fetcher.download()
+
+ broken_symlinks = get_broken_symlinks(self.dldir)
+ self.assertEqual([], broken_symlinks)
+
+ @skipIfNoNetwork()
def test_git_submodule(self):
fetcher = bb.fetch.Fetch(["gitsm://git.yoctoproject.org/git-submodule-test;rev=f12e57f2edf0aa534cf1616fa983d165a92b0842"], self.d)
fetcher.download()
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list