From: Scott Murray Date: Thu, 23 May 2024 14:19:29 +0000 (-0400) Subject: icu: update bbappend X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2f47cacbbbd02abf79953a2ea2391b65773b7207;p=AGL%2Fmeta-agl-demo.git icu: update bbappend Rename icu bbappend for upstream version bump. Bug-AGL: SPEC-5147 Change-Id: I2d70bc76ec767fc26e8c704bd470904e42de4f82 Signed-off-by: Scott Murray --- 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 similarity index 100% rename from meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc rename to meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc