From d100e89de22d6a950b3caab4d060b7e8dc3f4e15 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 23 May 2024 10:19:29 -0400
Subject: 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>
---
 .../recipes-support/icu/icu_74-%.bbappend          |  4 ++++
 .../recipes-support/icu/icu_74-1_agldemo.inc       | 27 ----------------------
 .../recipes-support/icu/icu_agldemo.inc            | 27 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc
 create mode 100644 meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc

(limited to 'meta-agl-html5-demo/recipes-support')

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_74-1_agldemo.inc
deleted file mode 100644
index 957fe0838..000000000
--- a/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGECONFIG:append = " make-icudata"
-
-do_compile:append () {
-    # just adding below does not enforce a full rebuild
-    # thus force rebuild and investigate
-    echo "new"
-}
-
-do_make_icudata:class-native () {
-    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
-    cd ${S}
-    rm -rf data
-    cp -a ${WORKDIR}/data .
-    AR='${BUILD_AR}' \
-    CC='${BUILD_CC}' \
-    CPP='${BUILD_CPP}' \
-    CXX='${BUILD_CXX}' \
-    RANLIB='${BUILD_RANLIB}' \
-    CFLAGS='${BUILD_CFLAGS}' \
-    CPPFLAGS='${BUILD_CPPFLAGS}' \
-    CXXFLAGS='${BUILD_CXXFLAGS}' \
-    LDFLAGS='${BUILD_LDFLAGS}' \
-    ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \
-    ./runConfigureICU Linux --with-data-packaging=archive
-    oe_runmake
-    install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
-}
diff --git a/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc
new file mode 100644
index 000000000..957fe0838
--- /dev/null
+++ b/meta-agl-html5-demo/recipes-support/icu/icu_agldemo.inc
@@ -0,0 +1,27 @@
+PACKAGECONFIG:append = " make-icudata"
+
+do_compile:append () {
+    # just adding below does not enforce a full rebuild
+    # thus force rebuild and investigate
+    echo "new"
+}
+
+do_make_icudata:class-native () {
+    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
+    cd ${S}
+    rm -rf data
+    cp -a ${WORKDIR}/data .
+    AR='${BUILD_AR}' \
+    CC='${BUILD_CC}' \
+    CPP='${BUILD_CPP}' \
+    CXX='${BUILD_CXX}' \
+    RANLIB='${BUILD_RANLIB}' \
+    CFLAGS='${BUILD_CFLAGS}' \
+    CPPFLAGS='${BUILD_CPPFLAGS}' \
+    CXXFLAGS='${BUILD_CXXFLAGS}' \
+    LDFLAGS='${BUILD_LDFLAGS}' \
+    ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \
+    ./runConfigureICU Linux --with-data-packaging=archive
+    oe_runmake
+    install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
+}
-- 
cgit 1.2.3-korg