Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement resize functions in updater and switch to use it for rpi and c4 plarforms #582

Merged
merged 9 commits into from
Sep 11, 2021
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,32 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [NEXT]

- Implement data partition resize feature in yoe updater
- Add initial support to generate SBOMs
- Set precise BSD linceses in recipes in OE-Core
- Let updater machine files be defined in layers outside meta-yoe
- Fix bpftrace build with clang 13
- Avod task graph corruption when trying to avoid deadlocks in runqueue
- Drop obsolete oe_machinstall function utility
- Update simpleIOT to v0.0.34
- Fix fcntl in pseudo with glibc 2.34
- Add selinux packageconfig for tar,findutils,coreutils
- Assorted python module updates
- Recipe Updates
- simpleiot - 0.0.33, go - 1.16.7, unclutter-xfixes - 1.6
- uhubctl - 2.4.0, nlohmann-json - 3.10.2, monit - 5.29.0
- libwebsockets - 4.2.2, cjson - 1.7.15, wireshark - 3.4.8
- gsl - 2.7, xf86-video-nouveau - 1.0.17, ctags - 5.9.20210905
- avro-c - 1.10.2
- avro-c - 1.10.2, ntopng - 5.0, ndpi - 4.0, redis - 6.2.5
- libjcat - 0.1.8, libeigen - 3.4.0, libbytesize - 2.6, dash - 0.5.11.5
- crash - 7.3.0, spdlog - 1.9.2, fmt - 8.0.1, msgpack-c - 4.0.0
- poppler - 21.09.0, poppler-data - 0.4.11, lockfile-progs - 0.1.19
- libqmi - 1.30.2, dfu-util - 0.11, cppzmq - 4.8.0, mosquitto - 2.0.12
- fuse3 - 3.10.5, lttng - 2.13.0,
- New recipes
- python3-pytest-subtests, python3-kivy
- Removed recipes
- assimp

## [2021.08] 2021-09-02

Expand Down
2 changes: 2 additions & 0 deletions conf/site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ ENABLE_UART = "1"

# Yoe Updater Supported Machines ( RPI, beaglebone, C4, SAMA5D27 for now )
INITRAMFS_IMAGE_BUNDLE:rpi = "1"
WKS_FILE:rpi = "yoe-sdimage.wks"
INITRAMFS_IMAGE_BUNDLE:beaglebone = "1"
INITRAMFS_IMAGE_BUNDLE:odroid-c4-hardkernel = "1"
WKS_FILE:odroid-c4-hardkernel = "yoe-sdimage.wks"
INITRAMFS_IMAGE_BUNDLE:sama5d27-som1-ek-sd = "1"

# Use yoe-initramfs-image for initramfs
Expand Down
2 changes: 1 addition & 1 deletion sources/meta-arm
2 changes: 1 addition & 1 deletion sources/meta-freescale
Submodule meta-freescale updated 50 files
+0 −7 conf/machine/imx8mq-evk.conf
+7 −5 conf/machine/include/imx-base.inc
+2 −2 conf/machine/include/imx8mm-evk.inc
+0 −15 recipes-bsp/firmware-qca/firmware-qca.inc
+0 −27 recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb
+0 −27 recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb
+0 −20 recipes-bsp/firmware-qca/qca-tools_3.0.2.bb
+0 −13 recipes-fsl/packagegroups/packagegroup-fsl-qca6174.bb
+0 −12 recipes-fsl/packagegroups/packagegroup-fsl-qca9377.bb
+0 −14 recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb
+0 −17 recipes-kernel/kernel-modules/kernel-module-qca9377_3.1.bb
+0 −23 recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
+0 −70 recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
+24 −0 recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.0.bb
+6 −18 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb
+0 −36 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gst-libs-gst-gl-wayland-fix-meson-build.patch
+0 −220 ...ultimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-plugins-base-fix-meson-build-in-nxp-fork.patch
+0 −34 ...timedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+0 −44 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-viv-fb-code-must-link-against-libg2d.patch
+0 −233 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
+1 −1 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
+1 −1 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch
+48 −0 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
+0 −0 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.%.bbappend
+21 −21 recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb
+0 −3 recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend
+2 −4 recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb
+7 −3 recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.18.0.bb
+0 −23 recipes-multimedia/gstreamer/gstreamer1.0-ptest.inc
+3 −5 recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.18.0.bb
+46 −12 recipes-multimedia/gstreamer/gstreamer1.0/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
+112 −0 recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch
+0 −36 recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+0 −74 recipes-multimedia/gstreamer/gstreamer1.0/0003-meson-Add-valgrind-feature.patch
+32 −0 recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
+0 −257 recipes-multimedia/gstreamer/gstreamer1.0/0004-meson-Add-option-for-installed-tests.patch
+36 −0 recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-respect-the-idententaion-used-in-meson.patch
+110 −0 recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-add-support-for-install-the-tests.patch
+48 −0 recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch
+58 −0 recipes-multimedia/gstreamer/gstreamer1.0/0007-tests-install-the-environment-for-installed_tests.patch
+0 −37 recipes-multimedia/gstreamer/gstreamer1.0/capfix.patch
+2 −0 recipes-multimedia/gstreamer/gstreamer1.0/run-ptest
+21 −23 recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb
+14 −17 recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb
+1,001 −0 recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch
+221 −0 recipes-multimedia/tinycompress/tinycompress/0002-cplay-Support-wave-file.patch
+146 −0 recipes-multimedia/tinycompress/tinycompress/0003-cplay-Add-pause-feature.patch
+40 −0 recipes-multimedia/tinycompress/tinycompress/0004-tinycompress-pass-NULL-buffer-with-0-size-to-driver.patch
+251 −0 recipes-multimedia/tinycompress/tinycompress/0005-cplay-Support-aac-streams.patch
+16 −0 recipes-multimedia/tinycompress/tinycompress_1.1.6.bb
2 changes: 1 addition & 1 deletion sources/meta-openembedded
Submodule meta-openembedded updated 44 files
+1 −1 meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb
+1 −2 meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb
+8 −8 meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch
+8 −4 meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
+8 −8 meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch
+11 −14 meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch
+3 −4 meta-networking/recipes-support/ntopng/ndpi_4.0.bb
+2 −2 meta-networking/recipes-support/ntopng/ntopng_5.0.bb
+53 −0 meta-oe/recipes-connectivity/krb5/krb5/CVE-2021-37750.patch
+1 −0 meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb
+1 −1 meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb
+3 −3 meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
+1 −0 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+2 −3 meta-oe/recipes-devtools/msgpack/msgpack-c_4.0.0.bb
+22 −0 meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb
+1 −2 meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.19.bb
+2 −0 meta-oe/recipes-extended/polkit/polkit/CVE-2021-3560.patch
+1 −1 meta-oe/recipes-extended/redis/redis_6.2.5.bb
+5 −0 meta-oe/recipes-extended/socketcan/can-utils_git.bb
+1 −1 meta-oe/recipes-gnome/libjcat/libjcat_0.1.8.bb
+0 −445 meta-oe/recipes-kernel/crash/crash/0001-printk-add-support-for-lockless-ringbuffer.patch
+0 −103 meta-oe/recipes-kernel/crash/crash/0002-printk-use-committed-finalized-state-values.patch
+10 −9 meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch
+3 −3 meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch
+1 −3 meta-oe/recipes-kernel/crash/crash_7.3.0.bb
+1 −2 meta-oe/recipes-shells/dash/dash_0.5.11.5.bb
+0 −0 meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb
+1 −2 meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb
+2 −2 meta-oe/recipes-support/fmt/fmt_8.0.1.bb
+1 −1 meta-oe/recipes-support/libbytesize/libbytesize_2.6.bb
+3 −3 meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
+1 −2 meta-oe/recipes-support/poppler/poppler-data_0.4.11.bb
+26 −26 meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
+1 −1 meta-oe/recipes-support/poppler/poppler_21.09.0.bb
+1 −1 meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb
+1 −0 meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+2 −0 meta-python/recipes-devtools/python/python3-alembic_1.6.5.bb
+1 −1 meta-python/recipes-devtools/python/python3-bitarray_2.3.3.bb
+2 −0 meta-python/recipes-devtools/python/python3-editor_1.0.4.bb
+5 −2 meta-python/recipes-devtools/python/python3-lrparsing_1.0.17.bb
+1 −1 meta-python/recipes-devtools/python/python3-pillow_8.3.2.bb
+2 −0 meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.23.bb
+2 −2 meta-python/recipes-devtools/python/python3-transitions_0.8.9.bb
+12 −0 meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb
2 changes: 1 addition & 1 deletion sources/meta-qcom
2 changes: 1 addition & 1 deletion sources/meta-yoe/conf/distro/yoe.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YOE_PROFILE ??= "yoe-glibc-sysvinit-wayland"
YOE_PROFILE ??= "yoe-glibc-systemd-wayland"
require ${YOE_PROFILE}.inc
4 changes: 2 additions & 2 deletions sources/meta-yoe/recipes-core/images/yoe-installer-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ export IMAGE_BASENAME = "yoe-installer-image"
IMAGE_FSTYPES = "wic.bmap wic.xz"

# Do not pollute the installer image with full image features
IMAGE_FEATURES = "ssh-server-dropbear hwcodecs debug-tweaks"
IMAGE_FEATURES = "ssh-server-openssh hwcodecs debug-tweaks"

PACKAGE_INSTALL = "\
packagegroup-core-boot \
packagegroup-core-ssh-dropbear \
packagegroup-core-ssh-openssh \
${MACHINE_HWCODECS} \
"

Expand Down
2 changes: 1 addition & 1 deletion sources/meta-yoe/recipes-core/images/yoe-simple-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit core-image
require updater.inc

IMAGE_FEATURES += "ssh-server-dropbear package-management hwcodecs"
IMAGE_FEATURES += "ssh-server-openssh package-management hwcodecs"

IMAGE_INSTALL = "\
packagegroup-core-boot \
Expand Down
26 changes: 26 additions & 0 deletions sources/meta-yoe/recipes-support/updater/files/updater.installer
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ initialize() {
mkdir -p $DATA_MOUNT_POINT
}

resize_sd() {
echo "Resizing data partition started ..." || return 1
if [ -z "$1" ]; then
DEVICE=$SD_DEVICE
else
DEVICE=$1
fi
sync
umount ${DEVICE}p3
PART_SIZE=$(cat "/sys/block/${DEVICE}p3/size")
# only continue if partition size is 1MB
if [ $PART_SIZE -gt 2048 ]; then
return 0
fi
echo "- +" | sfdisk -N 3 ${DEVICE}
resize2fs ${DEVICE}p3
}

partition_sd() {
echo "Partitioning started ..." || return 1
if [ -z "$1" ]; then
Expand Down Expand Up @@ -178,6 +196,10 @@ partition_emmc() {
partition_sd $EMMC_DEVICE
}

resize_emmc() {
resize_sd $EMMC_DEVICE
}

format_emmc_boot() {
mkfs.${BOOT_FSTYPE} -I -n "BOOT" $EMMC_BOOT_DEV || return 1
}
Expand Down Expand Up @@ -484,6 +506,10 @@ boot() {
umount_usb
umount_sd
umount_data
if ! resize_${STORAGE}; then
msg_splash "Resizing ${STORAGE} failed, bad media"
sleep 9999d
fi

if [ -e $EMMC_BOOT_DEV ]; then
msg_splash "Booting from EMMC ..."
Expand Down
3 changes: 3 additions & 0 deletions sources/meta-yoe/recipes-support/updater/updater_1.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ do_install() {
}

FILES:${PN} += "/init /platform /dev ${datadir}"

RDEPENDS:${PN} += "e2fsprogs-resize2fs util-linux-sfdisk"

4 changes: 2 additions & 2 deletions sources/meta-yoe/wic/yoe-sdimage.wks
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ part --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --al
# Main Rootfs partition (1G)
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --fixed-size 1024 --align 4

# User data partition (16M)
part /data --ondisk mmcblk --fstype=ext4 --label data --fixed-size 16 --align 4096
# User data partition (1M)
part /data --ondisk mmcblk --fstype=ext4 --label data --fixed-size 1 --align 4096

bootloader --ptable msdos
2 changes: 1 addition & 1 deletion sources/openembedded-core
Submodule openembedded-core updated 22 files
+3 −0 meta/classes/create-spdx.bbclass
+2 −0 meta/classes/cross-canadian.bbclass
+0 −1 meta/conf/distro/include/maintainers.inc
+1 −1 meta/conf/machine/include/mips/feature-mips-mips16e.inc
+1 −1 meta/lib/oeqa/selftest/cases/oescripts.py
+1 −0 meta/recipes-core/coreutils/coreutils_8.32.bb
+2 −2 meta/recipes-core/images/core-image-ptest-all.bb
+1 −1 meta/recipes-devtools/pseudo/pseudo_git.bb
+1 −0 meta/recipes-extended/findutils/findutils_4.8.0.bb
+1 −0 meta/recipes-extended/tar/tar_1.34.bb
+0 −32 meta/recipes-graphics/vulkan/assimp/0001-assimp-remove-shared-lib-from-_IMPORT_CHECK_TARGETS.patch
+0 −1,664 meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
+0 −257 meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
+0 −26 meta/recipes-graphics/vulkan/assimp_5.0.1.bb
+41 −0 meta/recipes-kernel/lttng/lttng-tools/0001-src-common-correct-header-location.patch
+0 −55 meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch
+88 −0 meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch
+1 −0 meta/recipes-kernel/lttng/lttng-tools/run-ptest
+17 −5 meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb
+25 −0 meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch
+10 −12 meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
+3 −4 meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb