Skip to content

Commit

Permalink
Merge pull request #872 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
update layers
  • Loading branch information
kraj authored Nov 24, 2023
2 parents 07e070e + 2fcf8a2 commit 1638b75
Show file tree
Hide file tree
Showing 18 changed files with 93 additions and 22 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ and this project adheres to
- Add python_hatchling support to recipetool
- Upgrade QEMU to 8.1.2
- Drop dependecy on libcroco in openbox and gnome-shell
- Update QT6 to 6.6.1
- Upgrade clang to 17.0.4
- Update QT6 to 6.6.2
- Upgrade clang to 17.0.5
- add nativesdk version of acpica
- Use correct targets for rust binaries in meson
- Update openSBI to 1.3.1
Expand All @@ -38,6 +38,14 @@ and this project adheres to
- Add systemd startup to yoe-kiosk-browser to run it usin linuxfb
- Add G31 mali driver and make it work with ODROID-C4
- Update rpi-config to tip of tree
- Fix mesa-gl build with LLD
- Drop PE, PR from /usr/src/debug paths in recipes from multiple layers
- Use nonarch libdir for tmpfiles.d in multiple recipes
- Process installed dependencies in deterministic order during staging
- Add sysvinit to distro features when using busybox init system
- Fix mesa for ODROID-C4 with G32 Mali userspace driver
- Upgrade gstreamer to 1.22.7
- Add minimal configuration for VS Code

### Added

Expand Down
13 changes: 7 additions & 6 deletions conf/projects/var-dart-imx6ul/config.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACHINE = "imx6ul-var-dart"
DISTRO = "yoe"
# "yoe-<libc>-<init-system>-<windowing-system>"
YOE_PROFILE = "yoe-glibc-systemd-wayland"
YOE_PROFILE = "yoe-musl-busyboxinit-eglfs"

# Freeescale stuff EULA yeah :(
ACCEPT_FSL_EULA = "1"
Expand All @@ -10,15 +10,16 @@ ACCEPT_FSL_EULA = "1"
# Rapsberry pi firmware
LICENSE_FLAGS_ACCEPTED += "\
"
IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
IMAGE_FSTYPES:append = " wic.xz wic.bmap ext4.xz"
IMAGE_FSTYPES:remove = "ext4 tar.gz wic.bz2"
# Yoe Updater Supported Machines ( RPI, beaglebone, C4, SAMA5D27 for now )
#INITRAMFS_IMAGE_BUNDLE = "1"
INITRAMFS_IMAGE_BUNDLE = "1"
#WKS_FILE = "yoe-sdimage.wks"
# Use yoe-initramfs-image for initramfs
#INITRAMFS_IMAGE = "yoe-initramfs-image"
INITRAMFS_IMAGE = "yoe-initramfs-image"
# Use kernel+initramfs image to boot
#IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
#IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"
IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"

# Needed for Running bitbake -ctestimage <image>
#TEST_TARGET_IP = "10.0.0.34"
Expand Down
2 changes: 1 addition & 1 deletion sources/meta-clang
2 changes: 1 addition & 1 deletion sources/meta-intel
2 changes: 1 addition & 1 deletion sources/meta-odroid
2 changes: 1 addition & 1 deletion sources/meta-openembedded
Submodule meta-openembedded updated 45 files
+2 −2 meta-gnome/recipes-gnome/evince/evince_45.0.bb
+1 −1 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.7.bb
+2 −2 meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_45.1.bb
+2 −2 meta-gnome/recipes-gnome/tracker/tracker_3.6.0.bb
+1 −1 meta-multimedia/recipes-multimedia/aom/aom_3.7.0.bb
+26 −0 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch
+1 −0 meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb
+1 −1 meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
+125 −0 meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch
+117 −0 meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch
+95 −0 meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch
+112 −0 meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch
+6 −0 meta-networking/recipes-protocols/frr/frr_9.0.1.bb
+1 −1 meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb
+1 −1 meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb
+7 −0 meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb
+1 −1 meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb
+1 −1 meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb
+0 −32 ...es-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch
+2 −3 meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb
+0 −64 meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
+3 −5 meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
+6 −1 meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.4.0.bb
+1 −1 meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+1 −1 meta-oe/recipes-devtools/ctags/ctags_6.0.20231119.0.bb
+1 −1 meta-oe/recipes-devtools/perl/exiftool_12.70.bb
+1 −1 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+2 −2 meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb
+2 −2 meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+2 −2 meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
+1 −1 meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+1 −1 meta-oe/recipes-support/c-ares/c-ares_1.22.1.bb
+1 −1 meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
+1 −1 meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.27.bb
+1 −1 meta-python/recipes-devtools/python/python3-aiohttp_3.9.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-dateparser_1.2.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-django_4.2.7.bb
+1 −1 meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-imageio_2.33.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb
+1 −1 meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-pdm_2.10.3.bb
+1 −1 meta-python/recipes-devtools/python/python3-pydantic_2.5.1.bb
+1 −1 meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb
+1 −1 meta-python/recipes-networking/python/python3-ldap_3.4.4.bb
2 changes: 1 addition & 1 deletion sources/meta-qcom
Submodule meta-qcom updated 34 files
+1 −1 .github/workflows/daily.yml
+1 −1 conf/machine/include/qcom-common.inc
+8 −0 conf/machine/qcom-armv8a.conf
+1 −0 ...embedded-layer/recipes-devtools/android-tools/android-tools-conf-configfs/qcom/android-gadget-setup.machine
+1 −0 recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom-armv8a.scc
+20 −0 recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom-qcm6490.cfg
+4 −0 recipes-kernel/linux/linux-yocto/bsp/qcom-armv8a/qcom-qcm6490.scc
+145 −0 ...es-kernel/linux/linux-yocto/generic-drivers/0001-FROMLIST-dma-heap-Add-proper-kref-handling-on-dma-bu.patch
+180 −0 ...es-kernel/linux/linux-yocto/generic-drivers/0002-FROMLIST-dma-heap-Provide-accessors-so-that-in-kerne.patch
+31 −0 ...s-kernel/linux/linux-yocto/qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch
+50 −0 ...-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch
+29 −0 ...es-kernel/linux/linux-yocto/qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch
+48 −0 ...-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-UFS-nodes-for-qcm6490-rb3.patch
+353 −0 recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-qcm6490-rb3-support.patch
+188 −0 ...es-kernel/linux/linux-yocto/qcm6490-drivers/0001-FROMGIT-phy-qcom-qmp-ufs-Add-Phy-Configuration-suppo.patch
+210 −0 ...es-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-clk-qcom-gcc-Enable-the-force-mem-core-for-U.patch
+35 −0 ...es-kernel/linux/linux-yocto/qcm6490-drivers/0001-PENDING-dt-bindings-clock-Add-qcom-adsp-skip-pll-pro.patch
+59 −0 ...es-kernel/linux/linux-yocto/qcm6490-drivers/0002-PENDING-clk-qcom-lpassaudiocc-Add-support-to-skip-PL.patch
+97 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-FROMLIST-arm64-dts-qcom-sc7280-Add-UFS-nodes-for-sc7.patch
+44 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-Fairphone-.patch
+79 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch
+31 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcom-sc7280-Add-interconnect-paths.patch
+32 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch
+384 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-FROMLIST-arm64-dts-qcom-Use-QCOM_SCM_VMID-defines-fo.patch
+32 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch
+480 −0 recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0003-FROMLIST-arm64-dts-qcom-Add-qcm6490-dts-file.patch
+51 −0 recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcm6490-Remove-voltage-voting-for-.patch
+46 −0 recipes-kernel/linux/linux-yocto/workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch
+36 −0 recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-Q.patch
+36 −0 recipes-kernel/linux/linux-yocto/workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch
+57 −0 recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcm6490-rb3-Remove-voltage-voting-.patch
+45 −0 recipes-kernel/linux/linux-yocto/workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch
+34 −0 recipes-kernel/linux/linux-yocto/workarounds/0002-QCLINUX-arm64-dts-qcom-Add-board-id-and-msm-id-for-q.patch
+27 −0 recipes-kernel/linux/linux-yocto_6.5.bbappend
2 changes: 1 addition & 1 deletion sources/meta-riscv
5 changes: 5 additions & 0 deletions sources/meta-yoe/conf/distro/busyboxinit.inc
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# enable busybox for init and mdev for device manager
INIT_MANAGER = "mdev-busybox"

# We want to use sysvinit scripts to initialize a complete system
# default is bare system where init system needs to be told what to run
DISTRO_FEATURES:append = " sysvinit "
DISTRO_FEATURES_BACKFILL_CONSIDERED:remove = "sysvinit"
1 change: 0 additions & 1 deletion sources/meta-yoe/conf/distro/mdev.inc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ require yoe.inc
require glibc.inc
require busyboxinit.inc
require eglfs.inc
require mdev.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ require yoe.inc
require musl.inc
require busyboxinit.inc
require eglfs.inc
require mdev.inc
60 changes: 60 additions & 0 deletions sources/meta-yoe/recipes-core/images/machines/imx6ul-var-dart.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# We use updater to handle disk/SD management, therefore remove 96boards-tools
IMAGE_INSTALL:remove = "96boards-tools"

KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"

KERNEL_ARTEFACTS = "\
${KERNEL_IMAGETYPE} \
imx6ul-var-dart-6ulcustomboard-emmc-sd-card.dtb \
imx6ul-var-dart-6ulcustomboard-emmc-wifi.dtb \
imx6ul-var-dart-6ulcustomboard-nand-sd-card.dtb \
imx6ul-var-dart-6ulcustomboard-nand-wifi.dtb \
"
DTBO_ARTEFACTS = "\
"

ROOTFS_ARTEFACTS = "rootfs.ext4.xz"

BOOTLOADER_ARTEFACTS = "\
SPL-sd \
SPL-nand \
u-boot.img-nand \
u-boot.img-sd \
fw_env.config \
"

# Anything that is not mentioned above but it is created during updater artifacts creation e.g.
# default DTB symlinks etc.
EXTRA_ARTEFACTS = "imx6ul-var-dart-6ulcustomboard-nand-wifi-imx6ul-var-dart.dtb"

UPDATE_IMAGES = "version.txt ${BOOTLOADER_ARTEFACTS} ${KERNEL_ARTEFACTS} ${DTBO_ARTEFACTS} ${ROOTFS_ARTEFACTS} ${EXTRA_ARTEFACTS}"

do_updater() {
echo "IMG_VERSION = ${IMG_VERSION}"
rm -rf ${TOPDIR}/deploy/${MACHINE}
install -d ${TOPDIR}/deploy/${MACHINE}
OLDPWD="$PWD"
cd ${TOPDIR}/deploy/${MACHINE}
echo "${IMG_VERSION}" > version.txt
install ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4.xz ${ROOTFS_ARTEFACTS}
for f in ${KERNEL_ARTEFACTS} ${BOOTLOADER_ARTEFACTS}
do
install ${DEPLOY_DIR_IMAGE}/$f $f
done
#default device tree file One of the dtbs from BOOTLOADER_ARTEFACTS here we choose 'wifi with nand' one
install imx6ul-var-dart-6ulcustomboard-nand-wifi.dtb imx6ul-var-dart-6ulcustomboard-nand-wifi-imx6ul-var-dart.dtb

for f in ${DTBO_ARTEFACTS}
do
install -D ${DEPLOY_DIR_IMAGE}/`basename $f` $f
done
# Match kernel image with wic
rm ${KERNEL_IMAGETYPE}
install ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE} ${KERNEL_IMAGETYPE}
sha256sum ${UPDATE_IMAGES} > update.sha256
rm -rf ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
ls ${UPDATE_IMAGES_} | cpio -ov -H newc > ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
install ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd ${DEPLOY_DIR_IMAGE}/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
cd ${OLDPWD}
rm -rf ${TOPDIR}/deploy/${MACHINE}
}
2 changes: 1 addition & 1 deletion sources/poky
Submodule poky updated 132 files

0 comments on commit 1638b75

Please sign in to comment.