From: Scott Murray <scott.murray@konsulko.com>
Date: Sat, 7 May 2022 12:04:52 +0000 (-0400)
Subject: Add branch rename workarounds
X-Git-Tag: 12.1.3~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=739cf79425c325a45468cdf5d0640c3c6328a81b;p=AGL%2Fmeta-agl-demo.git

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
---

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