diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-11-28 22:28:42 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-11-30 11:25:13 +0000 |
| commit | cbeacb02ef678b4c3d53429548bb12105b22b7f0 (patch) | |
| tree | 04376a203112b3c319ecf66630779659abe956bc /recipes-support | |
| parent | cefd5af1bbe53bf1e1c507554d50d223e171e845 (diff) | |
CEF and icu: fix CEF dependencies and icu package
This patchset fixes the html5 app build in CI by adding
missing dependenies to CEF but also to extend the
icu package with .dat file generation which was turned off
upstream in YP poky git 754866f32bfc1e3986199b353f037536f326ae77 .
https://git.yoctoproject.org/poky/commit/meta/recipes-support/icu?id=754866f32bfc1e3986199b353f037536f326ae77
Did break node here due to the missing .dat file.
v2: add ca-certificates-native and export path to it
Bug-AGL: SPEC-4980
Bug-AGL: SPEC-4994
Change-Id: Iec50431c1ee5417653e307dd34cd05b7d7bfa0ff
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29486
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
Diffstat (limited to 'recipes-support')
| -rw-r--r-- | recipes-support/icu/icu_70.1.bbappend | 1 | ||||
| -rw-r--r-- | recipes-support/icu/icu_70.1_agldemo.inc | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/recipes-support/icu/icu_70.1.bbappend b/recipes-support/icu/icu_70.1.bbappend new file mode 100644 index 00000000..b30ade49 --- /dev/null +++ b/recipes-support/icu/icu_70.1.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_70.1_agldemo.inc', '', d)}
\ No newline at end of file diff --git a/recipes-support/icu/icu_70.1_agldemo.inc b/recipes-support/icu/icu_70.1_agldemo.inc new file mode 100644 index 00000000..957fe083 --- /dev/null +++ b/recipes-support/icu/icu_70.1_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 +} |