mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00
Code Issues Projects Releases Wiki Activity

archiver: Capture git submodules in mirror archiver

Browse Source 
Using the new Fetch.expanded_urldata() function we can get URL data for
all git submodules.

(From OE-Core rev: d908ca51b72f4ba417e7573ae3d953535f53286c)

Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Barker
2020-06-04 18:33:01 +01:00
committed by Richard Purdie
parent c20cb1a00e
commit 43f940172a
2 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/archiver.bbclass
+6 -7
View File
@@ -345,13 +345,12 @@ python do_ar_mirror() {
fetcher = bb.fetch2.Fetch(src_uri, d)
for url in fetcher.urls:
if is_excluded(url):
bb.note('Skipping excluded url: %s' % (url))
for ud in fetcher.expanded_urldata():
if is_excluded(ud.url):
bb.note('Skipping excluded url: %s' % (ud.url))
continue
bb.note('Archiving url: %s' % (url))
ud = fetcher.ud[url]
bb.note('Archiving url: %s' % (ud.url))
ud.setup_localpath(d)
localpath = None
@@ -367,7 +366,7 @@ python do_ar_mirror() {
if len(ud.mirrortarballs) and not localpath:
bb.warn('Mirror tarballs are listed for a source but none are present. ' \
'Falling back to original download.\n' \
'SRC_URI = %s' % (url))
'SRC_URI = %s' % (ud.url))
# Check original download
if not localpath:
@@ -376,7 +375,7 @@ python do_ar_mirror() {
if not localpath or not os.path.exists(localpath):
bb.fatal('Original download is missing for a source.\n' \
'SRC_URI = %s' % (url))
'SRC_URI = %s' % (ud.url))
# We now have an appropriate localpath
bb.note('Copying source mirror')
meta/lib/oeqa/selftest/cases/archiver.py
+54
View File
@@ -255,3 +255,57 @@ class Archiver(OESelftestTestCase):
glob_str = os.path.join(bb_vars['DEPLOY_DIR_SRC'], 'mirror', target_file_name)
glob_result = glob.glob(glob_str)
self.assertTrue(glob_result, 'Missing archive file %s' % (target_file_name))
def test_archiver_mode_mirror_gitsm(self):
"""
Test that the archiver correctly handles git submodules with
`ARCHIVER_MODE[src] = "mirror"`.
"""
features = 'INHERIT += "archiver"\n'
features += 'ARCHIVER_MODE[src] = "mirror"\n'
features += 'ARCHIVER_MODE[mirror] = "combined"\n'
features += 'BB_GENERATE_MIRROR_TARBALLS = "1"\n'
features += 'COPYLEFT_LICENSE_INCLUDE = "*"\n'
self.write_config(features)
bitbake('-c clean git-submodule-test')
bitbake('-c deploy_archives -f git-submodule-test')
bb_vars = get_bb_vars(['DEPLOY_DIR_SRC'])
for target_file_name in [
'git2_git.yoctoproject.org.git-submodule-test.tar.gz',
'git2_git.yoctoproject.org.bitbake-gitsm-test1.tar.gz',
'git2_git.yoctoproject.org.bitbake-gitsm-test2.tar.gz',
'git2_git.openembedded.org.bitbake.tar.gz'
]:
target_path = os.path.join(bb_vars['DEPLOY_DIR_SRC'], 'mirror', target_file_name)
self.assertTrue(os.path.exists(target_path))
def test_archiver_mode_mirror_gitsm_shallow(self):
"""
Test that the archiver correctly handles git submodules with
`ARCHIVER_MODE[src] = "mirror"`.
"""
features = 'INHERIT += "archiver"\n'
features += 'ARCHIVER_MODE[src] = "mirror"\n'
features += 'ARCHIVER_MODE[mirror] = "combined"\n'
features += 'BB_GENERATE_MIRROR_TARBALLS = "1"\n'
features += 'COPYLEFT_LICENSE_INCLUDE = "*"\n'
features += 'BB_GIT_SHALLOW = "1"\n'
features += 'BB_GENERATE_SHALLOW_TARBALLS = "1"\n'
features += 'DL_DIR = "${TOPDIR}/downloads-shallow"\n'
self.write_config(features)
bitbake('-c clean git-submodule-test')
bitbake('-c deploy_archives -f git-submodule-test')
bb_vars = get_bb_vars(['DEPLOY_DIR_SRC'])
for target_file_name in [
'gitsmshallow_git.yoctoproject.org.git-submodule-test_a2885dd-1_master.tar.gz',
'gitsmshallow_git.yoctoproject.org.bitbake-gitsm-test1_bare_120f4c7-1.tar.gz',
'gitsmshallow_git.yoctoproject.org.bitbake-gitsm-test2_bare_f66699e-1.tar.gz',
'gitsmshallow_git.openembedded.org.bitbake_bare_52a144a-1.tar.gz',
'gitsmshallow_git.openembedded.org.bitbake_bare_c39b997-1.tar.gz'
]:
target_path = os.path.join(bb_vars['DEPLOY_DIR_SRC'], 'mirror', target_file_name)
self.assertTrue(os.path.exists(target_path))