diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-05-23 10:19:29 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2024-12-19 22:41:31 -0500 |
| commit | d100e89de22d6a950b3caab4d060b7e8dc3f4e15 (patch) | |
| tree | b592eab1039c80b07ec4a1227d808e12c144f906 | |
| parent | 9a3487920e3ca79e0d3fbe1953e97e1f852f365a (diff) | |
Update bbappends for upstream version bumps
Rename python3-grpcio, python3-grpcio, and icu bbappends to use
wildcards to handle minor upstream version bumps.
Bug-AGL: SPEC-5147
Change-Id: I2d70bc76ec767fc26e8c704bd470904e42de4f82
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
| -rw-r--r-- | meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend | 4 | ||||
| -rw-r--r-- | meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc (renamed from meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc) | 0 |
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend index cf4061e92..064cda797 100644 --- a/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend +++ b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend @@ -1 +1,5 @@ +<<<<<<< HEAD:meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_74-1_agldemo.inc', '', d)} +======= +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_agldemo.inc', '', d)} +>>>>>>> fe2024e (Update bbappends for upstream version bumps):recipes-support/icu/icu_74-%.bbappend diff --git a/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc index 957fe0838..957fe0838 100644 --- a/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc +++ b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc |