diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-29 13:20:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-30 18:56:47 +0100 |
commit | ddcf16d1f792153f7f7fec4b1dcbc11855b64208 (patch) | |
tree | 31bc0771b9bcdb6cd31c8a06ff1fb77fa4f7eaf3 /meta/recipes-core | |
parent | b777781ebf88f049c37a04154e86ed0940d11d95 (diff) | |
download | poky-ddcf16d1f792153f7f7fec4b1dcbc11855b64208.tar.gz |
meta: Add explict branch to git SRC_URIs
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.
This update was made with the script added to contrib in this patch which
aims to help others convert other layers.
(From OE-Core rev: b51c405faf6f8c0365f7533bfaf470d79152a463)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/dbus-wait/dbus-wait_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/fts/fts_1.2.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-version.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/ifupdown_0.8.36.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/initscripts/init-system-helpers_1.60.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/libucontext_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl-obstack.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl-utils.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb index 677768d35a..b39f7523c0 100644 --- a/meta/recipes-core/dbus-wait/dbus-wait_git.bb +++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb | |||
@@ -11,7 +11,7 @@ SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517" | |||
11 | PV = "0.1+git${SRCPV}" | 11 | PV = "0.1+git${SRCPV}" |
12 | PR = "r2" | 12 | PR = "r2" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | 14 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" |
15 | UPSTREAM_CHECK_COMMITS = "1" | 15 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-core/fts/fts_1.2.7.bb b/meta/recipes-core/fts/fts_1.2.7.bb index ea820cb0c3..f907a35a90 100644 --- a/meta/recipes-core/fts/fts_1.2.7.bb +++ b/meta/recipes-core/fts/fts_1.2.7.bb | |||
@@ -10,7 +10,7 @@ SECTION = "libs" | |||
10 | 10 | ||
11 | SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472" | 11 | SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/pullmoll/musl-fts.git" | 13 | SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 281df7ecda..6dac7f0c7a 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc | |||
@@ -3,6 +3,6 @@ PV = "2.34" | |||
3 | SRCREV_glibc ?= "ae37d06c7d127817ba43850f0f898b793d42aea7" | 3 | SRCREV_glibc ?= "ae37d06c7d127817ba43850f0f898b793d42aea7" |
4 | SRCREV_localedef ?= "95c0221703ad970a52445e9eaf91c4aff35eebef" | 4 | SRCREV_localedef ?= "95c0221703ad970a52445e9eaf91c4aff35eebef" |
5 | 5 | ||
6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" | 6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;branch=master" |
7 | 7 | ||
8 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)" | 8 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)" |
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb index 1d01701b8f..48a7b8fb13 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb | |||
@@ -7,7 +7,7 @@ the file /etc/network/interfaces." | |||
7 | LICENSE = "GPLv2" | 7 | LICENSE = "GPLv2" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
9 | 9 | ||
10 | SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ | 10 | SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \ |
11 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ | 11 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ |
12 | file://99_network \ | 12 | file://99_network \ |
13 | file://0001-Define-FNM_EXTMATCH-for-musl.patch \ | 13 | file://0001-Define-FNM_EXTMATCH-for-musl.patch \ |
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb index 165f37c070..46952e4685 100644 --- a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb +++ b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb | |||
@@ -17,7 +17,7 @@ LICENSE = "BSD-3-Clause & GPLv2" | |||
17 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" | 17 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" |
18 | 18 | ||
19 | SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee" | 19 | SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee" |
20 | SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" | 20 | SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
diff --git a/meta/recipes-core/musl/libucontext_git.bb b/meta/recipes-core/musl/libucontext_git.bb index d8ae8242c5..1a8d1c4b21 100644 --- a/meta/recipes-core/musl/libucontext_git.bb +++ b/meta/recipes-core/musl/libucontext_git.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = "" | |||
10 | 10 | ||
11 | PV = "1.1+${SRCPV}" | 11 | PV = "1.1+${SRCPV}" |
12 | SRCREV = "335ee864ef6f4a5d4b525453fd9dbfb3507cfecc" | 12 | SRCREV = "335ee864ef6f4a5d4b525453fd9dbfb3507cfecc" |
13 | SRC_URI = "git://github.com/kaniini/libucontext \ | 13 | SRC_URI = "git://github.com/kaniini/libucontext;branch=master \ |
14 | file://0001-meson-Add-option-to-pass-cpu.patch \ | 14 | file://0001-meson-Add-option-to-pass-cpu.patch \ |
15 | " | 15 | " |
16 | 16 | ||
diff --git a/meta/recipes-core/musl/musl-obstack.bb b/meta/recipes-core/musl/musl-obstack.bb index 3003935fe5..3748047496 100644 --- a/meta/recipes-core/musl/musl-obstack.bb +++ b/meta/recipes-core/musl/musl-obstack.bb | |||
@@ -10,7 +10,7 @@ SECTION = "libs" | |||
10 | 10 | ||
11 | PV = "1.1" | 11 | PV = "1.1" |
12 | SRCREV = "d2ad66b0df44a4b784956f7f7f2717131ddc05f4" | 12 | SRCREV = "d2ad66b0df44a4b784956f7f7f2717131ddc05f4" |
13 | SRC_URI = "git://github.com/pullmoll/musl-obstack" | 13 | SRC_URI = "git://github.com/pullmoll/musl-obstack;branch=master" |
14 | 14 | ||
15 | UPSTREAM_CHECK_COMMITS = "1" | 15 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 16 | ||
diff --git a/meta/recipes-core/musl/musl-utils.bb b/meta/recipes-core/musl/musl-utils.bb index 4f99d4324f..fa49d1da04 100644 --- a/meta/recipes-core/musl/musl-utils.bb +++ b/meta/recipes-core/musl/musl-utils.bb | |||
@@ -11,7 +11,7 @@ SECTION = "utils" | |||
11 | PV = "20170421" | 11 | PV = "20170421" |
12 | 12 | ||
13 | SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d" | 13 | SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d" |
14 | SRC_URI = "git://github.com/boltlinux/musl-utils" | 14 | SRC_URI = "git://github.com/boltlinux/musl-utils;branch=master" |
15 | 15 | ||
16 | UPSTREAM_CHECK_COMMITS = "1" | 16 | UPSTREAM_CHECK_COMMITS = "1" |
17 | 17 | ||
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 06b0e060d0..a2f96f1dbe 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -12,7 +12,7 @@ PV = "${BASEVER}+git${SRCPV}" | |||
12 | 12 | ||
13 | # mirror is at git://github.com/kraj/musl.git | 13 | # mirror is at git://github.com/kraj/musl.git |
14 | 14 | ||
15 | SRC_URI = "git://git.musl-libc.org/musl \ | 15 | SRC_URI = "git://git.musl-libc.org/musl;branch=master \ |
16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ | 16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ |
17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ | 17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ |
18 | " | 18 | " |
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index cbb12ca275..64cce329aa 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ | |||
13 | inherit autotools binconfig-disabled multilib_header pkgconfig | 13 | inherit autotools binconfig-disabled multilib_header pkgconfig |
14 | 14 | ||
15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ | 15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ |
16 | SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https" | 16 | SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=master" |
17 | 17 | ||
18 | EXTRA_AUTORECONF = "-I m4" | 18 | EXTRA_AUTORECONF = "-I m4" |
19 | 19 | ||
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 28f385b7ba..09038266b6 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -10,7 +10,7 @@ SRCREV = "fdbd111d6bab2fbbae62a041123fc6b644aa97aa" | |||
10 | PV = "0.1+git${SRCPV}" | 10 | PV = "0.1+git${SRCPV}" |
11 | PR = "r15" | 11 | PR = "r15" |
12 | 12 | ||
13 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | 13 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ |
14 | file://psplash-init \ | 14 | file://psplash-init \ |
15 | file://psplash-start.service \ | 15 | file://psplash-start.service \ |
16 | file://psplash-systemd.service \ | 16 | file://psplash-systemd.service \ |
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index da716674c3..daee5c224b 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | |||
@@ -6,7 +6,7 @@ SECTION = "base" | |||
6 | LICENSE = "GPLv2+" | 6 | LICENSE = "GPLv2+" |
7 | LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9" | 7 | LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9" |
8 | 8 | ||
9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d" | 9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master" |
10 | SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac" | 10 | SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac" |
11 | 11 | ||
12 | UPSTREAM_CHECK_COMMITS = "1" | 12 | UPSTREAM_CHECK_COMMITS = "1" |