mirror of
https://git.yoctoproject.org/poky
synced 2026-04-10 23:02:25 +02:00
recipes: Default to https git protocol for YP/OE repos
This corresponds to the master
commit 139102a73d41 ("recipes: Default to https git protocol where possible").
But only for the git.yoctoproject.org and git.openembedded.org repos.
> The recommendation from server maintainers is that the https protocol
> is both faster and more reliable than the dedicated git protocol at this point.
> Switch to it where possible.
(From OE-Core rev: c1b208babae70244ab062b2e4674b0309fbd65e5)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
committed by
Paul Barker
parent
f5a60f9888
commit
e2b0ffbd78
@@ -34,6 +34,7 @@ PREMIRRORS:forcevariable = ""
|
||||
# No mirrors and broken git, should fail
|
||||
features = """
|
||||
DL_DIR = "%s"
|
||||
SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git"
|
||||
GIT_PROXY_COMMAND = "false"
|
||||
MIRRORS:forcevariable = ""
|
||||
PREMIRRORS:forcevariable = ""
|
||||
@@ -46,6 +47,7 @@ PREMIRRORS:forcevariable = ""
|
||||
# Broken git but a specific mirror
|
||||
features = """
|
||||
DL_DIR = "%s"
|
||||
SRC_URI:pn-dbus-wait = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=git"
|
||||
GIT_PROXY_COMMAND = "false"
|
||||
MIRRORS:forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/"
|
||||
""" % dldir
|
||||
|
||||
@@ -359,7 +359,7 @@ class RecipetoolCreateTests(RecipetoolBase):
|
||||
tempsrc = os.path.join(self.tempdir, 'srctree')
|
||||
os.makedirs(tempsrc)
|
||||
recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
|
||||
srcuri = 'git://git.yoctoproject.org/libmatchbox'
|
||||
srcuri = 'git://git.yoctoproject.org/libmatchbox;protocol=https'
|
||||
result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc])
|
||||
self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
|
||||
checkvars = {}
|
||||
@@ -512,13 +512,13 @@ class RecipetoolCreateTests(RecipetoolBase):
|
||||
self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard')
|
||||
|
||||
def test_recipetool_create_git_srcuri_master(self):
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master')
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master;protocol=https')
|
||||
|
||||
def test_recipetool_create_git_srcuri_branch(self):
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1')
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1;protocol=https')
|
||||
|
||||
def test_recipetool_create_git_srcbranch(self):
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard', 'matchbox-keyboard-0-1')
|
||||
self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;protocol=https', 'matchbox-keyboard-0-1')
|
||||
|
||||
|
||||
class RecipetoolTests(RecipetoolBase):
|
||||
|
||||
@@ -11,7 +11,7 @@ SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517"
|
||||
PV = "0.1+git${SRCPV}"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -25,7 +25,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx"
|
||||
inherit core-image setuptools3
|
||||
|
||||
SRCREV ?= "1aee6e9648661c1e6159127c2b6e4690576020f7"
|
||||
SRC_URI = "git://git.yoctoproject.org/poky;branch=kirkstone \
|
||||
SRC_URI = "git://git.yoctoproject.org/poky;protocol=https;branch=kirkstone \
|
||||
file://Yocto_Build_Appliance.vmx \
|
||||
file://Yocto_Build_Appliance.vmxf \
|
||||
file://README_VirtualBox_Guest_Additions.txt \
|
||||
|
||||
@@ -9,7 +9,7 @@ DEPENDS = "gdk-pixbuf-native"
|
||||
SRCREV = "44afb7506d43cca15582b4c5b90ba5580344d75d"
|
||||
PV = "0.1+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
|
||||
file://psplash-init \
|
||||
file://psplash-start.service \
|
||||
file://psplash-systemd.service \
|
||||
|
||||
@@ -6,7 +6,7 @@ SECTION = "base"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/update-rc.d;protocol=https;branch=master"
|
||||
SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac"
|
||||
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require pseudo.inc
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/pseudo;protocol=https;branch=master \
|
||||
file://fallback-passwd \
|
||||
file://fallback-group \
|
||||
"
|
||||
|
||||
@@ -13,7 +13,7 @@ SECTION = "x11/wm"
|
||||
SRCREV = "7ad885912efb2131e80914e964d5e635b0d07b40"
|
||||
PV = "0.3+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ DEPENDS = "virtual/libx11 libxext"
|
||||
|
||||
#SRCREV for 1.12
|
||||
SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification ex
|
||||
|
||||
# SRCREV tagged 1.2.2
|
||||
SRCREV = "27da947e7fbdf9659f7e5bd1e92af92af6c03970"
|
||||
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;protocol=https;branch=master \
|
||||
file://0001-Fix-build-with-gcc-10.patch \
|
||||
file://kbdconfig"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ SECTION = "x11/base"
|
||||
SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06"
|
||||
PV = "0.1.1+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -16,7 +16,7 @@ PV = "0.3+git${SRCPV}"
|
||||
|
||||
inherit native
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;protocol=https;branch=master"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
do_configure() {
|
||||
|
||||
@@ -17,8 +17,8 @@ include recipes-kernel/linux/linux-yocto-dev-revisions.inc
|
||||
KBRANCH = "v5.18/standard/base"
|
||||
KMETA = "kernel-meta"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=https;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}"
|
||||
|
||||
# Set default SRCREVs. Both the machine and meta SRCREVs are statically set
|
||||
# to the korg v3.7 tag, and hence prevent network access during parsing. If
|
||||
|
||||
@@ -14,8 +14,8 @@ python () {
|
||||
SRCREV_machine ?= "c8a23ffc90611d97d4e0d8b05e5aa30db4795e87"
|
||||
SRCREV_meta ?= "876ae2ac4c2844426ff953a696e455b44d953527"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
|
||||
LINUX_VERSION ?= "5.10.234"
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ python () {
|
||||
SRCREV_machine ?= "46e4e1200a4fa889438a2cc62151bb7f1057421a"
|
||||
SRCREV_meta ?= "b75d71b7f2455467f2260d514040ccb44d4bdda5"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
|
||||
LINUX_VERSION ?= "5.15.201"
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ SRCREV_meta ?= "876ae2ac4c2844426ff953a696e455b44d953527"
|
||||
|
||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
|
||||
COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm|qemuarmv5)$"
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ SRCREV_meta ?= "b75d71b7f2455467f2260d514040ccb44d4bdda5"
|
||||
|
||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;branch=${KBRANCH};name=machine \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
|
||||
COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$"
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ SRCREV_machine:qemumips64 ?= "4bae0f4714f4afc50c02ea884ec8ba6026d2ec16"
|
||||
SRCREV_machine ?= "0ef80b08429534f460a78de68ee5c6a05f722eb0"
|
||||
SRCREV_meta ?= "876ae2ac4c2844426ff953a696e455b44d953527"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;name=machine;branch=${KBRANCH}; \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
LINUX_VERSION ?= "5.10.234"
|
||||
|
||||
@@ -35,8 +35,8 @@ SRCREV_machine:class-devupstream ?= "3330a8d33e086f76608bb4e80a3dc569d04a8814"
|
||||
PN:class-devupstream = "linux-yocto-upstream"
|
||||
KBRANCH:class-devupstream = "v5.15/base"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;protocol=https;name=machine;branch=${KBRANCH}; \
|
||||
git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
LINUX_VERSION ?= "5.15.201"
|
||||
|
||||
@@ -11,7 +11,7 @@ RDEPENDS:${PN} = "settings-daemon"
|
||||
|
||||
# SRCREV tagged 0.2
|
||||
SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
|
||||
file://no-handed.patch"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ SECTION = "x11/wm"
|
||||
|
||||
# SRCREV tagged 2.2
|
||||
SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN}-2;protocol=https;branch=master \
|
||||
file://vfolders/ \
|
||||
"
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ DEPENDS = "libfakekey expat libxft"
|
||||
|
||||
#SRCREV for 0.1.1
|
||||
SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=matchbox-keyboard-0-1 \
|
||||
file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \
|
||||
file://80matchboxkeyboard.sh"
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ RPROVIDES:${PN} = "matchbox-panel"
|
||||
RREPLACES:${PN} = "matchbox-panel"
|
||||
RCONFLICTS:${PN} = "matchbox-panel"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
|
||||
file://0001-applets-systray-Allow-icons-to-be-smaller.patch \
|
||||
"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ SECTION = "x11/utils"
|
||||
|
||||
#SRCREV tagged 0.2
|
||||
SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -2,7 +2,7 @@ require matchbox-theme-sato.inc
|
||||
|
||||
# SRCREV tagged 0.2
|
||||
SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
|
||||
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=https;branch=master"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3"
|
||||
|
||||
# SRCREV tagged 0.3
|
||||
SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756"
|
||||
SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master"
|
||||
SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=https;branch=master"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -9,7 +9,7 @@ SECTION = "x11"
|
||||
|
||||
# SRCREV tagged 0.0.2
|
||||
SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
|
||||
SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;protocol=https;branch=master \
|
||||
file://addsoundkeys.patch \
|
||||
file://70settings-daemon.sh \
|
||||
"
|
||||
|
||||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
|
||||
SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa"
|
||||
PV .= "+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master \
|
||||
SRC_URI = "git://git.yoctoproject.org/ptest-runner2;protocol=https;branch=master \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user