Skip to content

Commit

Permalink
Merge pull request #957 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
Update layers and misc fixes
  • Loading branch information
kraj authored Jul 21, 2024
2 parents 491f41f + ee78851 commit bffc25c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,27 @@
branch = master
[submodule "sources/meta-arm"]
path = sources/meta-arm
url = https://github.com/yoedistro/meta-arm
url = https://github.com/YoeDistro/meta-arm
branch = master
[submodule "sources/meta-elm-binary"]
path = sources/meta-elm-binary
url = https://github.com/yoedistro/meta-elm-binary
url = https://github.com/YoeDistro/meta-elm-binary
branch = master
[submodule "sources/meta-rockchip"]
path = sources/meta-rockchip
url = https://github.com/yoedistro/meta-rockchip
url = https://github.com/YoeDistro/meta-rockchip
branch = master
[submodule "sources/poky"]
path = sources/poky
url = https://github.com/yoedistro/poky
url = https://github.com/YoeDistro/poky
branch = master
[submodule "sources/meta-variscite-bsp-common"]
path = sources/meta-variscite-bsp-common
url = https://github.com/YoeDistro/meta-variscite-bsp-common
branch = yoe/mickledore-var02
[submodule "sources/meta-variscite-bsp"]
path = sources/meta-variscite-bsp
url = https://github.com/YoeDistro/meta-variscite-bsp.git
url = https://github.com/YoeDistro/meta-variscite-bsp
branch = yoe/mickledore-var02
[submodule "sources/meta-qt6"]
path = sources/meta-qt6
Expand All @@ -72,5 +72,5 @@
branch = master
[submodule "sources/meta-tegra-community"]
path = sources/meta-tegra-community
url = https://github.com/yoedistro/meta-tegra-community
url = https://github.com/YoeDistro/meta-tegra-community
branch = master
2 changes: 1 addition & 1 deletion conf/site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ require ${TOPDIR}/conf/projects/${PROJECT}/config.conf
#YOE_PROFILE = "yoe-musl-sysvinit-wayland"
#require conf/world.conf

IMG_VERSION = "24.6.5"
IMG_VERSION = "24.6.6"
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

do_install:append:ti33x() {
sed -i '/\[core\]/a gbm-format=rgb565' ${D}${sysconfdir}/xdg/weston/weston.ini
if [ -e ${D}/${sysconfdir}/init.d/weston ]; then
sed -i 's#weston-start --#weston-start -- --continue-without-input#' ${D}/${sysconfdir}/init.d/weston
fi
if [ -e ${D}${systemd_system_unitdir}/weston.service ]; then
sed -i 's#ExecStart=/usr/bin/weston#ExecStart=/usr/bin/weston --continue-without-input#' ${D}${systemd_system_unitdir}/weston.service
fi
}
2 changes: 1 addition & 1 deletion sources/meta-yoe/wic/yoe-visionfive2-sdimage.wks
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ part uboot --source rawcopy --sourceparams="file=visionfive2_fw_payload.img" --p

part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --use-uuid --part-name boot --part-type EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 --align 4096 --size 292M
# rootfs (3G)
part /root --source rootfs --ondisk mmcblk --fstype=ext4 --part-name root --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --active --label root --align 4096 --fixed-size 3072
part /root --source rootfs --ondisk mmcblk --fstype=ext4 --part-name root --part-type 0FC63DAF-8483-4772-8E79-3D69D8477DE4 --active --label root --align 4096 --size 3072M
# User data partition (1M)
part /data --ondisk mmcblk --fstype=ext4 --label data --fixed-size 1 --align 4096 --fsoptions "x-systemd.growfs"

Expand Down
2 changes: 1 addition & 1 deletion sources/poky
Submodule poky updated 34 files
+1 −0 meta-poky/conf/distro/poky.conf
+4 −1 meta/classes-recipe/kernel.bbclass
+8 −10 meta/classes-recipe/multilib_script.bbclass
+1 −1 meta/classes-recipe/testimage.bbclass
+2 −1 meta/classes/create-spdx-2.2.bbclass
+8 −0 meta/conf/distro/include/yocto-space-optimize.inc
+41 −0 meta/lib/oeqa/sdk/cases/kmod.py
+7 −1 meta/lib/oeqa/utils/__init__.py
+25 −28 meta/lib/oeqa/utils/postactions.py
+3 −7 meta/recipes-connectivity/bluez5/bluez5.inc
+1 −1 meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
+0 −111 meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
+0 −1 meta/recipes-connectivity/openssh/openssh_9.7p1.bb
+4 −2 meta/recipes-connectivity/openssl/openssl_3.3.1.bb
+197 −0 meta/recipes-core/busybox/busybox/0001-awk-fix-precedence-of-relative-to.patch
+37 −0 meta/recipes-core/busybox/busybox/0001-awk.c-fix-CVE-2023-42366-bug-15874.patch
+96 −0 meta/recipes-core/busybox/busybox/0002-awk-fix-ternary-operator-and-precedence-of.patch
+61 −0 meta/recipes-core/busybox/busybox/busybox-1.36.1-no-cbq.patch
+4 −0 meta/recipes-core/busybox/busybox_1.36.1.bb
+21 −15 meta/recipes-core/systemd/systemd_256.bb
+4 −1 meta/recipes-core/volatile-binds/files/mount-copybind
+1 −0 meta/recipes-devtools/gcc/gcc-14.1.inc
+1 −14 meta/recipes-devtools/libtool/libtool_2.5.0.bb
+1 −0 meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb
+13 −0 meta/recipes-devtools/libtool/remove-buildpaths.inc
+4 −0 meta/recipes-devtools/llvm/llvm_18.1.8.bb
+10 −7 .../recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
+1 −1 meta/recipes-devtools/python/python3-setuptools_70.3.0.bb
+0 −17 meta/recipes-devtools/qemu/qemu.inc
+78 −0 meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
+1 −0 meta/recipes-graphics/mesa/mesa.inc
+56 −0 meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-fix-inlining-failed-in-call-t.patch
+0 −36 meta/recipes-graphics/xorg-lib/pixman/0001-pixman-combine-float.c-replace-force_inline-with-__.patch
+1 −1 meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb

0 comments on commit bffc25c

Please sign in to comment.