From 9209004fcb014de643a384e95845cb163ec83505 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Sep 2021 08:43:01 -0700 Subject: [PATCH 1/9] Layer Updates: sources/bitbake sources/meta-arm sources/meta-freescale sources/meta-freescale-3rdparty sources/meta-openembedded sources/meta-qcom sources/openembedded-core * sources/bitbake ae24a0f2...aaa5292e (3): > parse_py: Drop deprecated function reference > persist_data: Drop deprecated/unused function > doc: bitbake-user-manual-fetching: S should be set to WORKDIR/git for git fetcher * sources/meta-arm da848fd...e3943b4 (1): > arm-bsp/tc0: Update kernel configuration to support Android S * sources/meta-freescale 41a108b3...0e0bd2a3 (3): > Merge pull request #856 from thochstein/gstreamer > Merge pull request #861 from thochstein/qcacld > Merge pull request #860 from thochstein/qca9377 * sources/meta-freescale-3rdparty 10a3c87...d373302 (1): > Merge pull request #168 from chrisdimich/master * sources/meta-openembedded c2a8057647...cebf01f326 (30): > python3-transitions: upgrade 0.8.8 -> 0.8.9 > python3-lrparsing: upgrade 1.0.16 -> 1.0.17 > python3-bitarray: upgrade 2.3.2 -> 2.3.3 > packagegroup-meta-python: Add python3-portalocker > python3-portalocker: add recipe > python3-pillow: upgrade 8.3.1 -> 8.3.2 > python3-sqlalchemy: add native and nativesdk to BBCLASSEXTEND > python3-editor: add native and nativesdk to BBCLASSEXTEND > python3-alembic: add native and nativesdk to BBCLASSEXTEND > ntopng: upgrade 4.2 -> 5.0 > ndpi: upgrade 3.4 -> 4.0 > redis: advance to version 6.2.5 > libjcat: upgrade 0.1.7 -> 0.1.8 > libeigen: upgrade 3.3.9 -> 3.4.0 > libbytesize: upgrade 2.4 -> 2.6 > dash: upgrade 0.5.11.3 -> 0.5.11.5 > crash: upgrade 7.2.9 -> 7.3.0 > spdlog: update 1.8.2 -> 1.9.2 > fmt: update 7.1.3 -> 8.0.1 > can-utils: rrecommend iproute2 to make it possible to configure can interfaces > msgpack-c: update 3.2.1 -> 4.0.0, add msgpack-cpp > poppler: upgrade 21.08.0 -> 21.09.0 > poppler-data: upgrade 0.4.10 -> 0.4.11 > polkit: add the CVE tag > lockfile-progs: upgrade 0.1.18 -> 0.1.19 > libqmi: upgrade 1.30.0 -> 1.30.2 > dfu-util: upgrade 0.10 -> 0.11 > cppzmq: upgrade 4.7.1 -> 4.8.0 > mosquitto: upgrade 2.0.11 -> 2.0.12 > fuse3: upgrade 3.10.4 -> 3.10.5 * sources/meta-qcom b884eac...698268c (1): > Merge pull request #354 from bhupesh-sharma/set-initramfs-image-sa8155p * sources/openembedded-core ec20e1a0e0...71b549924a (11): > pseudo: Update with fcntl and glibc 2.34 fixes > cross-canadian: make android pass target sys check > core-image-ptest-all: bump RAM requirement to 4G > lttng: update 2.12 -> 2.13.0 > create-spdx: handle CLOSED license > assimp: Remove it > conf/mips: mips16e: prepend override to MACHINEOVERRIDES > oeqa/oescripts: Fix after tar recipe changes > tar: add pkgconfig for selinux > findutils: add pkgconfig for selinux > coreutils: add pkgconfig for selinux Signed-off-by: Khem Raj --- sources/bitbake | 2 +- sources/meta-arm | 2 +- sources/meta-freescale | 2 +- sources/meta-freescale-3rdparty | 2 +- sources/meta-openembedded | 2 +- sources/meta-qcom | 2 +- sources/openembedded-core | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sources/bitbake b/sources/bitbake index ae24a0f2d..aaa5292ef 160000 --- a/sources/bitbake +++ b/sources/bitbake @@ -1 +1 @@ -Subproject commit ae24a0f2d2d8b4b5ec10efabd0e9362e560832ea +Subproject commit aaa5292ef96ea27f505bc5c5a4b1eb4f497ed061 diff --git a/sources/meta-arm b/sources/meta-arm index da848fd7e..e3943b4c5 160000 --- a/sources/meta-arm +++ b/sources/meta-arm @@ -1 +1 @@ -Subproject commit da848fd7ef22782f4f25991261db0a8a2c8370c7 +Subproject commit e3943b4c50fc39ecdb912b6f641ef358b23b68ea diff --git a/sources/meta-freescale b/sources/meta-freescale index 41a108b34..0e0bd2a35 160000 --- a/sources/meta-freescale +++ b/sources/meta-freescale @@ -1 +1 @@ -Subproject commit 41a108b3453b5855d090a62dd451855ab6f9dad9 +Subproject commit 0e0bd2a3583520a79695fce3114ebe492bf50768 diff --git a/sources/meta-freescale-3rdparty b/sources/meta-freescale-3rdparty index 10a3c8708..d373302ca 160000 --- a/sources/meta-freescale-3rdparty +++ b/sources/meta-freescale-3rdparty @@ -1 +1 @@ -Subproject commit 10a3c870807fa9df36fb21ad036860789b491f78 +Subproject commit d373302ca3bad4dde15f778e75d0012fd249d07a diff --git a/sources/meta-openembedded b/sources/meta-openembedded index c2a805764..cebf01f32 160000 --- a/sources/meta-openembedded +++ b/sources/meta-openembedded @@ -1 +1 @@ -Subproject commit c2a8057647a0483e7faf1b55d4d89d4c9647e597 +Subproject commit cebf01f326de251a94f6944b6d06019d673893ae diff --git a/sources/meta-qcom b/sources/meta-qcom index b884eace5..698268ca9 160000 --- a/sources/meta-qcom +++ b/sources/meta-qcom @@ -1 +1 @@ -Subproject commit b884eace5e20ad37ede1fc7269a5fb1822bf9aa8 +Subproject commit 698268ca9bd7d934d77f5dc17a5856a37cd924bb diff --git a/sources/openembedded-core b/sources/openembedded-core index ec20e1a0e..71b549924 160000 --- a/sources/openembedded-core +++ b/sources/openembedded-core @@ -1 +1 @@ -Subproject commit ec20e1a0e0ba61a7615b361bfc9d9dc58a91f9b3 +Subproject commit 71b549924a7fa7973a8e03e11f3db45fdc29889d From 2d30eec5846cc13bf2d8ba118bb4cc8c119c9f4f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Sep 2021 08:49:42 -0700 Subject: [PATCH 2/9] CHANGELOG.md: Document current changes Signed-off-by: Khem Raj --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea4fdbb6..14c67dd07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,15 +14,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - 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 From 10de083f3dd55091e9c67df2d38ad18cc5e8ab6a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Sep 2021 23:17:43 -0700 Subject: [PATCH 3/9] Layer Updates: sources/meta-clang sources/meta-openembedded sources/meta-ti * sources/meta-clang 3c131c2...12c3739 (1): > clang: Update to latest 13.x * sources/meta-openembedded cebf01f326...32140218a8 (1): > krb5: fix CVE-2021-37750 * sources/meta-ti 1a0d0972...67e95742 (1): > linux-ti-staging: Update 5.10 kernel to 5.10.59 Signed-off-by: Khem Raj --- sources/meta-clang | 2 +- sources/meta-openembedded | 2 +- sources/meta-ti | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/meta-clang b/sources/meta-clang index 3c131c2ba..12c3739c9 160000 --- a/sources/meta-clang +++ b/sources/meta-clang @@ -1 +1 @@ -Subproject commit 3c131c2bac5ca105270a1ab075632f13cf8d8485 +Subproject commit 12c3739c9cc737ceb8a29bf7bbd848d3de4b8d17 diff --git a/sources/meta-openembedded b/sources/meta-openembedded index cebf01f32..32140218a 160000 --- a/sources/meta-openembedded +++ b/sources/meta-openembedded @@ -1 +1 @@ -Subproject commit cebf01f326de251a94f6944b6d06019d673893ae +Subproject commit 32140218a8026016687c7017a82113b0b45cf1a6 diff --git a/sources/meta-ti b/sources/meta-ti index 1a0d09726..67e95742f 160000 --- a/sources/meta-ti +++ b/sources/meta-ti @@ -1 +1 @@ -Subproject commit 1a0d097261c8538ca8e643b647f1b35f6c2f1cf9 +Subproject commit 67e95742fc5c2c28e730fdf90cb737285e72ce67 From 9189203160e5dcd28a5a3720c8aa8a95318d4f5c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 00:46:02 -0700 Subject: [PATCH 4/9] yoe: Switch to using systemd as default init system Fixes https://github.com/YoeDistro/yoe-distro/issues/581 Signed-off-by: Khem Raj --- sources/meta-yoe/conf/distro/yoe.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/meta-yoe/conf/distro/yoe.conf b/sources/meta-yoe/conf/distro/yoe.conf index 0d657a235..960f670c8 100644 --- a/sources/meta-yoe/conf/distro/yoe.conf +++ b/sources/meta-yoe/conf/distro/yoe.conf @@ -1,2 +1,2 @@ -YOE_PROFILE ??= "yoe-glibc-sysvinit-wayland" +YOE_PROFILE ??= "yoe-glibc-systemd-wayland" require ${YOE_PROFILE}.inc From 9ecbbbe016aed630710c2910df140c390349308e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 00:48:35 -0700 Subject: [PATCH 5/9] images: Use openssh instead of dropbear openssh has useful features that can be handy at expense of some code size e.g. see https://community.tmpdir.org/t/using-dropbear-vs-openssh/302/4 Fixes https://github.com/YoeDistro/yoe-distro/issues/580 Signed-off-by: Khem Raj --- sources/meta-yoe/recipes-core/images/yoe-installer-image.bb | 4 ++-- sources/meta-yoe/recipes-core/images/yoe-simple-image.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/meta-yoe/recipes-core/images/yoe-installer-image.bb b/sources/meta-yoe/recipes-core/images/yoe-installer-image.bb index 8ba6a87db..93b7397f2 100644 --- a/sources/meta-yoe/recipes-core/images/yoe-installer-image.bb +++ b/sources/meta-yoe/recipes-core/images/yoe-installer-image.bb @@ -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} \ " diff --git a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb index ad5524ca0..476488076 100644 --- a/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb +++ b/sources/meta-yoe/recipes-core/images/yoe-simple-image.bb @@ -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 \ From f7048da2b6051466c815596e901e4eda658fe4e1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 00:58:49 -0700 Subject: [PATCH 6/9] site.conf: Define yoe wic template for rpi and c4 We have a data partition ( 1M ) which will be resized during first boot to expland to SD card size See https://github.com/YoeDistro/yoe-distro/issues/579 Signed-off-by: Khem Raj --- conf/site.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/site.conf b/conf/site.conf index 2d7d469e3..0c5ae4596 100644 --- a/conf/site.conf +++ b/conf/site.conf @@ -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 From 70f5e09f95fb914a0a5103fe3df890c5f248b758 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 01:00:31 -0700 Subject: [PATCH 7/9] yoe-sdimage.wks: Reduce data partition default to 1M see https://github.com/YoeDistro/yoe-distro/issues/579 Signed-off-by: Khem Raj --- sources/meta-yoe/wic/yoe-sdimage.wks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/meta-yoe/wic/yoe-sdimage.wks b/sources/meta-yoe/wic/yoe-sdimage.wks index 0e9e12f62..a6daa95de 100644 --- a/sources/meta-yoe/wic/yoe-sdimage.wks +++ b/sources/meta-yoe/wic/yoe-sdimage.wks @@ -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 From ae1f4573e451ad5860bcc030bde7199048957f2a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 03:33:13 -0700 Subject: [PATCH 8/9] updater: Implement facility to resize data partition In some cases, we do not want to repartition the disk but only resize the data partition to expand into full SD card. This will be useful in cases where SD card based rootfs is used and does not have second media to install from. Implements https://github.com/YoeDistro/yoe-distro/issues/579 Signed-off-by: Khem Raj --- .../updater/files/updater.installer | 26 +++++++++++++++++++ .../recipes-support/updater/updater_1.0.bb | 3 +++ 2 files changed, 29 insertions(+) diff --git a/sources/meta-yoe/recipes-support/updater/files/updater.installer b/sources/meta-yoe/recipes-support/updater/files/updater.installer index 684b71b1c..9c09b4146 100644 --- a/sources/meta-yoe/recipes-support/updater/files/updater.installer +++ b/sources/meta-yoe/recipes-support/updater/files/updater.installer @@ -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 @@ -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 } @@ -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 ..." diff --git a/sources/meta-yoe/recipes-support/updater/updater_1.0.bb b/sources/meta-yoe/recipes-support/updater/updater_1.0.bb index 8ce91e349..b73df802e 100644 --- a/sources/meta-yoe/recipes-support/updater/updater_1.0.bb +++ b/sources/meta-yoe/recipes-support/updater/updater_1.0.bb @@ -19,3 +19,6 @@ do_install() { } FILES:${PN} += "/init /platform /dev ${datadir}" + +RDEPENDS:${PN} += "e2fsprogs-resize2fs util-linux-sfdisk" + From 86826f85871845683b08853e202b54e527f11222 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Sep 2021 03:40:26 -0700 Subject: [PATCH 9/9] CHANGELOG: Document current changes Signed-off-by: Khem Raj --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c67dd07..206e09d2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ 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