diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2023-05-05 19:29:21 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2023-05-19 16:11:41 +0300 |
commit | 028142bd6118b39dd3928195162e5f1cf2a8f3ce (patch) | |
tree | de3fc1d81a0e7046980dd4ab7829942b08d4db3e /poky/bitbake/lib | |
parent | d452b77b0ed98c8f3dcd413078e87f25ab4a3b1d (diff) | |
download | openbmc-028142bd6118b39dd3928195162e5f1cf2a8f3ce.tar.xz |
subtree updates
poky: cce6db2a59..76cec94fad:
Alex Kiernan (1):
rust: Upgrade 1.68.2 -> 1.69.0
Alexander Kanavin (10):
selftest/distrodata: clean up exception lists in recipe maintainers test
dhcpcd: use git instead of tarballs
perl: patch out build paths from native binaries
binutils: backport a patch to address failures when time64.inc is in use
time64.inc: add glibc-testsuite to 'special cases'
bitbake.conf: set minimum required target kernel to 5.15
time64.inc: add a comment about how to simulate Y2038 in qemu
oeqa/sdk/assimp: run only when zlib is in the SDK
insane.bbclass: simplify exceptions for 32 bit time API check
vulkan: add a comment explaining upstream version policy
Andrey Zhizhikin (1):
cryptodev: upgrade to 1.13
Armin Kuster (2):
maintainers.inc: remove myself from assignment
os-release: Add CPE_NAME
Changhyeok Bae (1):
iproute2: upgrade 6.2.0 -> 6.3.0
Enrico Jörns (1):
package_manager/ipk: fix config path generation in _create_custom_config()
Frederic Martinsons (3):
ptest-cargo.bbclass: create class
python3-bcrypt: enable build of unit tests
zvariant: add ptest feature for zvariant test suite
Jamin Lin (2):
kernel-fitimage: support 64 bits address
uboot-sign: support 64bits address
Joe Slater (1):
ghostscript: fix CVE-2023-28879
Johannes Schrimpf (1):
python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting
Khem Raj (8):
musl: Update to latest master
gpgme: Reset ac_cv_sys_file_offset_bits on musl
mpg123: Reset ac_cv_sys_file_offset_bits on musl
quilt: Fix merge.test race condition
systemd: Fix timesyncd runtime assertions with 64bit time_t
qtwebkitgtk: Backport a build fix for GCC 13
cmake: Upgrade to 3.26.3
piglit: Fix c++11-narrowing warnings in tests
Lee Chee Yang (1):
release-notes-4.2: remove/merge duplicates entries
Markus Volk (2):
gtk4: update 4.10.0 -> 4.10.3
gcr: update 4.0.0 -> 4.1.0
Martin Jansa (2):
populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE
image_types_wic: Remove incorrect MLPREFIX to already prefixed virtual/
Martin Siegumfeldt (1):
systemd-systemctl: fix instance template WantedBy symlink construction
Michael Halstead (1):
docs: add support for mickledore (4.2) release
Michael Opdenacker (3):
dev-manual: init-manager.rst: add summary
ref-manual: system-requirements.rst: fix AlmaLinux variable name
ref-manual: variables.rst: don't mention the INIT_MANAGER "none" option
Ming Liu (1):
weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland
Otavio Salvador (2):
glide: remove as 'go mod' has become standard
mesa: 23.0.2 -> 23.0.3
Patrick Williams (1):
perl-version: remove PERL* assignments
Paul Gortmaker (1):
scripts: fix buildstats diff/summary hard bound to host python3
Peter Bergin (1):
update-alternatives.bbclass: fix old override syntax
Peter Kjellerstedt (1):
license.bbclass: Include LICENSE in the output when it fails to parse
Petr Kubizňák (1):
devicetree.bbclass: Allow selection of dts files to build
Qiu Tingting (1):
lz4: Add ptest support
Randolph Sapp (1):
kernel-devicetree: allow specification of dtb directory
Ranjitsinh Rathod (1):
libbsd: Add correct license for all packages
Richard Purdie (13):
bitbake: cooker: Log config and parse cache status changes
binutils: Drop crosssdk suffix from virtual provides to improve dependency handling
gcc/go: Drop crosssdk suffix from virtual provides to improve dependency handling
oeqa/runtime/ptest: Make returning no test results a failure
python3-psutil: Drop nativesdk class extension due to breakage
maintainers.inc: Move apt/dpkg to unassigned
patchelf: Upgrade 0.17.2 -> 0.18.0
maintainers.inc: Fix email address typo
qemu: Add fix for powerpc instruction fallback issue
qemu: Upgrade 7.2.0 -> 8.0.0
maintainers.inc: Move repo to unassigned
recipes: Default to https git protocol where possible
bitbake: tests/fetch: Default to https git protocol where possible
Ross Burton (13):
python3-pytest: add missing tomllib RDEPENDS
libinput: upgrade to 1.23.0
gtk+3: upgrade 3.24.36 -> 3.24.37
piglit: upgrade to latest revision
dmidecode: upgrade to 3.5
connman: backport fix for CVE-2023-28488
vulkan-samples: update to latest SHA
glslang: upgrade to 1.3.243
vulkan-headers: upgrade to 1.3.243
vulkan-loader: upgrade to 1.3.243
vulkan-tools: upgrade to 1.3.243
spirv-headers: remove description
spirv-tools: remove redundant python3native inherit
Sergei Zhmylev (1):
wic: add support for proper kernel name to bootimg-pcbios
Sudip Mukherjee (5):
apt: Upgrade to v2.6.0
libxt: Upgrade to v1.3.0
libxfixes: Upgrade to v6.0.1
xwininfo: upgrade to v1.1.6
xinput: upgrade to v1.6.4
Tim Orling (1):
libmodule-build-perl: upgrade 0.4232 -> 0.4234
Upgrade Helper (1):
waffle: upgrade 1.7.0 -> 1.7.2
Virendra Thakur (1):
qemu: Whitelist CVE-2023-0664
hen Qi (1):
unfs3: fix symlink time setting issue
meta-openembedded: c5f330bc9a..f3cdc9d7ee:
Andrew Geissler (3):
etcd: add recipe
etcd: use v2.1.2 xhash to fix build issue
etcd: remove gobin requirement for build
Bergin, Peter (1):
freediameter: fix typo and old overide syntax
Bhargav Das (2):
tslib: Add native & nativestdk package support
pointercal: Add native & nativestdk package support
Gianfranco Costamagna (1):
dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9a2312d3512a27620d41b9a325338b6e7b3d42de)
Khem Raj (24):
unixODBC: Update SRC_URI to use updated location of tarball
ttf-arphic-uming: Update to 0.2.20080216-2
thrift: Upgrade to 0.18.1
unicode-ucd: Update license URI to reflect renamed license
libtimezonemap: Point to a working SRC_URI
libx86: Point to working SRC_URI
ctapi-common: Point to working SRC_URI locations
netkit-ftp: Update to debian patch 34
nicstat: Use SOURCEFORGE_MIRROR in SRC_URI
rp-pppoe: Point SRC_URI to valid location
ttf-mplus: Point to valid download location for SRC_URI
geary: Use sysroot prefix with pkg-config in meson
srecord: Upgrade to 1.65.0
ttf-lklug: Point SRC_URI to a working location
radiusclient-ng: Point SRC_URI to archive.ubuntu.com
httpfs2: Do not use S during compile/install tasks
p910nd: Switch to using github for SRC_URI
mosh: Point SRC_URI to https://mosh.org/
xdotool: Upgrade to 3.20211022.1 release
faenza-icon-theme: Switch to a valid download location for SRC_URI
debootstrap: Update SRC_URI to point to valid URL
debootstrap: Use DEBIAN_MIRROR for SRC_URI
ttf-gentium: Switch to debian archive mirror for SRC_URI
nfacct: Update SRC_URI to point to valid URL
Petr Gotthard (1):
gensio: fix QA issue: non -staticdev package with .a libraries
meta-arm: c60d7865dd..0b5724266a:
Rui Miguel Silva (1):
arm-bsp/u-boot: corstone1000: remove debug messages and fix env
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I89bb649b388963a4e16080db6caa8ae1ac2cb3c2
Diffstat (limited to 'poky/bitbake/lib')
-rw-r--r-- | poky/bitbake/lib/bb/cooker.py | 39 | ||||
-rw-r--r-- | poky/bitbake/lib/bb/tests/fetch.py | 58 |
2 files changed, 56 insertions, 41 deletions
diff --git a/poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py index f33bca4f86..554c7f10a5 100644 --- a/poky/bitbake/lib/bb/cooker.py +++ b/poky/bitbake/lib/bb/cooker.py @@ -151,6 +151,8 @@ class BBCooker: def __init__(self, featureSet=None, server=None): self.recipecaches = None + self.baseconfig_valid = False + self.parsecache_valid = False self.eventlog = None self.skiplist = {} self.featureset = CookerFeatures() @@ -264,11 +266,25 @@ class BBCooker: n.read_events() n.process_events() + def _baseconfig_set(self, value): + if value and not self.baseconfig_valid: + bb.server.process.serverlog("Base config valid") + elif not value and self.baseconfig_valid: + bb.server.process.serverlog("Base config invalidated") + self.baseconfig_valid = value + + def _parsecache_set(self, value): + if value and not self.parsecache_valid: + bb.server.process.serverlog("Parse cache valid") + elif not value and self.parsecache_valid: + bb.server.process.serverlog("Parse cache invalidated") + self.parsecache_valid = value + def config_notifications(self, event): if event.maskname == "IN_Q_OVERFLOW": bb.warn("inotify event queue overflowed, invalidating caches.") - self.parsecache_valid = False - self.baseconfig_valid = False + self._parsecache_set(False) + self._baseconfig_set(False) bb.parse.clear_cache() return if not event.pathname in self.configwatcher.bbwatchedfiles: @@ -281,12 +297,12 @@ class BBCooker: bb.parse.clear_cache() if not event.pathname in self.inotify_modified_files: self.inotify_modified_files.append(event.pathname) - self.baseconfig_valid = False + self._baseconfig_set(False) def notifications(self, event): if event.maskname == "IN_Q_OVERFLOW": bb.warn("inotify event queue overflowed, invalidating caches.") - self.parsecache_valid = False + self._parsecache_set(False) bb.parse.clear_cache() return if event.pathname.endswith("bitbake-cookerdaemon.log") \ @@ -300,7 +316,7 @@ class BBCooker: bb.parse.clear_cache() if not event.pathname in self.inotify_modified_files: self.inotify_modified_files.append(event.pathname) - self.parsecache_valid = False + self._parsecache_set(False) def add_filewatch(self, deps, watcher=None, dirs=False): if not watcher: @@ -422,8 +438,8 @@ class BBCooker: for mc in self.databuilder.mcdata.values(): self.add_filewatch(mc.getVar("__base_depends", False), self.configwatcher) - self.baseconfig_valid = True - self.parsecache_valid = False + self._baseconfig_set(True) + self._parsecache_set(False) def handlePRServ(self): # Setup a PR Server based on the new configuration @@ -489,7 +505,7 @@ class BBCooker: self.handleCollections(self.data.getVar("BBFILE_COLLECTIONS")) - self.parsecache_valid = False + self._parsecache_set(False) def updateConfigOpts(self, options, environment, cmdline): self.ui_cmdline = cmdline @@ -1509,7 +1525,7 @@ class BBCooker: bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runtaskentries), buildname, item, failures, interrupted), self.databuilder.mcdata[mc]) bb.event.disable_heartbeat() # We trashed self.recipecaches above - self.parsecache_valid = False + self._parsecache_set(False) self.configuration.limited_deps = False bb.parse.siggen.reset(self.data) if quietlog: @@ -1678,7 +1694,7 @@ class BBCooker: self.add_filewatch([[dirent]], dirs=True) self.parser = CookerParser(self, mcfilelist, total_masked) - self.parsecache_valid = True + self._parsecache_set(True) self.state = state.parsing @@ -1796,8 +1812,7 @@ class BBCooker: self.data = self.databuilder.data # In theory tinfoil could have modified the base data before parsing, # ideally need to track if anything did modify the datastore - self.parsecache_valid = False - + self._parsecache_set(False) class CookerExit(bb.event.Event): """ diff --git a/poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py index 6ef0836f2b..532adb9414 100644 --- a/poky/bitbake/lib/bb/tests/fetch.py +++ b/poky/bitbake/lib/bb/tests/fetch.py @@ -535,7 +535,7 @@ class MirrorUriTest(FetcherTest): class GitDownloadDirectoryNamingTest(FetcherTest): def setUp(self): super(GitDownloadDirectoryNamingTest, self).setUp() - self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" + self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" self.recipe_dir = "git.openembedded.org.bitbake" self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" self.mirror_dir = "github.com.openembedded.bitbake.git" @@ -583,7 +583,7 @@ class GitDownloadDirectoryNamingTest(FetcherTest): class TarballNamingTest(FetcherTest): def setUp(self): super(TarballNamingTest, self).setUp() - self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" + self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" @@ -617,7 +617,7 @@ class TarballNamingTest(FetcherTest): class GitShallowTarballNamingTest(FetcherTest): def setUp(self): super(GitShallowTarballNamingTest, self).setUp() - self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" + self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" @@ -652,7 +652,7 @@ class GitShallowTarballNamingTest(FetcherTest): class CleanTarballTest(FetcherTest): def setUp(self): super(CleanTarballTest, self).setUp() - self.recipe_url = "git://git.openembedded.org/bitbake" + self.recipe_url = "git://git.openembedded.org/bitbake;protocol=https" self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') @@ -1011,25 +1011,25 @@ class FetcherNetworkTest(FetcherTest): @skipIfNoNetwork() def test_gitfetch(self): - url1 = url2 = "git://git.openembedded.org/bitbake;branch=master" + url1 = url2 = "git://git.openembedded.org/bitbake;branch=master;protocol=https" self.gitfetcher(url1, url2) @skipIfNoNetwork() def test_gitfetch_goodsrcrev(self): # SRCREV is set but matches rev= parameter - url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" + url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master;protocol=https" self.gitfetcher(url1, url2) @skipIfNoNetwork() def test_gitfetch_badsrcrev(self): # SRCREV is set but does not match rev= parameter - url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" + url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master;protocol=https" self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) @skipIfNoNetwork() def test_gitfetch_tagandrev(self): # SRCREV is set but does not match rev= parameter - url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;tag=270a05b0b4ba0959fe0624d2a4885d7b70426da5" + url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;tag=270a05b0b4ba0959fe0624d2a4885d7b70426da5;protocol=https" self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) @skipIfNoNetwork() @@ -1038,7 +1038,7 @@ class FetcherNetworkTest(FetcherTest): # `usehead=1' and instead fetch the specified SRCREV. See # test_local_gitfetch_usehead() for a positive use of the usehead # feature. - url = "git://git.openembedded.org/bitbake;usehead=1;branch=master" + url = "git://git.openembedded.org/bitbake;usehead=1;branch=master;protocol=https" self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) @skipIfNoNetwork() @@ -1047,26 +1047,26 @@ class FetcherNetworkTest(FetcherTest): # `usehead=1' and instead fetch the specified SRCREV. See # test_local_gitfetch_usehead() for a positive use of the usehead # feature. - url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master" + url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master;protocol=https" self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) @skipIfNoNetwork() def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): - recipeurl = "git://git.openembedded.org/bitbake;branch=master" - mirrorurl = "git://someserver.org/bitbake;branch=master" + recipeurl = "git://git.openembedded.org/bitbake;branch=master;protocol=https" + mirrorurl = "git://someserver.org/bitbake;branch=master;protocol=https" self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") self.gitfetcher(recipeurl, mirrorurl) @skipIfNoNetwork() def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): - recipeurl = "git://someserver.org/bitbake;branch=master" + recipeurl = "git://someserver.org/bitbake;branch=master;protocol=https" self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") 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" + realurl = "https://git.openembedded.org/bitbake" + recipeurl = "git://someserver.org/bitbake;protocol=https" self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") os.chdir(self.tempdir) self.git(['clone', realurl, self.sourcedir], cwd=self.tempdir) @@ -1076,9 +1076,9 @@ class FetcherNetworkTest(FetcherTest): @skipIfNoNetwork() def test_git_submodule(self): # URL with ssh submodules - url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master" + url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master;protocol=https" # Original URL (comment this if you have ssh access to git.yoctoproject.org) - url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master" + url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master;protocol=https" fetcher = bb.fetch.Fetch([url], self.d) fetcher.download() # Previous cwd has been deleted @@ -1329,9 +1329,9 @@ class URLHandle(unittest.TestCase): "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', collections.OrderedDict([('tag', 'V0-99-81'), ('module', 'familiar/dist/ipkg')])), - "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'}), + "git://git.openembedded.org/bitbake;branch=@foo;protocol=https" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo', 'protocol' : 'https'}), "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}), - r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main'}), + r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main;protocol=https': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main', 'protocol' : 'https'}), } # we require a pathname to encodeurl but users can still pass such urls to # decodeurl and we need to handle them @@ -1359,14 +1359,14 @@ class FetchLatestVersionTest(FetcherTest): : "1.99.4", # version pattern "vX.Y" # mirror of git.infradead.org since network issues interfered with testing - ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") + ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master;protocol=https", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") : "1.5.0", # version pattern "pkg_name-X.Y" # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing - ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") + ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master;protocol=https", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") : "1.0", # version pattern "pkg_name-vX.Y.Z" - ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") + ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master;protocol=https", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") : "1.4.0", # combination version pattern ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "") @@ -1378,9 +1378,9 @@ class FetchLatestVersionTest(FetcherTest): : "20120614", # packages with a valid UPSTREAM_CHECK_GITTAGREGEX # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing - ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") + ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master;protocol=https", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") : "0.4.3", - ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") + ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master;protocol=https", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") : "11.0.0", ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") : "1.3.59", @@ -2189,7 +2189,7 @@ class GitShallowTest(FetcherTest): self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') self.d.setVar('BB_GIT_SHALLOW', '1') self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') - fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master"], self.d) + fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master;protocol=https"], self.d) fetcher.download() bb.utils.remove(self.dldir + "/*.tar.gz") @@ -2966,7 +2966,7 @@ class NPMTest(FetcherTest): class GitSharedTest(FetcherTest): def setUp(self): super(GitSharedTest, self).setUp() - self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" + self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') self.d.setVar("__BBSRCREV_SEEN", "1") @@ -2999,7 +2999,7 @@ class FetchPremirroronlyLocalTest(FetcherTest): os.mkdir(self.mirrordir) self.reponame = "bitbake" self.gitdir = os.path.join(self.tempdir, "git", self.reponame) - self.recipe_url = "git://git.fake.repo/bitbake;branch=master" + self.recipe_url = "git://git.fake.repo/bitbake;branch=master;protocol=https" self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") self.d.setVar("BB_NO_NETWORK", "1") self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") @@ -3053,7 +3053,7 @@ class FetchPremirroronlyNetworkTest(FetcherTest): self.reponame = "fstests" self.clonedir = os.path.join(self.tempdir, "git") self.gitdir = os.path.join(self.tempdir, "git", "{}.git".format(self.reponame)) - self.recipe_url = "git://git.yoctoproject.org/fstests" + self.recipe_url = "git://git.yoctoproject.org/fstests;protocol=https" self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") self.d.setVar("BB_NO_NETWORK", "0") self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") @@ -3135,7 +3135,7 @@ class FetchPremirroronlyBrokenTarball(FetcherTest): os.mkdir(self.mirrordir) self.reponame = "bitbake" self.gitdir = os.path.join(self.tempdir, "git", self.reponame) - self.recipe_url = "git://git.fake.repo/bitbake" + self.recipe_url = "git://git.fake.repo/bitbake;protocol=https" self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") self.d.setVar("BB_NO_NETWORK", "1") self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") |