Skip to content

Commit

Permalink
Merge pull request #813 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
Prepare for 2023.07 release and misc updates
  • Loading branch information
cbrake authored Jul 31, 2023
2 parents ac32538 + 2e7b4b3 commit 5038147
Show file tree
Hide file tree
Showing 14 changed files with 68 additions and 16 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2023.07] - 2023-07-XX
## [2023.07] - 2023-07-31

### Changed

Expand All @@ -33,6 +33,9 @@ and this project adheres to
- Fix network restrictions for glibc-testsuite ptests
- Add the disable-wifi overlay for RPI machines
- Improve glibc testing over nfs root
- Upgrade GCC to 13.2 release
- Upgrade autoconf to 2.72c
- Fix freertos-variscite compile failure when do_compile is rerun

### Added

Expand Down
2 changes: 1 addition & 1 deletion sources/meta-clang
2 changes: 1 addition & 1 deletion sources/meta-freescale
Submodule meta-freescale updated 33 files
+78 −70 EULA
+252 −242 SCR/SCR-6.1.22-2.0.0.txt
+3 −1 classes/fsl-eula-unpack.bbclass
+6 −6 conf/machine/include/imx-base.inc
+3 −3 recipes-bsp/imx-atf/imx-atf_2.8.bb
+3 −3 recipes-extended/jailhouse/jailhouse_git.bb
+11 −0 recipes-fsl/mcore-demos/README
+15 −0 recipes-fsl/mcore-demos/imx-m33-demos_2.14.0.bb
+28 −0 recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
+19 −0 recipes-fsl/mcore-demos/imx-m4-demos_2.13.0.bb
+19 −0 recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
+15 −0 recipes-fsl/mcore-demos/imx-m7-demos_2.13.0.bb
+12 −0 recipes-fsl/mcore-demos/imx-m7-demos_2.13.1.bb
+62 −0 recipes-fsl/mcore-demos/imx-mcore-demos.inc
+3 −4 recipes-kernel/ceetm/ceetm_git.bb
+3 −3 recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+4 −4 recipes-multimedia/imx-codec/imx-codec_4.8.0.bb
+10 −4 recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.5.bb
+4 −4 recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb
+4 −4 recipes-multimedia/imx-parser/imx-parser_4.8.0.bb
+4 −4 recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
+3 −3 recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+0 −4 recipes-security/optee-imx/optee-client_3.19.0.imx.bb
+7 −0 recipes-security/optee-imx/optee-client_3.21.0.imx.bb
+2 −0 recipes-security/optee-imx/optee-os-fslc.inc
+79 −63 recipes-security/optee-imx/optee-os/0001-core-Define-section-attributes-for-clang.patch
+10 −4 recipes-security/optee-imx/optee-os/0002-optee-enable-clang-support.patch
+22 −3 recipes-security/optee-imx/optee-os/0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch
+67 −0 recipes-security/optee-imx/optee-os/0004-core-link-add-no-warn-rwx-segments.patch
+0 −33 recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
+0 −10 recipes-security/optee-imx/optee-os_3.19.0.imx.bb
+12 −0 recipes-security/optee-imx/optee-os_3.21.0.imx.bb
+2 −2 recipes-security/optee-imx/optee-test_3.21.0.imx.bb
2 changes: 1 addition & 1 deletion sources/meta-qt6
4 changes: 2 additions & 2 deletions sources/meta-yoe/conf/distro/yoe.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ MAINTAINER = "Yoe Distro Community <http://yoedistro.org>"
TARGET_VENDOR = "-yoe"
SDK_VENDOR = "-yoesdk"
# Distro version is YYYY.MM
DISTRO_VERSION = "2023.06"
DISTRO_CODENAME = "daglic"
DISTRO_VERSION = "2023.07"
DISTRO_CODENAME = "exmoor"
SDK_VERSION := "${DISTRO_VERSION}"

SDK_NAME_PREFIX = "yoe"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"

SRC_URI = "git://github.com/YoeDistro/yoe-kiosk-browser;branch=main;protocol=https"
SRCREV = "86084ea2fb67ddb83c1508f24abaabc578a9e6d8"
SRCREV = "ce1b54c23511b563829b91dbf4fbbe03e49d424b"

PV = "1.0.0+git${SRCPV}"

Expand All @@ -17,8 +17,36 @@ DEPENDS += "qtbase qtwebview qtdeclarative qtdeclarative-native"
INITSCRIPT_NAME = "yoe-kiosk-browser"
INITSCRIPT_PARAMS = "start 99 5 . stop 20 6 ."

# You can override the following settings in site.conf, etc.
# Default to Simple IoT.
YOE_KIOSK_BROWSER_URL ?= "http://localhost:8118"
# Currently, values of 0, 90, and 270 are supported
YOE_KIOSK_BROWSER_ROTATE ?= "0"
# the following scale should be <= 1
YOE_KIOSK_BROWSER_KEYBOARD_SCALE ?= "1"

do_install:append() {
install -D -m 0644 ${S}/yoe-kiosk-browser.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
echo "Browser URL: ${YOE_KIOSK_BROWSER_URL}"
if ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'true', 'false', d)}; then
install -D -m 0644 ${S}/yoe-kiosk-browser-wayland.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
else
install -D -m 0644 ${S}/yoe-kiosk-browser-eglfs.service ${D}${systemd_unitdir}/system/yoe-kiosk-browser.service
install -D -m 0644 ${S}/eglfs.json ${D}${sysconfdir}/default/eglfs.json
fi

install -D -m 0644 ${S}/yoe-kiosk-browser-env ${D}${sysconfdir}/default/yoe-kiosk-browser

# fill in service template values
sed -i "s|@URL@|${YOE_KIOSK_BROWSER_URL}|" \
${D}${sysconfdir}/default/yoe-kiosk-browser

sed -i "s|@ROTATE@|${YOE_KIOSK_BROWSER_ROTATE}|" \
${D}${sysconfdir}/default/yoe-kiosk-browser

sed -i "s|@KEYBOARD_SCALE@|${YOE_KIOSK_BROWSER_KEYBOARD_SCALE}|" \
${D}${sysconfdir}/default/yoe-kiosk-browser
}

SYSTEMD_SERVICE:${PN} = "yoe-kiosk-browser.service"

FILES:${PN} += "${sysconfdir}/default"
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Pin to a version that works with kernel 5.15 kernel
# which is used on older variscite MX8 machines
# see https://github.com/Freescale/meta-freescale/pull/1611#issuecomment-1656991351
SRCREV = "8c864975607cf455c5e95d5313aa00e69f48d32f"
19 changes: 17 additions & 2 deletions sources/meta-yoe/recipes-core/images/yoe-kiosk-image.bb
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
#
# Yoe Kiosk image running wpewebkit based browser
# Yoe Kiosk image running QtWebengine based browser
#
require yoe-simple-image.bb
require yoe-simpleiot-image.bb
require graphics.inc

CORE_IMAGE_EXTRA_INSTALL += " \
liberation-fonts \
yoe-kiosk-browser \
qtvirtualkeyboard \
"
# chromium works on aarch64/arm32/x86 only
# qtwebview and qtwebengine needs it, yoe-kiosk-browser
# needs qtwebengine
CORE_IMAGE_EXTRA_INSTALL:remove:riscv64 = "qtwebengine-examples yoe-kiosk-browser"

export IMAGE_BASENAME = "yoe-kiosk-image"
# ptest needs a lot of memory
QB_MEM = "-m 1024"

python() {
if 'qt6-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Requires meta-qt6 in bblayers.conf')
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DEPENDS = "go-native elm-binary-native nodejs-native"

inherit systemd update-rc.d goarch

SRCREV = "cb64a62f5fe79d708a90c4a4a93fd18a0995c5e0"
SRCREV = "1ccbf799106af7dde86491461295082d90758e1c"

BRANCH ?= "master"

Expand Down Expand Up @@ -52,6 +52,8 @@ do_install() {
install -D -m 0755 ${S}/siot ${D}${bindir}/siot
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -D -m 0644 ${S}/contrib/siot.service ${D}${systemd_unitdir}/system/siot.service
sed -i "s:ExecStart=/usr/bin/siot:ExecStart=/bin/sh -c \"cd /data; /usr/bin/siot\":" \
${D}${systemd_unitdir}/system/siot.service
else
install -D -m 0755 ${S}/contrib/siot.init ${D}${sysconfdir}/init.d/siot
fi
Expand Down
2 changes: 1 addition & 1 deletion sources/poky
Submodule poky updated 111 files

0 comments on commit 5038147

Please sign in to comment.