-
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #967 from YoeDistro/kraj/master
Update layers and prepare for 2024.08
- Loading branch information
Showing
33 changed files
with
327 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule meta-intel
updated
15 files
Submodule meta-openembedded
updated
113 files
Submodule meta-qcom
updated
20 files
Submodule meta-raspberrypi
updated
2 files
| +0 −0 | recipes-graphics/mesa/mesa-gl.bbappend | |
| +0 −0 | recipes-graphics/mesa/mesa.bbappend |
Submodule meta-rockchip
updated
11 files
Submodule meta-swupdate
added at
faedf1
Submodule meta-tegra
updated
5 files
Submodule meta-ti
updated
2 files
| +1 −0 | meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb | |
| +1 −0 | meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb |
Submodule meta-variscite-bsp
updated
7 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
...es/meta-yoe/dynamic-layers/swupdate/recipes-core/images/files/tegra/bootloader-update.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| function postinst() | ||
| local success = os.execute("/usr/bin/oe4t-set-uefi-OSIndications") | ||
| local result = "oe4t-set-uefi-OSIndications completed with success: " .. tostring(success) | ||
| return success, result | ||
| end |
104 changes: 104 additions & 0 deletions
104
sources/meta-yoe/dynamic-layers/swupdate/recipes-core/images/files/tegra/sw-description
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| software = | ||
| { | ||
| version = "@@DISTRO_VERSION@@"; | ||
|
|
||
| @@MACHINE@@ = { | ||
| hardware-compatibility: [ "1.0" ] | ||
| system = { | ||
| slot_a : { | ||
| partitions: ( | ||
| { | ||
| type = "diskformat"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/APP_b"; | ||
| properties: { | ||
| fstype = "ext4"; | ||
| force = "true"; | ||
| } | ||
| } | ||
| ); | ||
| images: ( | ||
| { | ||
| filename = "@@ROOTFS_FILENAME@@"; | ||
| type = "archive"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/APP_b"; | ||
| filesystem = "ext4"; | ||
| path = "/"; | ||
| installed-directly = true; | ||
| preserve-attributes = true; | ||
| sha256 = "$swupdate_get_sha256(@@ROOTFS_FILENAME@@)"; | ||
| }, | ||
| { | ||
| filename = "@@DEPLOY_KERNEL_IMAGE@@"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/@@KERNEL_B_PARTNAME@@"; | ||
| }, | ||
| { | ||
| filename = "@@DTBFILE@@"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/@@KERNEL_B_DTB_PARTNAME@@"; | ||
| } | ||
|
|
||
| ); | ||
| files: ( | ||
| { | ||
| filename = "tegra-bl.cap"; | ||
| path = "/boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap"; | ||
| properties = {create-destination = "true";} | ||
| } | ||
| ); | ||
| scripts: ( | ||
| { | ||
| filename = "bootloader-update.lua"; | ||
| type = "lua" | ||
| sha256 = "$swupdate_get_sha256(bootloader-update.lua)"; | ||
| } | ||
| ); | ||
|
|
||
| }; | ||
| slot_b : { | ||
| partitions: ( | ||
| { | ||
| type = "diskformat"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/APP"; | ||
| properties: { | ||
| fstype = "ext4"; | ||
| force = "true"; | ||
| } | ||
| } | ||
| ); | ||
| images: ( | ||
| { | ||
| filename = "@@ROOTFS_FILENAME@@"; | ||
| type = "archive"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/APP"; | ||
| filesystem = "ext4"; | ||
| path = "/"; | ||
| installed-directly = true; | ||
| preserve-attributes = true; | ||
| sha256 = "$swupdate_get_sha256(@@ROOTFS_FILENAME@@)"; | ||
| }, | ||
| { | ||
| filename = "@@DEPLOY_KERNEL_IMAGE@@"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/@@KERNEL_A_PARTNAME@@"; | ||
| }, | ||
| { | ||
| filename = "@@DTBFILE@@"; | ||
| device = "@@ROOTFS_DEVICE_PATH@@/@@KERNEL_A_DTB_PARTNAME@@"; | ||
| } | ||
| ); | ||
| files: ( | ||
| { | ||
| filename = "tegra-bl.cap"; | ||
| path = "/boot/efi/EFI/UpdateCapsule/TEGRA_BL.Cap"; | ||
| properties = {create-destination = "true";} | ||
| } | ||
| ); | ||
| scripts: ( | ||
| { | ||
| filename = "bootloader-update.lua"; | ||
| type = "lua" | ||
| sha256 = "$swupdate_get_sha256(bootloader-update.lua)"; | ||
| } | ||
| ); | ||
| }; | ||
| }; | ||
| } | ||
| } |
6 changes: 0 additions & 6 deletions
6
sources/meta-yoe/dynamic-layers/swupdate/recipes-core/images/yoe-initramfs-image.bbappend
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
sources/meta-yoe/dynamic-layers/swupdate/recipes-core/images/yoe-swupdate-image-tegra.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| SUMMARY = "Tegra swupdate update image" | ||
| DESCRIPTION = "A swupdate image for demonstrating tegra updates" | ||
|
|
||
| LICENSE = "MIT" | ||
| LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
|
|
||
| SRC_URI = "\ | ||
| file://sw-description \ | ||
| file://bootloader-update.lua \ | ||
| " | ||
|
|
||
| inherit swupdate image_types_tegra | ||
|
|
||
| DEPLOY_KERNEL_IMAGE ?= "${@os.path.basename(tegra_kernel_image(d))}" | ||
|
|
||
| ROOTFS_DEVICE_PATH ?= "/dev/disk/by-partlabel" | ||
|
|
||
| # By default, use yoe-simple-image as the base image. | ||
| # Redefine in local.conf if you'd like to use a different base image. | ||
| SWUPDATE_CORE_IMAGE_NAME ?= "yoe-simple-image" | ||
|
|
||
| ROOTFS_FILENAME ?= "${SWUPDATE_CORE_IMAGE_NAME}-${MACHINE}.rootfs.tar.gz" | ||
|
|
||
| # Handle differences in redundant partition naming on t194 platforms | ||
| KERNEL_A_PARTNAME = "A_kernel" | ||
| KERNEL_A_DTB_PARTNAME = "A_kernel-dtb" | ||
| KERNEL_B_PARTNAME = "B_kernel" | ||
| KERNEL_B_DTB_PARTNAME = "B_kernel-dtb" | ||
|
|
||
| # images to build before building swupdate image | ||
| IMAGE_DEPENDS = "${SWUPDATE_CORE_IMAGE_NAME} tegra-uefi-capsules" | ||
|
|
||
| # images and files that will be included in the .swu image | ||
| DTBFILE_PATH = "${@'${EXTERNAL_KERNEL_DEVICETREE}/${DTBFILE}' if len(d.getVar('EXTERNAL_KERNEL_DEVICETREE')) else '${DTBFILE}'}" | ||
| SWUPDATE_IMAGES = "${ROOTFS_FILENAME} tegra-bl.cap ${DEPLOY_KERNEL_IMAGE} ${DTBFILE_PATH}" | ||
|
|
||
| do_swuimage[depends] += "${DTB_EXTRA_DEPS}" | ||
| do_swuimage[dirs] += "${S}" |
34 changes: 34 additions & 0 deletions
34
...ic-layers/swupdate/recipes-support/swupdate/swupdate-machine-config/swupdate-genconfig.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #!/bin/sh | ||
|
|
||
| get_current_slot() { | ||
| curslot=$(nvbootctrl get-current-slot) | ||
| if [ $curslot -eq 1 ]; then | ||
| echo "b" | ||
| else | ||
| echo "a" | ||
| fi | ||
| } | ||
|
|
||
| . /etc/os-release | ||
|
|
||
| if [ -e /run/mfgdata/serial-number ]; then | ||
| SERIALNUMBER=$(cat /run/mfgdata/serial-number) | ||
| elif [ -e /sys/module/fuse_burn/parameters/tegra_chip_uid ]; then | ||
| SERIALNUMBER=$(cat /sys/module/fuse_burn/parameters/tegra_chip_uid) | ||
| else | ||
| SERIALNUMBER="unknown" | ||
| fi | ||
|
|
||
| BOOTSLOT=$(get_current_slot) | ||
|
|
||
| rm -f /run/swupdate/swupdate.cfg | ||
|
|
||
| extrased= | ||
| if [ ! -e /usr/share/swupdate/swupdate.pem ]; then | ||
| extrased="-e /public-key-file/d" | ||
| fi | ||
| sed -e"s,@SWVERSION@,$VERSION_ID," \ | ||
| -e"s,@SERIALNUMBER@,$SERIALNUMBER," \ | ||
| -e"s,@BOOTSLOT@,$BOOTSLOT," \ | ||
| $extrased \ | ||
| /usr/share/swupdate/swupdate.cfg.in > /run/swupdate/swupdate.cfg |
2 changes: 2 additions & 0 deletions
2
...namic-layers/swupdate/recipes-support/swupdate/swupdate-machine-config/swupdate-mods.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [Service] | ||
| ExecStartPre=/usr/libexec/swupdate/swupdate-genconfig |
13 changes: 13 additions & 0 deletions
13
.../dynamic-layers/swupdate/recipes-support/swupdate/swupdate-machine-config/swupdate.cfg.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| globals: | ||
| { | ||
| verbose = false; | ||
| loglevel = 3; | ||
| select = "system,slot_@BOOTSLOT@"; | ||
| }; | ||
|
|
||
| identify : ( | ||
| { name = "swversion"; value = "@SWVERSION@" }, | ||
| { name = "serialnumber"; value = "@SERIALNUMBER@" }, | ||
| { name = "model"; value = "@MODEL@" } | ||
| ); | ||
|
|
Oops, something went wrong.