diff options
author | Steve Sakoman <steve@sakoman.com> | 2021-11-02 04:45:10 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-11 10:54:32 +0000 |
commit | 07be05c69896b6d9f4da4b3ba122a1668c8c1200 (patch) | |
tree | 9774f6d61564d917c78f33faf08386a776b9daf7 /meta/recipes-bsp | |
parent | afe0ef0a074b23fc5f1c39ed7fd345f7b75973c7 (diff) | |
download | poky-07be05c69896b6d9f4da4b3ba122a1668c8c1200.tar.gz |
meta: Add explict branch to git SRC_URIs, handle github url changes
This update was made with the convert-scruri.py script in scripts/contrib
This script handles two emerging issues:
1. There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.
2. Github are dropping support for git:// protocol fetching, so remap github
urls as needed. For more details see:
https://github.blog/2021-09-01-improving-git-protocol-security-github/
(From OE-Core rev: 827a805349f9732b2a5fa9184dc7922af36de327)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/efivar/efivar_37.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/opensbi/opensbi_0.6.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common.inc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb index 5d6f200a73..e9dfa0770e 100644 --- a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb +++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = "efivar popt" | |||
10 | 10 | ||
11 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | 11 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ | 13 | SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=master \ |
14 | file://0001-remove-extra-decl.patch \ | 14 | file://0001-remove-extra-decl.patch \ |
15 | file://97668ae0bce776a36ea2001dea63d376be8274ac.patch \ | 15 | file://97668ae0bce776a36ea2001dea63d376be8274ac.patch \ |
16 | " | 16 | " |
diff --git a/meta/recipes-bsp/efivar/efivar_37.bb b/meta/recipes-bsp/efivar/efivar_37.bb index 5bf121ff6e..fa1fe1ecdf 100644 --- a/meta/recipes-bsp/efivar/efivar_37.bb +++ b/meta/recipes-bsp/efivar/efivar_37.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" | |||
7 | 7 | ||
8 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | 8 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/rhinstaller/efivar.git \ | 10 | SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=master;protocol=https \ |
11 | file://determinism.patch \ | 11 | file://determinism.patch \ |
12 | file://no-werror.patch" | 12 | file://no-werror.patch" |
13 | SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" | 13 | SRCREV = "c1d6b10e1ed4ba2be07f385eae5bceb694478a10" |
diff --git a/meta/recipes-bsp/opensbi/opensbi_0.6.bb b/meta/recipes-bsp/opensbi/opensbi_0.6.bb index d8910c0ff1..972d8de17d 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.6.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.6.bb | |||
@@ -9,7 +9,7 @@ require opensbi-payloads.inc | |||
9 | inherit autotools-brokensep deploy | 9 | inherit autotools-brokensep deploy |
10 | 10 | ||
11 | SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" | 11 | SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" |
12 | SRC_URI = "git://github.com/riscv/opensbi.git \ | 12 | SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \ |
13 | file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ | 13 | file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ |
14 | " | 14 | " |
15 | 15 | ||
diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb index 613e3161fb..8234b86162 100644 --- a/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb +++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1" | |||
10 | LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" | 10 | LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c" |
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" | 13 | SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https;branch=master" |
14 | SRCREV = "824551ac77bab1d0f7ae34d7a7c77b155240e754" | 14 | SRCREV = "824551ac77bab1d0f7ae34d7a7c77b155240e754" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 198ed52c7c..a001190292 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc | |||
@@ -14,7 +14,7 @@ PE = "1" | |||
14 | # repo during parse | 14 | # repo during parse |
15 | SRCREV = "303f8fed261020c1cb7da32dad63b610bf6873dd" | 15 | SRCREV = "303f8fed261020c1cb7da32dad63b610bf6873dd" |
16 | 16 | ||
17 | SRC_URI = "git://git.denx.de/u-boot.git \ | 17 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ |
18 | file://remove-redundant-yyloc-global.patch \ | 18 | file://remove-redundant-yyloc-global.patch \ |
19 | file://CVE-2020-8432.patch \ | 19 | file://CVE-2020-8432.patch \ |
20 | file://CVE-2020-10648-1.patch \ | 20 | file://CVE-2020-10648-1.patch \ |