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-sato | |
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-sato')
9 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb index 85c2c500ea..4d5d299d47 100644 --- a/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
16 | DEPENDS = "gtk+3 intltool-native gettext-native" | 16 | DEPENDS = "gtk+3 intltool-native gettext-native" |
17 | 17 | ||
18 | PV = "0.8.18.1.11+git${SRCPV}" | 18 | PV = "0.8.18.1.11+git${SRCPV}" |
19 | SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git" | 19 | SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https" |
20 | SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" | 20 | SRCREV ="3cdccdc9505643e50f8208171d9eee5de11a42ff" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index 547e851c15..5733a36b12 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb | |||
@@ -11,7 +11,7 @@ RDEPENDS_${PN} = "settings-daemon" | |||
11 | 11 | ||
12 | # SRCREV tagged 0.2 | 12 | # SRCREV tagged 0.2 |
13 | SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" | 13 | SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" |
14 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | 14 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ |
15 | file://no-handed.patch" | 15 | file://no-handed.patch" |
16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
17 | 17 | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index cc51f47b63..2a2eb24f57 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb | |||
@@ -13,7 +13,7 @@ SECTION = "x11/wm" | |||
13 | 13 | ||
14 | # SRCREV tagged 2.2 | 14 | # SRCREV tagged 2.2 |
15 | SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" | 15 | SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777" |
16 | SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ | 16 | SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \ |
17 | file://vfolders/* \ | 17 | file://vfolders/* \ |
18 | " | 18 | " |
19 | 19 | ||
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index c659964a2b..54fe578cd3 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb | |||
@@ -23,7 +23,7 @@ RPROVIDES_${PN} = "matchbox-panel" | |||
23 | RREPLACES_${PN} = "matchbox-panel" | 23 | RREPLACES_${PN} = "matchbox-panel" |
24 | RCONFLICTS_${PN} = "matchbox-panel" | 24 | RCONFLICTS_${PN} = "matchbox-panel" |
25 | 25 | ||
26 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | 26 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ |
27 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ | 27 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ |
28 | " | 28 | " |
29 | 29 | ||
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index 9f00281dde..e2e81c2905 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb | |||
@@ -11,7 +11,7 @@ SECTION = "x11/utils" | |||
11 | 11 | ||
12 | #SRCREV tagged 0.2 | 12 | #SRCREV tagged 0.2 |
13 | SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" | 13 | SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5" |
14 | SRC_URI = "git://git.yoctoproject.org/${BPN}" | 14 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" |
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb index 7a043d3447..bc4024736f 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb | |||
@@ -2,7 +2,7 @@ require matchbox-theme-sato.inc | |||
2 | 2 | ||
3 | # SRCREV tagged 0.2 | 3 | # SRCREV tagged 0.2 |
4 | SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" | 4 | SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78" |
5 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato" | 5 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master" |
6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
7 | 7 | ||
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index befe4a53f4..2edc9ada2e 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "libxt" | |||
9 | # The libxt requires x11 in DISTRO_FEATURES | 9 | # The libxt requires x11 in DISTRO_FEATURES |
10 | REQUIRED_DISTRO_FEATURES = "x11" | 10 | REQUIRED_DISTRO_FEATURES = "x11" |
11 | 11 | ||
12 | SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ | 12 | SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=master \ |
13 | file://fix-compiling-failure-with-option-g-O.patch \ | 13 | file://fix-compiling-failure-with-option-g-O.patch \ |
14 | file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ | 14 | file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ |
15 | file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ | 15 | file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ |
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index 2b1f513f1c..7e7612253d 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "matchbox-panel-2 gtk+3" | |||
11 | 11 | ||
12 | # SRCREV tagged 0.3 | 12 | # SRCREV tagged 0.3 |
13 | SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" | 13 | SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756" |
14 | SRC_URI = "git://git.yoctoproject.org/screenshot" | 14 | SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master" |
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index d01177f9b9..19c4a73dc3 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | |||
@@ -9,7 +9,7 @@ SECTION = "x11" | |||
9 | 9 | ||
10 | # SRCREV tagged 0.0.2 | 10 | # SRCREV tagged 0.0.2 |
11 | SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" | 11 | SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" |
12 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ | 12 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master \ |
13 | file://addsoundkeys.patch \ | 13 | file://addsoundkeys.patch \ |
14 | file://70settings-daemon.sh \ | 14 | file://70settings-daemon.sh \ |
15 | " | 15 | " |