diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 12 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 6 | ||||
-rw-r--r-- | classes/sota.bbclass | 14 | ||||
-rw-r--r-- | classes/sota_am335x-evm-wifi.bbclass | 14 | ||||
-rw-r--r-- | classes/sota_bleeding.inc | 4 | ||||
-rw-r--r-- | classes/sota_freedom-u540.bbclass | 6 | ||||
-rw-r--r-- | classes/sota_m3ulcb.bbclass | 8 | ||||
-rw-r--r-- | classes/sota_minnowboard.bbclass | 12 | ||||
-rw-r--r-- | classes/sota_porter.bbclass | 8 | ||||
-rw-r--r-- | classes/sota_qemux86-64.bbclass | 6 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 56 |
11 files changed, 73 insertions, 73 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 68fb563..5d55cdb 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -15,14 +15,14 @@ SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == ' | |||
15 | 15 | ||
16 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | 16 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" |
17 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 17 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
18 | CONVERSIONTYPES_append = " tar" | 18 | CONVERSIONTYPES:append = " tar" |
19 | 19 | ||
20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
21 | 21 | ||
22 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 22 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
23 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 23 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |
24 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" | 24 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" |
25 | IMAGE_CMD_ostree () { | 25 | IMAGE_CMD:ostree () { |
26 | # Copy required as we change permissions on some files. | 26 | # Copy required as we change permissions on some files. |
27 | tar --xattrs --xattrs-include='*' -cf - -S -C ${IMAGE_ROOTFS} -p . | tar --xattrs --xattrs-include='*' -xf - -C ${OSTREE_ROOTFS} | 27 | tar --xattrs --xattrs-include='*' -cf - -S -C ${IMAGE_ROOTFS} -p . | tar --xattrs --xattrs-include='*' -xf - -C ${OSTREE_ROOTFS} |
28 | 28 | ||
@@ -129,7 +129,7 @@ IMAGE_CMD_ostree () { | |||
129 | IMAGE_TYPEDEP_ostreecommit = "ostree" | 129 | IMAGE_TYPEDEP_ostreecommit = "ostree" |
130 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" | 130 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" |
131 | do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" | 131 | do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" |
132 | IMAGE_CMD_ostreecommit () { | 132 | IMAGE_CMD:ostreecommit () { |
133 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then | 133 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then |
134 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 | 134 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 |
135 | fi | 135 | fi |
@@ -154,7 +154,7 @@ IMAGE_CMD_ostreecommit () { | |||
154 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" | 154 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" |
155 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 155 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
156 | do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" | 156 | do_image_ostreepush[lockfiles] += "${OSTREE_REPO}/ostree.lock" |
157 | IMAGE_CMD_ostreepush () { | 157 | IMAGE_CMD:ostreepush () { |
158 | # send a copy of the repo manifest to backend if available | 158 | # send a copy of the repo manifest to backend if available |
159 | local SEND_MANIFEST="" | 159 | local SEND_MANIFEST="" |
160 | # check if garage-push supports the --repo-manifest option before trying | 160 | # check if garage-push supports the --repo-manifest option before trying |
@@ -182,7 +182,7 @@ do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" | |||
182 | # This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using | 182 | # This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using |
183 | # garage-sign simultaneously for two images often causes problems. | 183 | # garage-sign simultaneously for two images often causes problems. |
184 | do_image_garagesign[lockfiles] += "${DEPLOY_DIR_IMAGE}/garagesign.lock" | 184 | do_image_garagesign[lockfiles] += "${DEPLOY_DIR_IMAGE}/garagesign.lock" |
185 | IMAGE_CMD_garagesign () { | 185 | IMAGE_CMD:garagesign () { |
186 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 186 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
187 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 187 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
188 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 | 188 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 |
@@ -270,7 +270,7 @@ IMAGE_CMD_garagesign () { | |||
270 | } | 270 | } |
271 | 271 | ||
272 | IMAGE_TYPEDEP_garagecheck = "garagesign" | 272 | IMAGE_TYPEDEP_garagecheck = "garagesign" |
273 | IMAGE_CMD_garagecheck () { | 273 | IMAGE_CMD:garagecheck () { |
274 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 274 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
275 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 275 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
276 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 | 276 | unzip -p ${SOTA_PACKED_CREDENTIALS} root.json targets.pub targets.sec tufrepo.url 2>&1 >/dev/null || exit 0 |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 8af6637..0bb31de 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -5,7 +5,7 @@ do_image_ota[dirs] = "${OTA_SYSROOT}" | |||
5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" | 5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" |
6 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ | 6 | do_image_ota[depends] = "${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER') == 'grub' else ''} \ |
7 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}" | 7 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER') == 'u-boot' else ''}" |
8 | IMAGE_CMD_ota () { | 8 | IMAGE_CMD:ota () { |
9 | ostree admin --sysroot=${OTA_SYSROOT} init-fs --modern ${OTA_SYSROOT} | 9 | ostree admin --sysroot=${OTA_SYSROOT} init-fs --modern ${OTA_SYSROOT} |
10 | ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME} | 10 | ostree admin --sysroot=${OTA_SYSROOT} os-init ${OSTREE_OSNAME} |
11 | 11 | ||
@@ -77,10 +77,10 @@ IMAGE_CMD_ota () { | |||
77 | echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions | 77 | echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions |
78 | } | 78 | } |
79 | 79 | ||
80 | EXTRA_IMAGECMD_ota-ext4 = "-L otaroot -i 4096 -t ext4" | 80 | EXTRA_IMAGECMD:ota-ext4 = "-L otaroot -i 4096 -t ext4" |
81 | IMAGE_TYPEDEP_ota-ext4 = "ota" | 81 | IMAGE_TYPEDEP_ota-ext4 = "ota" |
82 | IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" | 82 | IMAGE_ROOTFS_task-image-ota-ext4 = "${OTA_SYSROOT}" |
83 | IMAGE_CMD_ota-ext4 () { | 83 | IMAGE_CMD:ota-ext4 () { |
84 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4 | 84 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/mkfs.ota-ext4 |
85 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ota-ext4 | 85 | ln -sf ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ext4 ${STAGING_DIR_NATIVE}${base_sbindir_native}/fsck.ota-ext4 |
86 | oe_mkext234fs ota-ext4 ${EXTRA_IMAGECMD} | 86 | oe_mkext234fs ota-ext4 ${EXTRA_IMAGECMD} |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index a331fa4..32efe5c 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -5,7 +5,7 @@ SOTA_DEPLOY_CREDENTIALS ?= "1" | |||
5 | SOTA_HARDWARE_ID ??= "${MACHINE}" | 5 | SOTA_HARDWARE_ID ??= "${MACHINE}" |
6 | 6 | ||
7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" | 7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" |
8 | IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ | 8 | IMAGE_INSTALL:append:sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ |
9 | ostree os-release ostree-kernel ostree-initramfs \ | 9 | ostree os-release ostree-kernel ostree-initramfs \ |
10 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" | 10 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" |
11 | 11 | ||
@@ -13,12 +13,12 @@ IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush ga | |||
13 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" | 13 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" |
14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota.tar.xz', ' ', d)}" | 14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota.tar.xz', ' ', d)}" |
15 | 15 | ||
16 | PACKAGECONFIG_append_pn-curl = " ssl" | 16 | PACKAGECONFIG:append:pn-curl = " ssl" |
17 | PACKAGECONFIG_remove_pn-curl = "gnutls" | 17 | PACKAGECONFIG:remove:pn-curl = "gnutls" |
18 | 18 | ||
19 | WKS_FILE_sota ?= "sdimage-sota.wks" | 19 | WKS_FILE:sota ?= "sdimage-sota.wks" |
20 | 20 | ||
21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" | 21 | EXTRA_IMAGEDEPENDS:append:sota = " parted-native mtools-native dosfstools-native" |
22 | 22 | ||
23 | INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" | 23 | INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" |
24 | 24 | ||
@@ -46,11 +46,11 @@ GARAGE_TARGET_EXPIRE_AFTER ?= "" | |||
46 | GARAGE_CUSTOMIZE_TARGET ?= "" | 46 | GARAGE_CUSTOMIZE_TARGET ?= "" |
47 | 47 | ||
48 | SOTA_MACHINE ??="none" | 48 | SOTA_MACHINE ??="none" |
49 | SOTA_MACHINE_rpi ?= "raspberrypi" | 49 | SOTA_MACHINE:rpi ?= "raspberrypi" |
50 | SOTA_MACHINE_porter ?= "porter" | 50 | SOTA_MACHINE_porter ?= "porter" |
51 | SOTA_MACHINE_m3ulcb = "m3ulcb" | 51 | SOTA_MACHINE_m3ulcb = "m3ulcb" |
52 | SOTA_MACHINE_intel-corei7-64 ?= "minnowboard" | 52 | SOTA_MACHINE_intel-corei7-64 ?= "minnowboard" |
53 | SOTA_MACHINE_qemux86-64 ?= "qemux86-64" | 53 | SOTA_MACHINE:qemux86-64 ?= "qemux86-64" |
54 | SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" | 54 | SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" |
55 | SOTA_MACHINE_freedom-u540 ?= "freedom-u540" | 55 | SOTA_MACHINE_freedom-u540 ?= "freedom-u540" |
56 | 56 | ||
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/classes/sota_am335x-evm-wifi.bbclass index 1458d44..724a8d0 100644 --- a/classes/sota_am335x-evm-wifi.bbclass +++ b/classes/sota_am335x-evm-wifi.bbclass | |||
@@ -1,15 +1,15 @@ | |||
1 | KERNEL_IMAGETYPE_sota = "uImage" | 1 | KERNEL_IMAGETYPE:sota = "uImage" |
2 | 2 | ||
3 | OSTREE_BOOTLOADER ?= "u-boot" | 3 | OSTREE_BOOTLOADER ?= "u-boot" |
4 | 4 | ||
5 | EXTRA_IMAGEDEPENDS_append_sota = " acer-bootfiles" | 5 | EXTRA_IMAGEDEPENDS:append:sota = " acer-bootfiles" |
6 | IMAGE_BOOT_FILES_sota = "bootfiles/*" | 6 | IMAGE_BOOT_FILES:sota = "bootfiles/*" |
7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" | 7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" |
8 | 8 | ||
9 | IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" | 9 | IMAGE_INSTALL:append:sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" |
10 | 10 | ||
11 | PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f" | 11 | PREFERRED_VERSION_linux-ti-staging:sota = "4.4.54+gitAUTOINC+ecd4eada6f" |
12 | 12 | ||
13 | KERNEL_EXTRA_ARGS_append_sota = " LOADADDR=${UBOOT_ENTRYPOINT}" | 13 | KERNEL_EXTRA_ARGS:append:sota = " LOADADDR=${UBOOT_ENTRYPOINT}" |
14 | 14 | ||
15 | VIRTUAL-RUNTIME_net_manager_sota = "systemd" | 15 | VIRTUAL-RUNTIME_net_manager:sota = "systemd" |
diff --git a/classes/sota_bleeding.inc b/classes/sota_bleeding.inc index 77d004b..f70e8b7 100644 --- a/classes/sota_bleeding.inc +++ b/classes/sota_bleeding.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | SRCREV_pn-aktualizr ?= "${AUTOREV}" | 1 | SRCREV:pn-aktualizr ?= "${AUTOREV}" |
2 | SRCREV_pn-aktualizr-native ?= "${AUTOREV}" | 2 | SRCREV:pn-aktualizr-native ?= "${AUTOREV}" |
diff --git a/classes/sota_freedom-u540.bbclass b/classes/sota_freedom-u540.bbclass index c287154..8759b2b 100644 --- a/classes/sota_freedom-u540.bbclass +++ b/classes/sota_freedom-u540.bbclass | |||
@@ -5,8 +5,8 @@ INITRAMFS_FSTYPES = "cpio.gz" | |||
5 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 5 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
6 | 6 | ||
7 | IMAGE_BOOT_FILES += "uEnv.txt" | 7 | IMAGE_BOOT_FILES += "uEnv.txt" |
8 | IMAGE_BOOT_FILES_remove = "fitImage" | 8 | IMAGE_BOOT_FILES:remove = "fitImage" |
9 | 9 | ||
10 | OSTREE_KERNEL_ARGS_sota ?= "earlycon=sbi console=ttySIF0 ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p3" | 10 | OSTREE_KERNEL_ARGS:sota ?= "earlycon=sbi console=ttySIF0 ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p3" |
11 | 11 | ||
12 | WKS_FILE_sota = "freedom-u540-opensbi-sota.wks" | 12 | WKS_FILE:sota = "freedom-u540-opensbi-sota.wks" |
diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index 7ea273d..521ce24 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass | |||
@@ -1,12 +1,12 @@ | |||
1 | # Commit united image to OSTree, not just uImage | 1 | # Commit united image to OSTree, not just uImage |
2 | OSTREE_KERNEL = "Image" | 2 | OSTREE_KERNEL = "Image" |
3 | 3 | ||
4 | EXTRA_IMAGEDEPENDS_append_sota = " renesas-ota-bootfiles" | 4 | EXTRA_IMAGEDEPENDS:append:sota = " renesas-ota-bootfiles" |
5 | IMAGE_BOOT_FILES_sota += "renesas-ota-bootfiles/*" | 5 | IMAGE_BOOT_FILES:sota += "renesas-ota-bootfiles/*" |
6 | 6 | ||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | 8 | ||
9 | UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" | 9 | UBOOT_MACHINE:sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" |
10 | 10 | ||
11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" | 11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
12 | IMAGE_INSTALL_append_sota = " network-configuration " | 12 | IMAGE_INSTALL:append:sota = " network-configuration " |
diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass index 3128965..57230a2 100644 --- a/classes/sota_minnowboard.bbclass +++ b/classes/sota_minnowboard.bbclass | |||
@@ -1,12 +1,12 @@ | |||
1 | OSTREE_BOOTLOADER ?= "grub" | 1 | OSTREE_BOOTLOADER ?= "grub" |
2 | EFI_PROVIDER_sota = "grub-efi" | 2 | EFI_PROVIDER:sota = "grub-efi" |
3 | 3 | ||
4 | WKS_FILE_sota = "efiimage-sota.wks" | 4 | WKS_FILE:sota = "efiimage-sota.wks" |
5 | IMAGE_BOOT_FILES_sota = "" | 5 | IMAGE_BOOT_FILES:sota = "" |
6 | 6 | ||
7 | IMAGE_FSTYPES_remove_sota = "live hddimg" | 7 | IMAGE_FSTYPES:remove:sota = "live hddimg" |
8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" | 8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" |
9 | IMAGE_INSTALL_append = " minnowboard-efi-startup" | 9 | IMAGE_INSTALL:append = " minnowboard-efi-startup" |
10 | 10 | ||
11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" | 11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
12 | IMAGE_INSTALL_append_sota = " network-configuration " | 12 | IMAGE_INSTALL:append:sota = " network-configuration " |
diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass index 6c6fe70..ffefecb 100644 --- a/classes/sota_porter.bbclass +++ b/classes/sota_porter.bbclass | |||
@@ -1,11 +1,11 @@ | |||
1 | # Commit united image to OSTree, not just uImage | 1 | # Commit united image to OSTree, not just uImage |
2 | OSTREE_KERNEL = "uImage+dtb" | 2 | OSTREE_KERNEL = "uImage+dtb" |
3 | 3 | ||
4 | EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles" | 4 | EXTRA_IMAGEDEPENDS:append:sota = " porter-bootfiles" |
5 | IMAGE_BOOT_FILES_sota += "porter-bootfiles/*" | 5 | IMAGE_BOOT_FILES:sota += "porter-bootfiles/*" |
6 | 6 | ||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | UBOOT_MACHINE_sota = "porter_config" | 8 | UBOOT_MACHINE:sota = "porter_config" |
9 | 9 | ||
10 | PREFERRED_RPROVIDER_network-configuration ?= "connman" | 10 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
11 | IMAGE_INSTALL_append_sota = " network-configuration " | 11 | IMAGE_INSTALL:append:sota = " network-configuration " |
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 3dc2428..6cfe611 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass | |||
@@ -1,8 +1,8 @@ | |||
1 | IMAGE_FSTYPES_remove = "wic" | 1 | IMAGE_FSTYPES:remove = "wic" |
2 | 2 | ||
3 | # U-Boot support for SOTA | 3 | # U-Boot support for SOTA |
4 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" | 4 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" |
5 | UBOOT_MACHINE_sota = "qemu-x86_defconfig" | 5 | UBOOT_MACHINE:sota = "qemu-x86_defconfig" |
6 | OSTREE_BOOTLOADER ?= "u-boot" | 6 | OSTREE_BOOTLOADER ?= "u-boot" |
7 | INITRAMFS_FSTYPES ?= "cpio.gz" | 7 | INITRAMFS_FSTYPES ?= "cpio.gz" |
8 | 8 | ||
@@ -13,4 +13,4 @@ IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '655 | |||
13 | # fix for u-boot/swig build issue | 13 | # fix for u-boot/swig build issue |
14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" | 14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" |
15 | 15 | ||
16 | IMAGE_INSTALL_append_sota = " network-configuration " | 16 | IMAGE_INSTALL:append:sota = " network-configuration " |
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 3935ba8..c36dc51 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -1,7 +1,7 @@ | |||
1 | RPI_USE_U_BOOT_sota = "1" | 1 | RPI_USE_U_BOOT:sota = "1" |
2 | 2 | ||
3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" | 3 | KERNEL_CLASSES:append:sota = " kernel-fitimage" |
4 | KERNEL_IMAGETYPE_sota = "fitImage" | 4 | KERNEL_IMAGETYPE:sota = "fitImage" |
5 | INITRAMFS_FSTYPES = "cpio.gz" | 5 | INITRAMFS_FSTYPES = "cpio.gz" |
6 | OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${KERNEL_FIT_LINK_NAME}" | 6 | OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${KERNEL_FIT_LINK_NAME}" |
7 | 7 | ||
@@ -10,15 +10,15 @@ UBOOT_DTB_LOADADDRESS = "0x05000000" | |||
10 | UBOOT_DTBO_LOADADDRESS = "0x06000000" | 10 | UBOOT_DTBO_LOADADDRESS = "0x06000000" |
11 | 11 | ||
12 | # Deploy config fragment list to OSTree root fs | 12 | # Deploy config fragment list to OSTree root fs |
13 | IMAGE_INSTALL_append = " fit-conf" | 13 | IMAGE_INSTALL:append = " fit-conf" |
14 | 14 | ||
15 | DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" | 15 | DEV_MATCH_DIRECTIVE:pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" |
16 | IMAGE_INSTALL_append_sota = " network-configuration " | 16 | IMAGE_INSTALL:append:sota = " network-configuration " |
17 | 17 | ||
18 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 18 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
19 | UBOOT_ENTRYPOINT_sota ?= "0x00080000" | 19 | UBOOT_ENTRYPOINT:sota ?= "0x00080000" |
20 | 20 | ||
21 | IMAGE_FSTYPES_remove_sota = "rpi-sdimg" | 21 | IMAGE_FSTYPES:remove:sota = "rpi-sdimg" |
22 | OSTREE_BOOTLOADER ?= "u-boot" | 22 | OSTREE_BOOTLOADER ?= "u-boot" |
23 | 23 | ||
24 | def make_dtb_boot_files(d): | 24 | def make_dtb_boot_files(d): |
@@ -39,7 +39,7 @@ def make_dtb_boot_files(d): | |||
39 | 39 | ||
40 | return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) | 40 | return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) |
41 | 41 | ||
42 | IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \ | 42 | IMAGE_BOOT_FILES:sota = "${BOOTFILES_DIR_NAME}/* \ |
43 | u-boot.bin;${SDIMG_KERNELIMAGE} \ | 43 | u-boot.bin;${SDIMG_KERNELIMAGE} \ |
44 | " | 44 | " |
45 | 45 | ||
@@ -47,27 +47,27 @@ IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \ | |||
47 | # bcm2835-bootfiles, now just bootfiles). | 47 | # bcm2835-bootfiles, now just bootfiles). |
48 | # rpi4 and recent rpi3 firmwares needs dtb in /boot partition | 48 | # rpi4 and recent rpi3 firmwares needs dtb in /boot partition |
49 | # so that they can be read by the firmware | 49 | # so that they can be read by the firmware |
50 | IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}" | 50 | IMAGE_BOOT_FILES:append:sota = "${@make_dtb_boot_files(d)}" |
51 | 51 | ||
52 | # Just the overlays that will be used should be listed | 52 | # Just the overlays that will be used should be listed |
53 | KERNEL_DEVICETREE_raspberrypi2_sota ?= " bcm2709-rpi-2-b.dtb " | 53 | KERNEL_DEVICETREE:raspberrypi2:sota ?= " bcm2709-rpi-2-b.dtb " |
54 | KERNEL_DEVICETREE_raspberrypi3_sota ?= " bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/rpi-ft5406.dtbo" | 54 | KERNEL_DEVICETREE:raspberrypi3:sota ?= " bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/rpi-ft5406.dtbo" |
55 | KERNEL_DEVICETREE_raspberrypi3-64_sota ?= " broadcom/bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/vc4-fkms-v3d.dtbo overlays/rpi-ft5406.dtbo" | 55 | KERNEL_DEVICETREE:raspberrypi3-64:sota ?= " broadcom/bcm2710-rpi-3-b.dtb overlays/vc4-kms-v3d.dtbo overlays/vc4-fkms-v3d.dtbo overlays/rpi-ft5406.dtbo" |
56 | KERNEL_DEVICETREE_raspberrypi4_sota ?= " bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" | 56 | KERNEL_DEVICETREE:raspberrypi4:sota ?= " bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" |
57 | KERNEL_DEVICETREE_raspberrypi4-64_sota ?= " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" | 57 | KERNEL_DEVICETREE:raspberrypi4-64:sota ?= " broadcom/bcm2711-rpi-4-b.dtb overlays/vc4-fkms-v3d.dtbo overlays/uart0-rpi4.dtbo" |
58 | 58 | ||
59 | SOTA_MAIN_DTB_raspberrypi2 ?= "bcm2709-rpi-2-b.dtb" | 59 | SOTA_MAIN_DTB:raspberrypi2 ?= "bcm2709-rpi-2-b.dtb" |
60 | SOTA_MAIN_DTB_raspberrypi3 ?= "bcm2710-rpi-3-b.dtb" | 60 | SOTA_MAIN_DTB:raspberrypi3 ?= "bcm2710-rpi-3-b.dtb" |
61 | SOTA_MAIN_DTB_raspberrypi3-64 ?= "broadcom_bcm2710-rpi-3-b.dtb" | 61 | SOTA_MAIN_DTB:raspberrypi3-64 ?= "broadcom_bcm2710-rpi-3-b.dtb" |
62 | SOTA_MAIN_DTB_raspberrypi4_sota ?= "bcm2711-rpi-4-b.dtb" | 62 | SOTA_MAIN_DTB:raspberrypi4:sota ?= "bcm2711-rpi-4-b.dtb" |
63 | SOTA_MAIN_DTB_raspberrypi4-64_sota ?= "broadcom_bcm2711-rpi-4-b.dtb" | 63 | SOTA_MAIN_DTB:raspberrypi4-64:sota ?= "broadcom_bcm2711-rpi-4-b.dtb" |
64 | 64 | ||
65 | SOTA_DT_OVERLAYS_raspberrypi3 ?= "vc4-kms-v3d.dtbo rpi-ft5406.dtbo" | 65 | SOTA_DT_OVERLAYS:raspberrypi3 ?= "vc4-kms-v3d.dtbo rpi-ft5406.dtbo" |
66 | SOTA_DT_OVERLAYS_raspberrypi3-64 ?= "vc4-kms-v3d.dtbo vc4-fkms-v3d.dtbo rpi-ft5406.dtbo" | 66 | SOTA_DT_OVERLAYS:raspberrypi3-64 ?= "vc4-kms-v3d.dtbo vc4-fkms-v3d.dtbo rpi-ft5406.dtbo" |
67 | SOTA_DT_OVERLAYS_raspberrypi4 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo" | 67 | SOTA_DT_OVERLAYS:raspberrypi4 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo" |
68 | SOTA_DT_OVERLAYS_raspberrypi4-64 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo" | 68 | SOTA_DT_OVERLAYS:raspberrypi4-64 ?= "vc4-fkms-v3d.dtbo uart0-rpi4.dtbo" |
69 | 69 | ||
70 | # Kernel args normally provided by RPi's internal bootloader. Non-updateable | 70 | # Kernel args normally provided by RPi's internal bootloader. Non-updateable |
71 | OSTREE_KERNEL_ARGS_sota ?= " 8250.nr_uarts=1 bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=614 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 console=ttyS0,115200 usbhid.mousepoll=0 " | 71 | OSTREE_KERNEL_ARGS:sota ?= " 8250.nr_uarts=1 bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=614 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 dwc_otg.lpm_enable=0 console=ttyS0,115200 usbhid.mousepoll=0 " |
72 | 72 | ||
73 | SOTA_CLIENT_FEATURES_append = " ubootenv" | 73 | SOTA_CLIENT_FEATURES:append = " ubootenv" |