summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch28
-rw-r--r--recipes-connectivity/connman/connman_%.bbappend1
-rw-r--r--recipes-core/base-files/base-files/fstab1
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-app-launch.inc2
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in1
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb9
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb2
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb9
-rw-r--r--recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb9
-rw-r--r--recipes-images/images/packagegroup-tdx-cli.bb2
-rw-r--r--recipes-images/images/packagegroup-tdx-graphical.bb6
-rw-r--r--recipes-images/images/packagegroup-tdx-qt5.bb13
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb14
13 files changed, 86 insertions, 11 deletions
diff --git a/recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch b/recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch
new file mode 100644
index 0000000..c570812
--- /dev/null
+++ b/recipes-connectivity/connman/connman/0003-connman-clock-ntp-client-should-not-update-time-time.patch
@@ -0,0 +1,28 @@
+From fcf27214f779478b449ea5ffe6d915fd6057cade Mon Sep 17 00:00:00 2001
+From: Igor Opaniuk <igor.opaniuk@toradex.com>
+Date: Mon, 30 Nov 2020 15:17:30 +0200
+Subject: [PATCH] connman: clock: ntp client should not update time/timezone
+
+NTP client should not update time/timezone unless otherwise stated
+explicitly in the settings.
+
+Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
+---
+ src/clock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/clock.c b/src/clock.c
+index 0fde2c3..c9a26c6 100644
+--- a/src/clock.c
++++ b/src/clock.c
+@@ -35,8 +35,8 @@ enum timezone_updates {
+ TIMEZONE_UPDATES_AUTO = 2,
+ };
+
+-static enum time_updates time_updates_config = TIME_UPDATES_AUTO;
+-static enum timezone_updates timezone_updates_config = TIMEZONE_UPDATES_AUTO;
++static enum time_updates time_updates_config = TIME_UPDATES_MANUAL;
++static enum timezone_updates timezone_updates_config = TIME_UPDATES_MANUAL;
+
+ static char *timezone_config = NULL;
+
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend
index d90d435..330f66e 100644
--- a/recipes-connectivity/connman/connman_%.bbappend
+++ b/recipes-connectivity/connman/connman_%.bbappend
@@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/connman:"
SRC_URI += " \
file://0001-connman.service.in-don-t-start-if-nfs-boot.patch \
file://0002-main.conf-blacklist-rndis-nic-s.patch \
+ file://0003-connman-clock-ntp-client-should-not-update-time-time.patch \
"
do_install_append() {
diff --git a/recipes-core/base-files/base-files/fstab b/recipes-core/base-files/base-files/fstab
index ab73d00..8ce1a35 100644
--- a/recipes-core/base-files/base-files/fstab
+++ b/recipes-core/base-files/base-files/fstab
@@ -1,6 +1,7 @@
# stock fstab - you probably want to override this with a machine specific one
/dev/root / auto noatime 1 1
+/dev/emmc-part1 /boot auto noatime,noauto 0 0
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
index cd72391..18b6b29 100644
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
+++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
@@ -18,7 +18,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/wayland-app-launch:"
APPLICATION_ENVIRONMENT ??= ""
do_compile () {
- sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" wayland-app-launch.sh.in > wayland-app-launch.sh
+ sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" -e "s:@@initial-path@@:${INITIAL_PATH}:" wayland-app-launch.sh.in > wayland-app-launch.sh
sed -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" wayland-app-launch.service.in > wayland-app-launch.service
}
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in
index ebebfbf..87349aa 100644
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in
+++ b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in
@@ -11,4 +11,5 @@ fi
while [ ! -e $XDG_RUNTIME_DIR/wayland-0 ] ; do sleep 0.1; done
sleep 1
+cd @@initial-path@@
@@wayland-application@@ &
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb
new file mode 100644
index 0000000..d11611e
--- /dev/null
+++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-analogclock_1.0.bb
@@ -0,0 +1,9 @@
+# set the following variable to your one and only application which should
+# be launched right after weston started
+
+INITIAL_APP_PKGS ?= "qtbase-examples qtwayland"
+INITIAL_PATH ?= ""
+APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"'
+WAYLAND_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock"
+
+require wayland-app-launch.inc
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb
index f36556b..bd27da8 100644
--- a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb
+++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-cinematicexperience_1.0.bb
@@ -1,7 +1,7 @@
# set the following variable to your one and only application which should
# be launched right after weston started
-INITIAL_APP_PKGS ?= "weston"
+INITIAL_APP_PKGS ?= "cinematicexperience qtwayland"
INITIAL_PATH ?= ""
APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"'
WAYLAND_APPLICATION ?= "/usr/share/cinematicexperience-1.0/Qt5_CinematicExperience --fullscreen"
diff --git a/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb
new file mode 100644
index 0000000..b85fdf0
--- /dev/null
+++ b/recipes-graphics/wayland-app-launch/wayland-qtdemo-launch-qtsmarthome_1.0.bb
@@ -0,0 +1,9 @@
+# set the following variable to your one and only application which should
+# be launched right after weston started
+
+INITIAL_APP_PKGS ?= "qtsmarthome qtwayland"
+INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0/"
+APPLICATION_ENVIRONMENT ?= '\"QT_QPA_PLATFORM=wayland-egl\"'
+WAYLAND_APPLICATION ?= "${INITIAL_PATH}/smarthome"
+
+require wayland-app-launch.inc
diff --git a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb
new file mode 100644
index 0000000..c9bfd7a
--- /dev/null
+++ b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb
@@ -0,0 +1,9 @@
+# set the following variable to your one and only application which should
+# be started
+
+INITIAL_APP_PKGS ?= "qtbase-examples"
+INITIAL_PATH ?= ""
+X_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:"
+require recipes-graphics/x-window-simple-app/x-window-simple-app.inc
diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb
index 24a0d68..844bcd5 100644
--- a/recipes-images/images/packagegroup-tdx-cli.bb
+++ b/recipes-images/images/packagegroup-tdx-cli.bb
@@ -186,7 +186,7 @@ RRECOMMENDS_packagegroup-wifi-fw-tdx-cli = "\
linux-firmware-sd8997 \
linux-firmware-ralink \
linux-firmware-rtl8192cu \
- linux-firmware-rtl8188eu \
+ linux-firmware-rtl8188 \
"
SUMMARY_packagegroup-wifi-fw-large-tdx-cli = "Wi-Fi firmware with large footprint"
diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb
index 1aaed40..4088c44 100644
--- a/recipes-images/images/packagegroup-tdx-graphical.bb
+++ b/recipes-images/images/packagegroup-tdx-graphical.bb
@@ -25,6 +25,9 @@ RRECOMMENDS_packagegroup-tdx-graphical = " \
RRECOMMENDS_packagegroup-tdx-graphical_append_mx8 = " \
packagegroup-drm-utils-tdx-graphical \
"
+RRECOMMENDS_packagegroup-tdx-graphical_append_upstream = " \
+ packagegroup-drm-utils-tdx-graphical \
+"
SUMMARY_packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager"
RRECOMMENDS_packagegroup-drm-utils-tdx-graphical = " \
@@ -41,6 +44,9 @@ RRECOMMENDS_packagegroup-gstreamer-tdx-graphical = "\
GSTREAMER_MX6QDL = " \
gstreamer1.0-plugins-base-ximagesink \
gstreamer1.0-plugins-imx \
+ imx-gst1.0-plugin \
+ imx-gst1.0-plugin-gplay \
+ imx-gst1.0-plugin-grecorder \
"
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6dl = " ${GSTREAMER_MX6QDL}"
RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6q = " ${GSTREAMER_MX6QDL}"
diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb
index 0b3dd7f..ea14bc9 100644
--- a/recipes-images/images/packagegroup-tdx-qt5.bb
+++ b/recipes-images/images/packagegroup-tdx-qt5.bb
@@ -16,9 +16,16 @@ RRECOMMENDS_${PN} = " \
${PN}-fonts \
${PN}-libs \
"
-# Only install qtsmarthome with its dependencies on modules with limited storage
-RRECOMMENDS_${PN}_colibri-imx6ull = "qtsmarthome"
-RRECOMMENDS_${PN}_colibri-imx7 = "qtsmarthome"
+# Only install qtbase-examples with its dependencies on modules with limited
+# storage and no gpu.
+RRECOMMENDS_${PN}_colibri-imx6ull = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+ qtbase-examples \
+"
+RRECOMMENDS_${PN}_colibri-imx7 = " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
+ qtbase-examples \
+"
SUMMARY_${PN}-demos = "QT5 Demos"
RRECOMMENDS_${PN}-demos = " \
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
index 4061872..c8d901b 100644
--- a/recipes-images/images/tdx-reference-multimedia-image.bb
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -17,12 +17,16 @@ IMAGE_FEATURES += " \
"
APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience"
-APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience"
+APP_LAUNCH_WAYLAND_colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock"
+APP_LAUNCH_WAYLAND_colibri-imx7 ?= "wayland-qtdemo-launch-analogclock"
+APP_LAUNCH_WAYLAND_colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock"
+APP_LAUNCH_WAYLAND_apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome"
-APP_LAUNCH_X11_colibri-imx6ull ?= "x-window-qtsmarthome"
-APP_LAUNCH_X11_colibri-imx6 ?= "x-window-qtsmarthome"
-APP_LAUNCH_X11_mx7 ?= "x-window-qtsmarthome"
-APP_LAUNCH_X11_apalis-tk1 ?= "x-window-xterm"
+APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience"
+APP_LAUNCH_X11_colibri-imx6ull ?= "x-window-analogclock"
+APP_LAUNCH_X11_colibri-imx7 ?= "x-window-analogclock"
+APP_LAUNCH_X11_colibri-imx7-emmc ?= "x-window-analogclock"
+APP_LAUNCH_X11_apalis-tk1 ?= "x-window-qtsmarthome"
IMAGE_INSTALL += " \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \