summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-05-07 08:04:52 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-05-10 20:31:30 +0000
commitf56b9b470dba3ecdb14d94ff241ad874286c2a3f (patch)
treecf15432b34adde6e83b4f104915cec784f12f45d
parent0173c45cadf61ca0f43ef11a6a317ad47df3938f (diff)
Add branch rename workarounds
Add bbappends for ndctl and ttf-noto-emoji recipes to tweak their SRC_URIs to handle their upstreams renaming the "master" branch to "main". This works around the resulting build failures that would happen otherwise, and patches will be submitted for meta-openembedded so we can hopefully drop these on the next set of layer updates. Bug-AGL: SPEC-4361 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic7756038cffe7bc370f512c835fb1da5954fc387 (cherry picked from commit 739cf79425c325a45468cdf5d0640c3c6328a81b)
-rw-r--r--recipes-core/ndctl/ndctl_agldemo.inc3
-rw-r--r--recipes-core/ndctl/ndctl_v67.bbappend1
-rw-r--r--recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bbappend1
-rw-r--r--recipes-graphics/ttf-fonts/ttf-noto-emoji_agldemo.inc3
4 files changed, 8 insertions, 0 deletions
diff --git a/recipes-core/ndctl/ndctl_agldemo.inc b/recipes-core/ndctl/ndctl_agldemo.inc
new file mode 100644
index 000000000..2a260978b
--- /dev/null
+++ b/recipes-core/ndctl/ndctl_agldemo.inc
@@ -0,0 +1,3 @@
+# Upstream replaced master branch with main, carry local workaround
+# until fix lands in meta-oe.
+SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https"
diff --git a/recipes-core/ndctl/ndctl_v67.bbappend b/recipes-core/ndctl/ndctl_v67.bbappend
new file mode 100644
index 000000000..fe58de194
--- /dev/null
+++ b/recipes-core/ndctl/ndctl_v67.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'ndctl_agldemo.inc', '', d)}
diff --git a/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bbappend b/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bbappend
new file mode 100644
index 000000000..d57e3f3eb
--- /dev/null
+++ b/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'ttf-noto-emoji_agldemo.inc', '', d)}
diff --git a/recipes-graphics/ttf-fonts/ttf-noto-emoji_agldemo.inc b/recipes-graphics/ttf-fonts/ttf-noto-emoji_agldemo.inc
new file mode 100644
index 000000000..0dee6c815
--- /dev/null
+++ b/recipes-graphics/ttf-fonts/ttf-noto-emoji_agldemo.inc
@@ -0,0 +1,3 @@
+# Upstream replaced master branch with main, carry local workaround
+# until fix lands in meta-oe.
+SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https;branch=main" \ No newline at end of file