Merge pull request #875 from YoeDistro/kraj/master

Fix yoe images and ODROID-C4 qtbase/linuxfb
YoeDistro · Nov 28, 2023 · 6022ab0 · 6022ab0
2 parents c8df569 + 1715b1a
commit 6022ab0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to
 - Fix mesa for ODROID-C4 with G32 Mali userspace driver
 - Upgrade gstreamer to 1.22.7
 - Add minimal configuration for VS Code
+- Add htop to yoe-simple-image
 
 ### Added
 

diff --git a/conf/projects/odroid-c4/config.conf b/conf/projects/odroid-c4/config.conf
@@ -29,6 +29,7 @@ YOE_KIOSK_BROWSER_SYSTEMD_UNIT = "yoe-kiosk-browser-linuxfb.service"
 
 # 4.9 kernel as such can not do drm backends
 PACKAGECONFIG_GRAPHICS:append:pn-qtbase = " linuxfb"
+PACKAGECONFIG_GRAPHICS:remove:pn-qtbase = "kms gbm"
 
 IMG_VERSION = "0.0.1"
 #####################################################################

diff --git a/sources/meta-intel b/sources/meta-intel
diff --git a/sources/meta-openembedded b/sources/meta-openembedded
diff --git a/sources/meta-yoe/recipes-core/images/yoe-debug-image.bb b/sources/meta-yoe/recipes-core/images/yoe-debug-image.bb
@@ -18,11 +18,8 @@ IMAGE_FEATURES += "tools-debug tools-profile"
 IMAGE_INSTALL += "\
 	rsync \
 	devmem2 \
-	htop \
 	evtest \
 	netperf \
-	gdbserver \
-	gdb \
 	mtd-utils \
 	tslib \
 	tslib-calibrate \
@@ -42,13 +39,12 @@ IMAGE_INSTALL += "\
 	dosfstools \
 	usbutils \
 	i2c-tools \
-        iw \
+  iw \
 	minicom \
 	screen \
 	cpufrequtils \
 	nano \
 	sox \
-	strace \
 	ethtool \
 	python3 \
 	python3-pyserial \
@@ -58,8 +54,6 @@ IMAGE_INSTALL:append:armv7a = " cpuburn-arm "
 IMAGE_INSTALL:append:armv7ve = " cpuburn-arm "
 IMAGE_INSTALL:append:aarch64 = " cpuburn-arm "
 
-IMAGE_INSTALL:remove:riscv32 = "strace"
-
 export IMAGE_BASENAME = "yoe-debug-image"
 
 QB_MEM = "-m 2048"
diff --git a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
@@ -19,6 +19,7 @@ IMAGE_INSTALL = "\
     packagegroup-machine-base \
     packagegroup-base-ipv6 \
     os-release \
+    htop \
     ${CORE_IMAGE_EXTRA_INSTALL} \
 "
 

diff --git a/sources/poky b/sources/poky
+1 −1		dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.3.1.bb
+0 −59		dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2023.0.0-25370.bb
+13 −11		...ic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
+5 −5		dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
+35 −0		dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
+0 −47		dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.7.0-25396.bb
+18 −20		dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
+2 −2		recipes-oneapi/onedpl/onedpl_2022.3.0.bb
+1 −1		meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
+2 −1		meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb
+3 −4		meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb
+1 −1		meta-oe/recipes-extended/redis/redis_7.2.2.bb
+0 −31		meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
+1 −2		meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
+11 −25		bitbake/lib/bb/cooker.py
+3 −0		bitbake/lib/bb/ui/ncurses.py
+1 −1		meta/lib/oeqa/selftest/cases/reproducible.py
+24 −0		meta/lib/oeqa/selftest/cases/wic.py
+2 −1		meta/recipes-core/systemd/systemd-compat-units.bb
+5 −2		meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.7.bb
+5 −2		meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.5.bb
+5 −2		meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.4.bb
+5 −2		meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.6.bb
+5 −2		meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.9.bb
+3 −1		meta/recipes-devtools/rust/rust_1.70.0.bb
+2 −1		scripts/lib/wic/plugins/source/rawcopy.py