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-sato | |
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-sato')
8 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb index f19d03896b..034e19dc7a 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" |
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 d5fe9b5dce..8f3151bfc9 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 79ccb0391b..c85f0440b1 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 c6de14e34e..49f9fdbb36 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/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index b2913b4ed5..7fd9272bf4 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 742364f699..77ecd3fe9f 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 | " |