diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 19:44:05 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-30 10:29:35 +0200 |
commit | 31a770d3c0cb22c9f4ece068208d2e6b2c28f1ee (patch) | |
tree | 45dc83314dc336239e82f5d084541c3143841ed6 | |
parent | a0d9835bad4c86416323b1055315fc1fb09bcde5 (diff) | |
download | meta-updater-31a770d3c0cb22c9f4ece068208d2e6b2c28f1ee.tar.gz |
Convert to new override syntax
This is the result of automated script (0.9.0) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
62 files changed, 217 insertions, 217 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fade39..bc3308f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -67,7 +67,7 @@ Oe-selftest qemux86_64: | |||
67 | stage: test | 67 | stage: test |
68 | variables: | 68 | variables: |
69 | TEST_BUILD_DIR: 'build-oe-qemux86_64' | 69 | TEST_BUILD_DIR: 'build-oe-qemux86_64' |
70 | OE_SELFTESTS: 'updater_native updater_qemux86_64' | 70 | OE_SELFTESTS: 'updater_native updater:qemux86_64' |
71 | except: | 71 | except: |
72 | - pushes | 72 | - pushes |
73 | 73 | ||
@@ -105,7 +105,7 @@ Ptest qemux86_64: | |||
105 | stage: test | 105 | stage: test |
106 | variables: | 106 | variables: |
107 | TEST_BUILD_DIR: 'build-oe-qemux86_64-ptest' | 107 | TEST_BUILD_DIR: 'build-oe-qemux86_64-ptest' |
108 | OE_SELFTESTS: 'updater_qemux86_64_ptest' | 108 | OE_SELFTESTS: 'updater:qemux86_64_ptest' |
109 | except: | 109 | except: |
110 | - pushes | 110 | - pushes |
111 | only: | 111 | only: |
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" |
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 4b7990f..33dd597 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf | |||
@@ -7,6 +7,6 @@ DISTRO_NAME = "OTA-enabled Linux" | |||
7 | DISTRO_VERSION = "1.0" | 7 | DISTRO_VERSION = "1.0" |
8 | DISTRO_CODENAME = "sota" | 8 | DISTRO_CODENAME = "sota" |
9 | 9 | ||
10 | DISTRO_FEATURES_append = " systemd" | 10 | DISTRO_FEATURES:append = " systemd" |
11 | VIRTUAL-RUNTIME_init_manager = "systemd" | 11 | VIRTUAL-RUNTIME_init_manager = "systemd" |
12 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" | 12 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" |
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf index bfac90f..13444fd 100644 --- a/conf/distro/poky-sota.conf +++ b/conf/distro/poky-sota.conf | |||
@@ -6,4 +6,4 @@ DISTRO_NAME = "OTA-enabled Linux" | |||
6 | DISTRO_VERSION = "1.0" | 6 | DISTRO_VERSION = "1.0" |
7 | DISTRO_CODENAME = "sota" | 7 | DISTRO_CODENAME = "sota" |
8 | 8 | ||
9 | IMAGE_INSTALL_append_sota = " ostree-booted" | 9 | IMAGE_INSTALL:append:sota = " ostree-booted" |
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 99035de..f84b834 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc | |||
@@ -4,14 +4,14 @@ | |||
4 | # | 4 | # |
5 | # require conf/distro/sota.conf.inc | 5 | # require conf/distro/sota.conf.inc |
6 | 6 | ||
7 | DISTRO_FEATURES_append = " sota usrmerge" | 7 | DISTRO_FEATURES:append = " sota usrmerge" |
8 | DISTRO_FEATURES_NATIVE_append = " sota" | 8 | DISTRO_FEATURES_NATIVE:append = " sota" |
9 | INHERIT += " sota" | 9 | INHERIT += " sota" |
10 | # Prelinking increases the size of downloads and causes build errors | 10 | # Prelinking increases the size of downloads and causes build errors |
11 | USER_CLASSES_remove = "image-prelink" | 11 | USER_CLASSES:remove = "image-prelink" |
12 | 12 | ||
13 | # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. | 13 | # Enable reproducible builds. Use 0 as mtime, the same as OSTree is using. |
14 | INHERIT_remove = "reproducible_build" | 14 | INHERIT:remove = "reproducible_build" |
15 | INHERIT += "reproducible_build_simple" | 15 | INHERIT += "reproducible_build_simple" |
16 | 16 | ||
17 | export SOURCE_DATE_EPOCH = "0" | 17 | export SOURCE_DATE_EPOCH = "0" |
diff --git a/conf/layer.conf b/conf/layer.conf index bce1439..672fed8 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -6,13 +6,13 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ | |||
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "sota" | 8 | BBFILE_COLLECTIONS += "sota" |
9 | BBFILE_PATTERN_sota = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN:sota = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_sota = "7" | 10 | BBFILE_PRIORITY:sota = "7" |
11 | 11 | ||
12 | LAYERDEPENDS_sota = "openembedded-layer" | 12 | LAYERDEPENDS:sota = "openembedded-layer" |
13 | LAYERDEPENDS_sota += "meta-python" | 13 | LAYERDEPENDS:sota += "meta-python" |
14 | LAYERDEPENDS_sota += "filesystems-layer" | 14 | LAYERDEPENDS:sota += "filesystems-layer" |
15 | LAYERSERIES_COMPAT_sota = "dunfell gatesgarth hardknott" | 15 | LAYERSERIES_COMPAT:sota = "dunfell gatesgarth hardknott" |
16 | 16 | ||
17 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | 17 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ |
18 | aktualizr-device-prov->aktualizr \ | 18 | aktualizr-device-prov->aktualizr \ |
diff --git a/conf/local.conf.nonostree.append b/conf/local.conf.nonostree.append index ee56b69..5d0d065 100644 --- a/conf/local.conf.nonostree.append +++ b/conf/local.conf.nonostree.append | |||
@@ -1,11 +1,11 @@ | |||
1 | 1 | ||
2 | DISTRO_FEATURES_append = " systemd" | 2 | DISTRO_FEATURES:append = " systemd" |
3 | VIRTUAL-RUNTIME_init_manager = "systemd" | 3 | VIRTUAL-RUNTIME_init_manager = "systemd" |
4 | 4 | ||
5 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" | 5 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" |
6 | 6 | ||
7 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" |
8 | PACKAGECONFIG_pn-aktualizr = "" | 8 | PACKAGECONFIG:pn-aktualizr = "" |
9 | 9 | ||
10 | IMAGE_INSTALL_append += "aktualizr" | 10 | IMAGE_INSTALL:append += "aktualizr" |
11 | IMAGE_INSTALL_append += "aktualizr-shared-prov" | 11 | IMAGE_INSTALL:append += "aktualizr-shared-prov" |
diff --git a/conf/local.conf.systemd.append b/conf/local.conf.systemd.append index 12e0182..be2e281 100644 --- a/conf/local.conf.systemd.append +++ b/conf/local.conf.systemd.append | |||
@@ -3,7 +3,7 @@ | |||
3 | # It greatly helps diagnosing issues on testing devices but should be | 3 | # It greatly helps diagnosing issues on testing devices but should be |
4 | # carefully weighted against file system usage and flash device wear for | 4 | # carefully weighted against file system usage and flash device wear for |
5 | # production systems. Please refer to systemd's docs for more details | 5 | # production systems. Please refer to systemd's docs for more details |
6 | IMAGE_INSTALL_append += " systemd-journald-persistent" | 6 | IMAGE_INSTALL:append += " systemd-journald-persistent" |
7 | 7 | ||
8 | # Set resource limits for aktualizr service | 8 | # Set resource limits for aktualizr service |
9 | # | 9 | # |
@@ -12,4 +12,4 @@ IMAGE_INSTALL_append += " systemd-journald-persistent" | |||
12 | #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" | 12 | #RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" |
13 | #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" | 13 | #RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" |
14 | #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" | 14 | #RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" |
15 | IMAGE_INSTALL_append += " aktualizr-resource-control" | 15 | IMAGE_INSTALL:append += " aktualizr-resource-control" |
diff --git a/lib/oeqa/selftest/cases/updater_native.py b/lib/oeqa/selftest/cases/updater_native.py index d2bf341..a60d22f 100644 --- a/lib/oeqa/selftest/cases/updater_native.py +++ b/lib/oeqa/selftest/cases/updater_native.py | |||
@@ -28,7 +28,7 @@ class SotaToolsTests(OESelftestTestCase): | |||
28 | 28 | ||
29 | class GeneralTests(OESelftestTestCase): | 29 | class GeneralTests(OESelftestTestCase): |
30 | 30 | ||
31 | def test_feature_sota(self): | 31 | def test_feature:sota(self): |
32 | result = get_bb_var('DISTRO_FEATURES').find('sota') | 32 | result = get_bb_var('DISTRO_FEATURES').find('sota') |
33 | self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') | 33 | self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') |
34 | 34 | ||
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index c7d0448..b074269 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py | |||
@@ -84,7 +84,7 @@ class SharedCredProvTests(OESelftestTestCase): | |||
84 | self.meta_qemu = None | 84 | self.meta_qemu = None |
85 | self.append_config('MACHINE = "qemux86-64"') | 85 | self.append_config('MACHINE = "qemux86-64"') |
86 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 86 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
87 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 87 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
88 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') | 88 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') |
89 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 89 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
90 | 90 | ||
@@ -124,16 +124,16 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests): | |||
124 | self.meta_qemu = None | 124 | self.meta_qemu = None |
125 | self.append_config('MACHINE = "qemux86-64"') | 125 | self.append_config('MACHINE = "qemux86-64"') |
126 | self.append_config('SOTA_CLIENT_PROV = ""') | 126 | self.append_config('SOTA_CLIENT_PROV = ""') |
127 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 127 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
128 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') | 128 | self.append_config('SOTA_HARDWARE_ID = "plain_reibekuchen_314"') |
129 | 129 | ||
130 | self.append_config('DISTRO = "poky"') | 130 | self.append_config('DISTRO = "poky"') |
131 | self.append_config('DISTRO_FEATURES_append = " systemd"') | 131 | self.append_config('DISTRO_FEATURES:append = " systemd"') |
132 | self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') | 132 | self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') |
133 | self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') | 133 | self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') |
134 | self.append_config('PACKAGECONFIG_pn-aktualizr = ""') | 134 | self.append_config('PACKAGECONFIG:pn-aktualizr = ""') |
135 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') | 135 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') |
136 | self.append_config('IMAGE_INSTALL_append += "aktualizr aktualizr-info aktualizr-shared-prov"') | 136 | self.append_config('IMAGE_INSTALL:append += "aktualizr aktualizr-info aktualizr-shared-prov"') |
137 | self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no') | 137 | self.qemu, self.s = qemu_launch(machine='qemux86-64', uboot_enable='no') |
138 | 138 | ||
139 | 139 | ||
@@ -149,8 +149,8 @@ class ManualControlTests(OESelftestTestCase): | |||
149 | self.meta_qemu = None | 149 | self.meta_qemu = None |
150 | self.append_config('MACHINE = "qemux86-64"') | 150 | self.append_config('MACHINE = "qemux86-64"') |
151 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 151 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
152 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') | 152 | self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"') |
153 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 153 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
154 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 154 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
155 | 155 | ||
156 | def tearDownLocal(self): | 156 | def tearDownLocal(self): |
@@ -190,7 +190,7 @@ class DeviceCredProvTests(OESelftestTestCase): | |||
190 | self.append_config('MACHINE = "qemux86-64"') | 190 | self.append_config('MACHINE = "qemux86-64"') |
191 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') | 191 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-device-prov "') |
192 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 192 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
193 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 193 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
194 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 194 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
195 | bitbake('build-sysroots -c build_native_sysroot') | 195 | bitbake('build-sysroots -c build_native_sysroot') |
196 | 196 | ||
@@ -243,8 +243,8 @@ class DeviceCredProvHsmTests(OESelftestTestCase): | |||
243 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"') | 243 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-device-prov-hsm"') |
244 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') | 244 | self.append_config('SOTA_DEPLOY_CREDENTIALS = "0"') |
245 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') | 245 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') |
246 | self.append_config('IMAGE_INSTALL_append = " softhsm-testtoken"') | 246 | self.append_config('IMAGE_INSTALL:append = " softhsm-testtoken"') |
247 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 247 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
248 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 248 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
249 | bitbake('build-sysroots -c build_native_sysroot') | 249 | bitbake('build-sysroots -c build_native_sysroot') |
250 | 250 | ||
@@ -407,7 +407,7 @@ class IpSecondaryTests(OESelftestTestCase): | |||
407 | else: | 407 | else: |
408 | self.meta_qemu = None | 408 | self.meta_qemu = None |
409 | 409 | ||
410 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 410 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
411 | self.primary = IpSecondaryTests.Primary(self) | 411 | self.primary = IpSecondaryTests.Primary(self) |
412 | self.secondary = IpSecondaryTests.Secondary(self) | 412 | self.secondary = IpSecondaryTests.Secondary(self) |
413 | 413 | ||
@@ -451,11 +451,11 @@ class ResourceControlTests(OESelftestTestCase): | |||
451 | self.meta_qemu = None | 451 | self.meta_qemu = None |
452 | self.append_config('MACHINE = "qemux86-64"') | 452 | self.append_config('MACHINE = "qemux86-64"') |
453 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 453 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
454 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 454 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
455 | self.append_config('IMAGE_INSTALL_append += " aktualizr-resource-control "') | 455 | self.append_config('IMAGE_INSTALL:append += " aktualizr-resource-control "') |
456 | self.append_config('RESOURCE_CPU_WEIGHT_pn-aktualizr = "1000"') | 456 | self.append_config('RESOURCE_CPU_WEIGHT:pn-aktualizr = "1000"') |
457 | self.append_config('RESOURCE_MEMORY_HIGH_pn-aktualizr = "50M"') | 457 | self.append_config('RESOURCE_MEMORY_HIGH:pn-aktualizr = "50M"') |
458 | self.append_config('RESOURCE_MEMORY_MAX_pn-aktualizr = "1M"') | 458 | self.append_config('RESOURCE_MEMORY_MAX:pn-aktualizr = "1M"') |
459 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 459 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
460 | 460 | ||
461 | def tearDownLocal(self): | 461 | def tearDownLocal(self): |
@@ -502,9 +502,9 @@ class NonSystemdTests(OESelftestTestCase): | |||
502 | self.meta_qemu = None | 502 | self.meta_qemu = None |
503 | self.append_config('MACHINE = "qemux86-64"') | 503 | self.append_config('MACHINE = "qemux86-64"') |
504 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') | 504 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-shared-prov "') |
505 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 505 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
506 | self.append_config('DISTRO = "poky-sota"') | 506 | self.append_config('DISTRO = "poky-sota"') |
507 | self.append_config('IMAGE_INSTALL_remove += " aktualizr-resource-control"') | 507 | self.append_config('IMAGE_INSTALL:remove += " aktualizr-resource-control"') |
508 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 508 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
509 | 509 | ||
510 | def tearDownLocal(self): | 510 | def tearDownLocal(self): |
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index d20a9f0..8c7eb53 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | |||
@@ -17,10 +17,10 @@ class PtestTests(OESelftestTestCase): | |||
17 | else: | 17 | else: |
18 | self.meta_qemu = None | 18 | self.meta_qemu = None |
19 | self.append_config('MACHINE = "qemux86-64"') | 19 | self.append_config('MACHINE = "qemux86-64"') |
20 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') | 20 | self.append_config('SYSTEMD_AUTO_ENABLE:aktualizr = "disable"') |
21 | self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') | 21 | self.append_config('PTEST_ENABLED:pn-aktualizr = "1"') |
22 | self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') | 22 | self.append_config('IMAGE_INSTALL:append += "aktualizr-ptest ptest-runner "') |
23 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') | 23 | self.append_config('IMAGE_FSTYPES:remove = "ostreepush garagesign garagecheck"') |
24 | self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M") | 24 | self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="768M") |
25 | 25 | ||
26 | def tearDownLocal(self): | 26 | def tearDownLocal(self): |
diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py index fae631e..5534ee9 100644 --- a/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py | |||
@@ -15,16 +15,16 @@ class RpiTests(OESelftestTestCase): | |||
15 | def setUpLocal(self): | 15 | def setUpLocal(self): |
16 | # Add layers before changing the machine type, otherwise the sanity | 16 | # Add layers before changing the machine type, otherwise the sanity |
17 | # checker complains loudly. | 17 | # checker complains loudly. |
18 | layer_rpi = "meta-raspberrypi" | 18 | layer:rpi = "meta-raspberrypi" |
19 | layer_upd_rpi = "meta-updater-raspberrypi" | 19 | layer_upd:rpi = "meta-updater-raspberrypi" |
20 | result = runCmd('bitbake-layers show-layers') | 20 | result = runCmd('bitbake-layers show-layers') |
21 | if re.search(layer_rpi, result.output) is None: | 21 | if re.search(layer_rpi, result.output) is None: |
22 | self.meta_rpi = metadir() + layer_rpi | 22 | self.meta_rpi = metadir() + layer:rpi |
23 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 23 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
24 | else: | 24 | else: |
25 | self.meta_rpi = None | 25 | self.meta_rpi = None |
26 | if re.search(layer_upd_rpi, result.output) is None: | 26 | if re.search(layer_upd_rpi, result.output) is None: |
27 | self.meta_upd_rpi = metadir() + layer_upd_rpi | 27 | self.meta_upd_rpi = metadir() + layer_upd:rpi |
28 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) | 28 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) |
29 | else: | 29 | else: |
30 | self.meta_upd_rpi = None | 30 | self.meta_upd_rpi = None |
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index cd1b95d..cde4849 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend | |||
@@ -1 +1 @@ | |||
RPROVIDES_${PN} += "network-configuration" | RPROVIDES:${PN} += "network-configuration" | ||
diff --git a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb index 8eb81b1..fd84fc2 100644 --- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
6 | 6 | ||
7 | inherit systemd features_check | 7 | inherit systemd features_check |
8 | 8 | ||
9 | RPROVIDES_${PN} = "network-configuration" | 9 | RPROVIDES:${PN} = "network-configuration" |
10 | 10 | ||
11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
12 | file://20-wired-dhcp.network \ | 12 | file://20-wired-dhcp.network \ |
@@ -16,19 +16,19 @@ SRC_URI = " \ | |||
16 | PR = "r1" | 16 | PR = "r1" |
17 | 17 | ||
18 | REQUIRED_DISTRO_FEATURES = "systemd" | 18 | REQUIRED_DISTRO_FEATURES = "systemd" |
19 | RCONFLICTS_${PN} = "connman" | 19 | RCONFLICTS:${PN} = "connman" |
20 | 20 | ||
21 | S = "${WORKDIR}" | 21 | S = "${WORKDIR}" |
22 | 22 | ||
23 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 23 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
24 | 24 | ||
25 | FILES_${PN} = " \ | 25 | FILES:${PN} = " \ |
26 | ${systemd_unitdir}/network/* \ | 26 | ${systemd_unitdir}/network/* \ |
27 | ${sbindir}/resolvconf-clean \ | 27 | ${sbindir}/resolvconf-clean \ |
28 | ${systemd_unitdir}/system/clean-connman-symlink.service \ | 28 | ${systemd_unitdir}/system/clean-connman-symlink.service \ |
29 | " | 29 | " |
30 | 30 | ||
31 | SYSTEMD_SERVICE_${PN} = "clean-connman-symlink.service" | 31 | SYSTEMD_SERVICE:${PN} = "clean-connman-symlink.service" |
32 | 32 | ||
33 | DEV_MATCH_DIRECTIVE ?= "Name=en*" | 33 | DEV_MATCH_DIRECTIVE ?= "Name=en*" |
34 | 34 | ||
diff --git a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend index 7cce775..cb06579 100644 --- a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend +++ b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend | |||
@@ -1,12 +1,12 @@ | |||
1 | FILESEXTRAPATHS_prepend_sota := "${THISDIR}/${BPN}:" | 1 | FILESEXTRAPATHS:prepend:sota := "${THISDIR}/${BPN}:" |
2 | 2 | ||
3 | SRC_URI_append_sota = " file://nfs-home-mount.service" | 3 | SRC_URI:append:sota = " file://nfs-home-mount.service" |
4 | 4 | ||
5 | SYSTEMD_SERVICE_${PN}_append_sota = " nfs-home-mount.service" | 5 | SYSTEMD_SERVICE:${PN}:append:sota = " nfs-home-mount.service" |
6 | 6 | ||
7 | CONFFILES_${PN}-client_append_sota = " ${localstatedir}/local/lib" | 7 | CONFFILES:${PN}-client:append:sota = " ${localstatedir}/local/lib" |
8 | 8 | ||
9 | do_install_append_sota () { | 9 | do_install:append:sota () { |
10 | install -d ${D}${localstatedir}/local | 10 | install -d ${D}${localstatedir}/local |
11 | cp -aPR ${D}${localstatedir}/lib ${D}${localstatedir}/local | 11 | cp -aPR ${D}${localstatedir}/lib ${D}${localstatedir}/local |
12 | 12 | ||
diff --git a/recipes-connectivity/zabbix/zabbix_%.bbappend b/recipes-connectivity/zabbix/zabbix_%.bbappend index c6a69b5..c33094f 100644 --- a/recipes-connectivity/zabbix/zabbix_%.bbappend +++ b/recipes-connectivity/zabbix/zabbix_%.bbappend | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | do_install_append() { | 2 | do_install:append() { |
3 | 3 | ||
4 | # Set the zabbix Server | 4 | # Set the zabbix Server |
5 | if [ ! -z ${SOTA_COMM_CONF_ZABBIX_SERVER} ]; then | 5 | if [ ! -z ${SOTA_COMM_CONF_ZABBIX_SERVER} ]; then |
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb index 4af1548..cba737d 100644 --- a/recipes-core/images/initramfs-ostree-image.bb +++ b/recipes-core/images/initramfs-ostree-image.bb | |||
@@ -13,7 +13,7 @@ IMAGE_LINGUAS = "" | |||
13 | 13 | ||
14 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
15 | 15 | ||
16 | IMAGE_CLASSES_remove = "image_repo_manifest qemuboot" | 16 | IMAGE_CLASSES:remove = "image_repo_manifest qemuboot" |
17 | 17 | ||
18 | IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" | 18 | IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" |
19 | 19 | ||
diff --git a/recipes-devtools/valgrind/valgrind_%.bbappend b/recipes-devtools/valgrind/valgrind_%.bbappend index c5f7c31..3c23e3d 100644 --- a/recipes-devtools/valgrind/valgrind_%.bbappend +++ b/recipes-devtools/valgrind/valgrind_%.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | # from https://bugs.kde.org/show_bug.cgi?id=344802 (John Reiser) | 3 | # from https://bugs.kde.org/show_bug.cgi?id=344802 (John Reiser) |
4 | SRC_URI += "file://bug344802-unhandled-0xec510f1e.patch" | 4 | SRC_URI += "file://bug344802-unhandled-0xec510f1e.patch" |
diff --git a/recipes-extended/collectd/collectd_%.bbappend b/recipes-extended/collectd/collectd_%.bbappend index fb3e6c4..8e2ee24 100644 --- a/recipes-extended/collectd/collectd_%.bbappend +++ b/recipes-extended/collectd/collectd_%.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | do_install_append() { | 1 | do_install:append() { |
2 | printf "<Include \"${sysconfdir}/collectd.conf.d\">\nFilter \"*.conf\"\n</Include>\n" >> ${D}/${sysconfdir}/collectd.conf | 2 | printf "<Include \"${sysconfdir}/collectd.conf.d\">\nFilter \"*.conf\"\n</Include>\n" >> ${D}/${sysconfdir}/collectd.conf |
3 | 3 | ||
4 | install -d ${D}/${sysconfdir}/collectd.conf.d | 4 | install -d ${D}/${sysconfdir}/collectd.conf.d |
diff --git a/recipes-extended/ostree/ostree_%.bbappend b/recipes-extended/ostree/ostree_%.bbappend index fd1795f..6714d12 100644 --- a/recipes-extended/ostree/ostree_%.bbappend +++ b/recipes-extended/ostree/ostree_%.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | PACKAGECONFIG_append = " curl libarchive static builtin-grub2-mkconfig" | 1 | PACKAGECONFIG:append = " curl libarchive static builtin-grub2-mkconfig" |
2 | PACKAGECONFIG_class-native_append = " curl" | 2 | PACKAGECONFIG:class-native:append = " curl" |
3 | PACKAGECONFIG_remove = "soup" | 3 | PACKAGECONFIG:remove = "soup" |
4 | PACKAGECONFIG_class-native_remove = "soup" | 4 | PACKAGECONFIG:class-native:remove = "soup" |
diff --git a/recipes-sota/aktualizr/aktualizr-collectd.bb b/recipes-sota/aktualizr/aktualizr-collectd.bb index c1fc717..5fd81d9 100644 --- a/recipes-sota/aktualizr/aktualizr-collectd.bb +++ b/recipes-sota/aktualizr/aktualizr-collectd.bb | |||
@@ -4,7 +4,7 @@ SECTION = "base" | |||
4 | LICENSE = "MPL-2.0" | 4 | LICENSE = "MPL-2.0" |
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | 5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" |
6 | 6 | ||
7 | RDEPENDS_${PN} = "collectd" | 7 | RDEPENDS:${PN} = "collectd" |
8 | 8 | ||
9 | SRC_URI = " file://aktualizr-collectd.conf" | 9 | SRC_URI = " file://aktualizr-collectd.conf" |
10 | 10 | ||
@@ -15,7 +15,7 @@ do_install() { | |||
15 | install -m 0644 ${WORKDIR}/aktualizr-collectd.conf ${D}${sysconfdir}/collectd.conf.d/aktualizr.conf | 15 | install -m 0644 ${WORKDIR}/aktualizr-collectd.conf ${D}${sysconfdir}/collectd.conf.d/aktualizr.conf |
16 | } | 16 | } |
17 | 17 | ||
18 | FILES_${PN} = " \ | 18 | FILES:${PN} = " \ |
19 | ${sysconfdir}/collectd.conf.d \ | 19 | ${sysconfdir}/collectd.conf.d \ |
20 | ${sysconfdir}/collectd.conf.d/aktualizr.conf \ | 20 | ${sysconfdir}/collectd.conf.d/aktualizr.conf \ |
21 | " | 21 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb index 7239bfd..28b4598 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | |||
@@ -24,7 +24,7 @@ do_install() { | |||
24 | ${D}${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml | 24 | ${D}${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml |
25 | } | 25 | } |
26 | 26 | ||
27 | FILES_${PN} = " \ | 27 | FILES:${PN} = " \ |
28 | ${libdir}/sota/conf.d \ | 28 | ${libdir}/sota/conf.d \ |
29 | ${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml \ | 29 | ${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml \ |
30 | " | 30 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb index 391b098..99379ab 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb | |||
@@ -24,7 +24,7 @@ do_install() { | |||
24 | ${D}${libdir}/sota/conf.d/20-sota-device-cred.toml | 24 | ${D}${libdir}/sota/conf.d/20-sota-device-cred.toml |
25 | } | 25 | } |
26 | 26 | ||
27 | FILES_${PN} = " \ | 27 | FILES:${PN} = " \ |
28 | ${libdir}/sota/conf.d \ | 28 | ${libdir}/sota/conf.d \ |
29 | ${libdir}/sota/conf.d/20-sota-device-cred.toml \ | 29 | ${libdir}/sota/conf.d/20-sota-device-cred.toml \ |
30 | " | 30 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-hwid.bb b/recipes-sota/aktualizr/aktualizr-hwid.bb index fd3e395..4ceb776 100644 --- a/recipes-sota/aktualizr/aktualizr-hwid.bb +++ b/recipes-sota/aktualizr/aktualizr-hwid.bb | |||
@@ -16,7 +16,7 @@ do_install() { | |||
16 | fi | 16 | fi |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES_${PN} = " \ | 19 | FILES:${PN} = " \ |
20 | ${libdir}/sota/conf.d \ | 20 | ${libdir}/sota/conf.d \ |
21 | ${libdir}/sota/conf.d/40-hardware-id.toml \ | 21 | ${libdir}/sota/conf.d/40-hardware-id.toml \ |
22 | " | 22 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb index 9c6f0dd..90a0a2b 100644 --- a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
7 | inherit allarch | 7 | inherit allarch |
8 | 8 | ||
9 | DEPENDS = "zip-native" | 9 | DEPENDS = "zip-native" |
10 | ALLOW_EMPTY_${PN} = "1" | 10 | ALLOW_EMPTY:${PN} = "1" |
11 | 11 | ||
12 | # If the config file from aktualizr used here is changed, you will need to bump | 12 | # If the config file from aktualizr used here is changed, you will need to bump |
13 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! | 13 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! |
@@ -35,7 +35,7 @@ do_install() { | |||
35 | fi | 35 | fi |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN} = " \ | 38 | FILES:${PN} = " \ |
39 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ | 39 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ |
40 | " | 40 | " |
41 | 41 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb index 0c54f32..ad4de5a 100644 --- a/recipes-sota/aktualizr/aktualizr-shared-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb | |||
@@ -10,7 +10,7 @@ inherit allarch | |||
10 | # We need to get the config files from the aktualizr-configs package built by | 10 | # We need to get the config files from the aktualizr-configs package built by |
11 | # the aktualizr (target) recipe. | 11 | # the aktualizr (target) recipe. |
12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
13 | RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}" | 13 | RDEPENDS:${PN}:append = "${@' aktualizr-shared-prov-creds' if oe.types.boolean(d.getVar('SOTA_DEPLOY_CREDENTIALS')) else ''}" |
14 | 14 | ||
15 | # If the config file from aktualizr used here is changed, you will need to bump | 15 | # If the config file from aktualizr used here is changed, you will need to bump |
16 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! | 16 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! |
@@ -38,7 +38,7 @@ do_install() { | |||
38 | ${D}${libdir}/sota/conf.d/20-sota-shared-cred.toml | 38 | ${D}${libdir}/sota/conf.d/20-sota-shared-cred.toml |
39 | } | 39 | } |
40 | 40 | ||
41 | FILES_${PN} = " \ | 41 | FILES:${PN} = " \ |
42 | ${libdir}/sota/conf.d \ | 42 | ${libdir}/sota/conf.d \ |
43 | ${libdir}/sota/conf.d/20-sota-shared-cred.toml \ | 43 | ${libdir}/sota/conf.d/20-sota-shared-cred.toml \ |
44 | " | 44 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb index 2895e5c..6d0bd43 100644 --- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb +++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | |||
@@ -20,7 +20,7 @@ do_install() { | |||
20 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-uboot-env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml | 20 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-uboot-env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN} = " \ | 23 | FILES:${PN} = " \ |
24 | ${libdir}/sota/conf.d \ | 24 | ${libdir}/sota/conf.d \ |
25 | ${libdir}/sota/conf.d/30-rollback.toml \ | 25 | ${libdir}/sota/conf.d/30-rollback.toml \ |
26 | " | 26 | " |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index ecfbd2b..47e733c 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -6,12 +6,12 @@ LICENSE = "MPL-2.0" | |||
6 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad" | 6 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad" |
7 | 7 | ||
8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" | 8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" |
9 | DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" | 9 | DEPENDS:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" |
10 | RDEPENDS_${PN}_class-target = "${PN}-hwid lshw" | 10 | RDEPENDS:${PN}:class-target = "${PN}-hwid lshw" |
11 | 11 | ||
12 | RDEPENDS_${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" | 12 | RDEPENDS:${PN}-ptest += "bash cmake curl net-tools python3-core python3-misc python3-modules openssl-bin sqlite3 valgrind" |
13 | 13 | ||
14 | PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" | 14 | PRIVATE_LIBS:${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" |
15 | 15 | ||
16 | PV = "1.0+git${SRCPV}" | 16 | PV = "1.0+git${SRCPV}" |
17 | PR = "7" | 17 | PR = "7" |
@@ -39,12 +39,12 @@ S = "${WORKDIR}/git" | |||
39 | inherit cmake pkgconfig ptest systemd | 39 | inherit cmake pkgconfig ptest systemd |
40 | 40 | ||
41 | # disable ptest by default as it slows down builds quite a lot | 41 | # disable ptest by default as it slows down builds quite a lot |
42 | # can be enabled manually by setting 'PTEST_ENABLED_pn-aktualizr' to '1' in local.conf | 42 | # can be enabled manually by setting 'PTEST_ENABLED:pn-aktualizr' to '1' in local.conf |
43 | PTEST_ENABLED = "0" | 43 | PTEST_ENABLED = "0" |
44 | 44 | ||
45 | SYSTEMD_PACKAGES = "${PN} ${PN}-secondary" | 45 | SYSTEMD_PACKAGES = "${PN} ${PN}-secondary" |
46 | SYSTEMD_SERVICE_${PN} = "aktualizr.service" | 46 | SYSTEMD_SERVICE:${PN} = "aktualizr.service" |
47 | SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.service" | 47 | SYSTEMD_SERVICE:${PN}-secondary = "aktualizr-secondary.service" |
48 | 48 | ||
49 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}" | 49 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}" |
50 | 50 | ||
@@ -52,7 +52,7 @@ GARAGE_SIGN_OPS = "${@ d.expand('-DGARAGE_SIGN_ARCHIVE=${WORKDIR}/cli-${GARAGE_S | |||
52 | PKCS11_ENGINE_PATH = "${libdir}/engines-1.1/pkcs11.so" | 52 | PKCS11_ENGINE_PATH = "${libdir}/engines-1.1/pkcs11.so" |
53 | 53 | ||
54 | PACKAGECONFIG ?= "ostree ${@bb.utils.filter('SOTA_CLIENT_FEATURES', 'hsm serialcan ubootenv', d)}" | 54 | PACKAGECONFIG ?= "ostree ${@bb.utils.filter('SOTA_CLIENT_FEATURES', 'hsm serialcan ubootenv', d)}" |
55 | PACKAGECONFIG_class-native = "sota-tools" | 55 | PACKAGECONFIG:class-native = "sota-tools" |
56 | PACKAGECONFIG[warning-as-error] = "-DWARNING_AS_ERROR=ON,-DWARNING_AS_ERROR=OFF," | 56 | PACKAGECONFIG[warning-as-error] = "-DWARNING_AS_ERROR=ON,-DWARNING_AS_ERROR=OFF," |
57 | PACKAGECONFIG[ostree] = "-DBUILD_OSTREE=ON,-DBUILD_OSTREE=OFF,ostree," | 57 | PACKAGECONFIG[ostree] = "-DBUILD_OSTREE=ON,-DBUILD_OSTREE=OFF,ostree," |
58 | PACKAGECONFIG[hsm] = "-DBUILD_P11=ON -DPKCS11_ENGINE_PATH=${PKCS11_ENGINE_PATH},-DBUILD_P11=OFF,libp11," | 58 | PACKAGECONFIG[hsm] = "-DBUILD_P11=ON -DPKCS11_ENGINE_PATH=${PKCS11_ENGINE_PATH},-DBUILD_P11=OFF,libp11," |
@@ -87,7 +87,7 @@ do_install_ptest() { | |||
87 | find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "DartConfiguration.tcl" -or -name "run-valgrind" | xargs sed -e "s|${S}|${PTEST_PATH}/src|g" -e "s|${B}|${PTEST_PATH}/build|g" -e "s|\"--gtest_output[^\"]*\"||g" -i | 87 | find ${D}/${PTEST_PATH}/build -name "*.cmake" -or -name "DartConfiguration.tcl" -or -name "run-valgrind" | xargs sed -e "s|${S}|${PTEST_PATH}/src|g" -e "s|${B}|${PTEST_PATH}/build|g" -e "s|\"--gtest_output[^\"]*\"||g" -i |
88 | } | 88 | } |
89 | 89 | ||
90 | do_install_append () { | 90 | do_install:append () { |
91 | install -d ${D}${libdir}/sota | 91 | install -d ${D}${libdir}/sota |
92 | install -m 0644 ${S}/config/sota-shared-cred.toml ${D}/${libdir}/sota/sota-shared-cred.toml | 92 | install -m 0644 ${S}/config/sota-shared-cred.toml ${D}/${libdir}/sota/sota-shared-cred.toml |
93 | install -m 0644 ${S}/config/sota-device-cred-hsm.toml ${D}/${libdir}/sota/sota-device-cred-hsm.toml | 93 | install -m 0644 ${S}/config/sota-device-cred-hsm.toml ${D}/${libdir}/sota/sota-device-cred-hsm.toml |
@@ -118,7 +118,7 @@ do_install_append () { | |||
118 | ${D}${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf | 118 | ${D}${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf |
119 | } | 119 | } |
120 | 120 | ||
121 | PACKAGESPLITFUNCS_prepend = "split_hosttools_packages " | 121 | PACKAGESPLITFUNCS:prepend = "split_hosttools_packages " |
122 | 122 | ||
123 | python split_hosttools_packages () { | 123 | python split_hosttools_packages () { |
124 | bindir = d.getVar('bindir') | 124 | bindir = d.getVar('bindir') |
@@ -131,43 +131,43 @@ PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" | |||
131 | 131 | ||
132 | PACKAGES =+ "${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" | 132 | PACKAGES =+ "${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" |
133 | 133 | ||
134 | FILES_${PN} = " \ | 134 | FILES:${PN} = " \ |
135 | ${bindir}/aktualizr \ | 135 | ${bindir}/aktualizr \ |
136 | ${systemd_unitdir}/system/aktualizr.service \ | 136 | ${systemd_unitdir}/system/aktualizr.service \ |
137 | " | 137 | " |
138 | 138 | ||
139 | FILES_${PN}-info = " \ | 139 | FILES:${PN}-info = " \ |
140 | ${bindir}/aktualizr-info \ | 140 | ${bindir}/aktualizr-info \ |
141 | " | 141 | " |
142 | 142 | ||
143 | FILES_${PN}-lib = " \ | 143 | FILES:${PN}-lib = " \ |
144 | ${libdir}/libaktualizr.so \ | 144 | ${libdir}/libaktualizr.so \ |
145 | " | 145 | " |
146 | 146 | ||
147 | FILES_${PN}-resource-control = " \ | 147 | FILES:${PN}-resource-control = " \ |
148 | ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \ | 148 | ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \ |
149 | " | 149 | " |
150 | 150 | ||
151 | FILES_${PN}-configs = " \ | 151 | FILES:${PN}-configs = " \ |
152 | ${sysconfdir}/sota/* \ | 152 | ${sysconfdir}/sota/* \ |
153 | ${libdir}/sota/* \ | 153 | ${libdir}/sota/* \ |
154 | " | 154 | " |
155 | 155 | ||
156 | FILES_${PN}-secondary = " \ | 156 | FILES:${PN}-secondary = " \ |
157 | ${bindir}/aktualizr-secondary \ | 157 | ${bindir}/aktualizr-secondary \ |
158 | ${libdir}/sota/sota-secondary.toml \ | 158 | ${libdir}/sota/sota-secondary.toml \ |
159 | ${systemd_unitdir}/system/aktualizr-secondary.service \ | 159 | ${systemd_unitdir}/system/aktualizr-secondary.service \ |
160 | " | 160 | " |
161 | 161 | ||
162 | FILES_${PN}-secondary-lib = " \ | 162 | FILES:${PN}-secondary-lib = " \ |
163 | ${libdir}/libaktualizr_secondary.so \ | 163 | ${libdir}/libaktualizr_secondary.so \ |
164 | " | 164 | " |
165 | 165 | ||
166 | FILES_${PN}-sotatools-lib = " \ | 166 | FILES:${PN}-sotatools-lib = " \ |
167 | ${libdir}/libsota_tools.so \ | 167 | ${libdir}/libsota_tools.so \ |
168 | " | 168 | " |
169 | 169 | ||
170 | FILES_${PN}-dev = " \ | 170 | FILES:${PN}-dev = " \ |
171 | ${includedir}/lib${PN} \ | 171 | ${includedir}/lib${PN} \ |
172 | " | 172 | " |
173 | 173 | ||
diff --git a/recipes-sota/aktualizr/credentials.inc b/recipes-sota/aktualizr/credentials.inc index 7c44257..0fed92e 100644 --- a/recipes-sota/aktualizr/credentials.inc +++ b/recipes-sota/aktualizr/credentials.inc | |||
@@ -1 +1 @@ | |||
SRC_URI_append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}" | SRC_URI:append = "${@('file://' + d.getVar('SOTA_PACKED_CREDENTIALS')) if d.getVar('SOTA_PACKED_CREDENTIALS') else ''}" | ||
diff --git a/recipes-sota/config/aktualizr-auto-reboot.bb b/recipes-sota/config/aktualizr-auto-reboot.bb index f360d9e..6048d92 100644 --- a/recipes-sota/config/aktualizr-auto-reboot.bb +++ b/recipes-sota/config/aktualizr-auto-reboot.bb | |||
@@ -11,12 +11,12 @@ SRC_URI = " \ | |||
11 | file://35-enable-auto-reboot.toml \ | 11 | file://35-enable-auto-reboot.toml \ |
12 | " | 12 | " |
13 | 13 | ||
14 | do_install_append () { | 14 | do_install:append () { |
15 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 15 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
16 | install -m 0644 ${WORKDIR}/35-enable-auto-reboot.toml ${D}${libdir}/sota/conf.d/35-enable-auto-reboot.toml | 16 | install -m 0644 ${WORKDIR}/35-enable-auto-reboot.toml ${D}${libdir}/sota/conf.d/35-enable-auto-reboot.toml |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES_${PN} = " \ | 19 | FILES:${PN} = " \ |
20 | ${libdir}/sota/conf.d/35-enable-auto-reboot.toml \ | 20 | ${libdir}/sota/conf.d/35-enable-auto-reboot.toml \ |
21 | " | 21 | " |
22 | 22 | ||
diff --git a/recipes-sota/config/aktualizr-binary-pacman.bb b/recipes-sota/config/aktualizr-binary-pacman.bb index 36bafb3..ec936ae 100644 --- a/recipes-sota/config/aktualizr-binary-pacman.bb +++ b/recipes-sota/config/aktualizr-binary-pacman.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "\ | |||
8 | file://10-pacman.toml \ | 8 | file://10-pacman.toml \ |
9 | " | 9 | " |
10 | 10 | ||
11 | FILES_${PN} = " \ | 11 | FILES:${PN} = " \ |
12 | ${libdir}/sota/conf.d \ | 12 | ${libdir}/sota/conf.d \ |
13 | ${libdir}/sota/conf.d/10-pacman.toml \ | 13 | ${libdir}/sota/conf.d/10-pacman.toml \ |
14 | " | 14 | " |
diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/recipes-sota/config/aktualizr-disable-send-ip.bb index 07c12ca..5df2b34 100644 --- a/recipes-sota/config/aktualizr-disable-send-ip.bb +++ b/recipes-sota/config/aktualizr-disable-send-ip.bb | |||
@@ -11,12 +11,12 @@ SRC_URI = " \ | |||
11 | file://30-disable-send-ip.toml \ | 11 | file://30-disable-send-ip.toml \ |
12 | " | 12 | " |
13 | 13 | ||
14 | do_install_append () { | 14 | do_install:append () { |
15 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 15 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
16 | install -m 0644 ${WORKDIR}/30-disable-send-ip.toml ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml | 16 | install -m 0644 ${WORKDIR}/30-disable-send-ip.toml ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES_${PN} = " \ | 19 | FILES:${PN} = " \ |
20 | ${libdir}/sota/conf.d/30-disable-send-ip.toml \ | 20 | ${libdir}/sota/conf.d/30-disable-send-ip.toml \ |
21 | " | 21 | " |
22 | 22 | ||
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/recipes-sota/config/aktualizr-log-debug.bb index 0c03786..6e2d1f3 100644 --- a/recipes-sota/config/aktualizr-log-debug.bb +++ b/recipes-sota/config/aktualizr-log-debug.bb | |||
@@ -11,12 +11,12 @@ SRC_URI = " \ | |||
11 | file://05-log-debug.toml \ | 11 | file://05-log-debug.toml \ |
12 | " | 12 | " |
13 | 13 | ||
14 | do_install_append () { | 14 | do_install:append () { |
15 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 15 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
16 | install -m 0644 ${WORKDIR}/05-log-debug.toml ${D}${libdir}/sota/conf.d/05-log-debug.toml | 16 | install -m 0644 ${WORKDIR}/05-log-debug.toml ${D}${libdir}/sota/conf.d/05-log-debug.toml |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES_${PN} = " \ | 19 | FILES:${PN} = " \ |
20 | ${libdir}/sota/conf.d/05-log-debug.toml \ | 20 | ${libdir}/sota/conf.d/05-log-debug.toml \ |
21 | " | 21 | " |
22 | 22 | ||
diff --git a/recipes-sota/config/aktualizr-polling-interval.bb b/recipes-sota/config/aktualizr-polling-interval.bb index 53c008a..6ad295d 100644 --- a/recipes-sota/config/aktualizr-polling-interval.bb +++ b/recipes-sota/config/aktualizr-polling-interval.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = " \ | |||
13 | 13 | ||
14 | SOTA_POLLING_SEC ?= "30" | 14 | SOTA_POLLING_SEC ?= "30" |
15 | 15 | ||
16 | do_install_append () { | 16 | do_install:append () { |
17 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 17 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
18 | install -m 0644 ${WORKDIR}/60-polling-interval.toml ${D}${libdir}/sota/conf.d/60-polling-interval.toml | 18 | install -m 0644 ${WORKDIR}/60-polling-interval.toml ${D}${libdir}/sota/conf.d/60-polling-interval.toml |
19 | 19 | ||
@@ -21,7 +21,7 @@ do_install_append () { | |||
21 | ${D}${libdir}/sota/conf.d/60-polling-interval.toml | 21 | ${D}${libdir}/sota/conf.d/60-polling-interval.toml |
22 | } | 22 | } |
23 | 23 | ||
24 | FILES_${PN} = " \ | 24 | FILES:${PN} = " \ |
25 | ${libdir}/sota/conf.d/60-polling-interval.toml \ | 25 | ${libdir}/sota/conf.d/60-polling-interval.toml \ |
26 | " | 26 | " |
27 | 27 | ||
diff --git a/recipes-sota/config/aktualizr-virtualsec.bb b/recipes-sota/config/aktualizr-virtualsec.bb index b7d55aa..f4fded3 100644 --- a/recipes-sota/config/aktualizr-virtualsec.bb +++ b/recipes-sota/config/aktualizr-virtualsec.bb | |||
@@ -12,13 +12,13 @@ SRC_URI = " \ | |||
12 | file://virtualsec.json \ | 12 | file://virtualsec.json \ |
13 | " | 13 | " |
14 | 14 | ||
15 | do_install_append () { | 15 | do_install:append () { |
16 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 16 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
17 | install -m 0644 ${WORKDIR}/30-virtualsec.toml ${D}${libdir}/sota/conf.d/30-virtualsec.toml | 17 | install -m 0644 ${WORKDIR}/30-virtualsec.toml ${D}${libdir}/sota/conf.d/30-virtualsec.toml |
18 | install -m 0644 ${WORKDIR}/virtualsec.json ${D}${libdir}/sota/virtualsec.json | 18 | install -m 0644 ${WORKDIR}/virtualsec.json ${D}${libdir}/sota/virtualsec.json |
19 | } | 19 | } |
20 | 20 | ||
21 | FILES_${PN} = " \ | 21 | FILES:${PN} = " \ |
22 | ${libdir}/sota/conf.d/30-virtualsec.toml \ | 22 | ${libdir}/sota/conf.d/30-virtualsec.toml \ |
23 | ${libdir}/sota/virtualsec.json \ | 23 | ${libdir}/sota/virtualsec.json \ |
24 | " | 24 | " |
diff --git a/recipes-sota/fit-conf/fit-conf.bb b/recipes-sota/fit-conf/fit-conf.bb index f409b9b..b3714f4 100644 --- a/recipes-sota/fit-conf/fit-conf.bb +++ b/recipes-sota/fit-conf/fit-conf.bb | |||
@@ -21,4 +21,4 @@ do_install() { | |||
21 | done | 21 | done |
22 | } | 22 | } |
23 | 23 | ||
24 | FILES_${PN} += "${libdir}/fit_conf" | 24 | FILES:${PN} += "${libdir}/fit_conf" |
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/recipes-sota/ostree-initrd/ostree-initrd.bb index e7bd929..903d9ad 100644 --- a/recipes-sota/ostree-initrd/ostree-initrd.bb +++ b/recipes-sota/ostree-initrd/ostree-initrd.bb | |||
@@ -17,4 +17,4 @@ do_install() { | |||
17 | 17 | ||
18 | inherit allarch | 18 | inherit allarch |
19 | 19 | ||
20 | FILES_${PN} += " /dev /etc/initrd-release /init " | 20 | FILES:${PN} += " /dev /etc/initrd-release /init " |
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb index d711222..1957b8e 100644 --- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb +++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | |||
@@ -9,12 +9,12 @@ inherit module-base kernel-artifact-names | |||
9 | 9 | ||
10 | PACKAGES = "ostree-kernel ostree-initramfs ostree-devicetrees" | 10 | PACKAGES = "ostree-kernel ostree-initramfs ostree-devicetrees" |
11 | 11 | ||
12 | ALLOW_EMPTY_ostree-initramfs = "1" | 12 | ALLOW_EMPTY:ostree-initramfs = "1" |
13 | ALLOW_EMPTY_ostree-devicetrees = "1" | 13 | ALLOW_EMPTY:ostree-devicetrees = "1" |
14 | 14 | ||
15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" | 15 | FILES:ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" |
16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" | 16 | FILES:ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" |
17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ | 17 | FILES:ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ |
18 | ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \ | 18 | ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \ |
19 | " | 19 | " |
20 | 20 | ||
diff --git a/recipes-support/fuse/fuse_%.bbappend b/recipes-support/fuse/fuse_%.bbappend index 85bdf50..fa8f632 100644 --- a/recipes-support/fuse/fuse_%.bbappend +++ b/recipes-support/fuse/fuse_%.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | BBCLASSEXTEND_append_sota = " native" | 1 | BBCLASSEXTEND:append:sota = " native" |
2 | 2 | ||
3 | PACKAGES_append_class-native_sota = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native', ' ', d)}" | 3 | PACKAGES:append:class-native:sota = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native', ' ', d)}" |
diff --git a/recipes-support/slcand-start/slcand-start.bb b/recipes-support/slcand-start/slcand-start.bb index 566507b..5f38c39 100644 --- a/recipes-support/slcand-start/slcand-start.bb +++ b/recipes-support/slcand-start/slcand-start.bb | |||
@@ -4,16 +4,16 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||
7 | RDEPENDS_${PN} = "can-utils" | 7 | RDEPENDS:${PN} = "can-utils" |
8 | 8 | ||
9 | SRC_URI = "file://slcand@.service" | 9 | SRC_URI = "file://slcand@.service" |
10 | 10 | ||
11 | SYSTEMD_SERVICE_${PN} = "slcand@.service" | 11 | SYSTEMD_SERVICE:${PN} = "slcand@.service" |
12 | 12 | ||
13 | do_install() { | 13 | do_install() { |
14 | install -d ${D}${systemd_unitdir}/system | 14 | install -d ${D}${systemd_unitdir}/system |
15 | install -m 0644 ${WORKDIR}/slcand@.service ${D}${systemd_unitdir}/system/slcand@.service | 15 | install -m 0644 ${WORKDIR}/slcand@.service ${D}${systemd_unitdir}/system/slcand@.service |
16 | } | 16 | } |
17 | 17 | ||
18 | FILES_${PN} = "${systemd_unitdir}/system/createtoken.service" | 18 | FILES:${PN} = "${systemd_unitdir}/system/createtoken.service" |
19 | 19 | ||
diff --git a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb index 68514b2..48fa2d1 100644 --- a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb +++ b/recipes-support/softhsm-testtoken/softhsm-testtoken.bb | |||
@@ -4,14 +4,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||
7 | RDEPENDS_${PN} = "softhsm libp11 opensc openssl-bin" | 7 | RDEPENDS:${PN} = "softhsm libp11 opensc openssl-bin" |
8 | DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" | 8 | DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" |
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI = "file://createtoken.service \ | 11 | SRC_URI = "file://createtoken.service \ |
12 | file://createtoken.sh" | 12 | file://createtoken.sh" |
13 | 13 | ||
14 | SYSTEMD_SERVICE_${PN} = "createtoken.service" | 14 | SYSTEMD_SERVICE:${PN} = "createtoken.service" |
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | install -d ${D}${systemd_unitdir}/system | 17 | install -d ${D}${systemd_unitdir}/system |
@@ -20,6 +20,6 @@ do_install() { | |||
20 | install -m 0744 ${WORKDIR}/createtoken.sh ${D}${bindir}/createtoken.sh | 20 | install -m 0744 ${WORKDIR}/createtoken.sh ${D}${bindir}/createtoken.sh |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN} = "${bindir}/createtoken.sh \ | 23 | FILES:${PN} = "${bindir}/createtoken.sh \ |
24 | ${systemd_unitdir}/system/createtoken.service" | 24 | ${systemd_unitdir}/system/createtoken.service" |
25 | 25 | ||
diff --git a/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb index 1715fe1..7f2a3ae 100644 --- a/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb +++ b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb | |||
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
6 | 6 | ||
7 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 7 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
8 | 8 | ||
9 | SRC_URI_append = " file://10-persistent-journal.conf" | 9 | SRC_URI:append = " file://10-persistent-journal.conf" |
10 | PR = "r1" | 10 | PR = "r1" |
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${WORKDIR}" |
13 | 13 | ||
14 | FILES_${PN} = "${systemd_unitdir}/journald.conf.d/*" | 14 | FILES:${PN} = "${systemd_unitdir}/journald.conf.d/*" |
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | install -d ${D}/${systemd_unitdir}/journald.conf.d | 17 | install -d ${D}/${systemd_unitdir}/journald.conf.d |
diff --git a/recipes-test/big-update/big-update_1.0.bb b/recipes-test/big-update/big-update_1.0.bb index dfb3a96..3bfff1f 100644 --- a/recipes-test/big-update/big-update_1.0.bb +++ b/recipes-test/big-update/big-update_1.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MPL-2.0" | |||
3 | 3 | ||
4 | SRC_URI = "file://rand_file.py" | 4 | SRC_URI = "file://rand_file.py" |
5 | 5 | ||
6 | FILES_${PN} = "/usr/lib/big-update" | 6 | FILES:${PN} = "/usr/lib/big-update" |
7 | 7 | ||
8 | DEPENDS = "coreutils-native" | 8 | DEPENDS = "coreutils-native" |
9 | 9 | ||
diff --git a/recipes-test/big-update/big-update_2.0.bb b/recipes-test/big-update/big-update_2.0.bb index 690e62c..d681034 100644 --- a/recipes-test/big-update/big-update_2.0.bb +++ b/recipes-test/big-update/big-update_2.0.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
4 | 4 | ||
5 | SRC_URI = "file://rand_file.py" | 5 | SRC_URI = "file://rand_file.py" |
6 | 6 | ||
7 | FILES_${PN} = "${libdir}/big-update" | 7 | FILES:${PN} = "${libdir}/big-update" |
8 | 8 | ||
9 | DEPENDS = "coreutils-native" | 9 | DEPENDS = "coreutils-native" |
10 | 10 | ||
diff --git a/recipes-test/demo-config/primary-config.bb b/recipes-test/demo-config/primary-config.bb index 5c8abb5..603437a 100644 --- a/recipes-test/demo-config/primary-config.bb +++ b/recipes-test/demo-config/primary-config.bb | |||
@@ -63,7 +63,7 @@ do_install () { | |||
63 | sed -i "s|@CFG_FILEPATH@|$SECONDARY_CONFIG_FILEPATH_ON_IMAGE|g" ${D}${libdir}/sota/conf.d/30-secondary-config.toml | 63 | sed -i "s|@CFG_FILEPATH@|$SECONDARY_CONFIG_FILEPATH_ON_IMAGE|g" ${D}${libdir}/sota/conf.d/30-secondary-config.toml |
64 | } | 64 | } |
65 | 65 | ||
66 | FILES_${PN} = " \ | 66 | FILES:${PN} = " \ |
67 | ${libdir}/sota/conf.d/* \ | 67 | ${libdir}/sota/conf.d/* \ |
68 | ${sysconfdir}/sota/ecus/* \ | 68 | ${sysconfdir}/sota/ecus/* \ |
69 | " | 69 | " |
diff --git a/recipes-test/demo-config/secondary-config.bb b/recipes-test/demo-config/secondary-config.bb index 638f0ae..a0e5d50 100644 --- a/recipes-test/demo-config/secondary-config.bb +++ b/recipes-test/demo-config/secondary-config.bb | |||
@@ -50,7 +50,7 @@ do_install () { | |||
50 | 50 | ||
51 | } | 51 | } |
52 | 52 | ||
53 | FILES_${PN} = " \ | 53 | FILES:${PN} = " \ |
54 | ${libdir}/sota/conf.d \ | 54 | ${libdir}/sota/conf.d \ |
55 | ${libdir}/sota/conf.d/30-pacman-config.toml \ | 55 | ${libdir}/sota/conf.d/30-pacman-config.toml \ |
56 | ${libdir}/sota/conf.d/35-network-config.toml \ | 56 | ${libdir}/sota/conf.d/35-network-config.toml \ |
diff --git a/recipes-test/demo-network-config/network-config.inc b/recipes-test/demo-network-config/network-config.inc index b023f51..919d4ab 100644 --- a/recipes-test/demo-network-config/network-config.inc +++ b/recipes-test/demo-network-config/network-config.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | SRC_URI_append = "\ | 1 | SRC_URI:append = "\ |
2 | file://26-${CONF_TYPE}-client.network \ | 2 | file://26-${CONF_TYPE}-client.network \ |
3 | " | 3 | " |
4 | 4 | ||
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
7 | 7 | ||
8 | SECONDARY_INTERFACE ?= "${@ 'eth0' if d.getVar('MACHINE') == 'raspberrypi3' else 'enp0s5'}" | 8 | SECONDARY_INTERFACE ?= "${@ 'eth0' if d.getVar('MACHINE') == 'raspberrypi3' else 'enp0s5'}" |
9 | 9 | ||
10 | do_install_append() { | 10 | do_install:append() { |
11 | bbnote "Network configuration type to be applied: ${CONF_TYPE}" | 11 | bbnote "Network configuration type to be applied: ${CONF_TYPE}" |
12 | install -d ${D}${libdir}/systemd/network | 12 | install -d ${D}${libdir}/systemd/network |
13 | install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}${libdir}/systemd/network/ | 13 | install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}${libdir}/systemd/network/ |
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb index 7ee873f..253bd48 100644 --- a/recipes-test/demo-network-config/primary-network-config.bb +++ b/recipes-test/demo-network-config/primary-network-config.bb | |||
@@ -6,7 +6,7 @@ SRC_URI = "\ | |||
6 | file://27-dhcp-client-external.network \ | 6 | file://27-dhcp-client-external.network \ |
7 | " | 7 | " |
8 | 8 | ||
9 | FILES_${PN} = "${libdir}/systemd/network" | 9 | FILES:${PN} = "${libdir}/systemd/network" |
10 | 10 | ||
11 | PR = "1" | 11 | PR = "1" |
12 | 12 | ||
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb index b268cd3..a688fdf 100644 --- a/recipes-test/demo-network-config/secondary-network-config.bb +++ b/recipes-test/demo-network-config/secondary-network-config.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "\ | |||
10 | file://27-dhcp-client-external.network \ | 10 | file://27-dhcp-client-external.network \ |
11 | " | 11 | " |
12 | 12 | ||
13 | FILES_${PN} = "${libdir}/systemd/network" | 13 | FILES:${PN} = "${libdir}/systemd/network" |
14 | 14 | ||
15 | PR = "1" | 15 | PR = "1" |
16 | 16 | ||
diff --git a/recipes-test/images/primary-image.bb b/recipes-test/images/primary-image.bb index e6896ea..45cf68c 100644 --- a/recipes-test/images/primary-image.bb +++ b/recipes-test/images/primary-image.bb | |||
@@ -4,11 +4,11 @@ SUMMARY = "A minimal Uptane Primary image running aktualizr, for testing with a | |||
4 | 4 | ||
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
6 | 6 | ||
7 | IMAGE_INSTALL_remove = " \ | 7 | IMAGE_INSTALL:remove = " \ |
8 | network-configuration \ | 8 | network-configuration \ |
9 | " | 9 | " |
10 | 10 | ||
11 | IMAGE_INSTALL_append = " \ | 11 | IMAGE_INSTALL:append = " \ |
12 | primary-network-config \ | 12 | primary-network-config \ |
13 | primary-config \ | 13 | primary-config \ |
14 | " | 14 | " |
diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb index 22fb7f3..95e09cf 100644 --- a/recipes-test/images/secondary-image.bb +++ b/recipes-test/images/secondary-image.bb | |||
@@ -9,7 +9,7 @@ SOTA_HARDWARE_ID ?= "${MACHINE}-sndry" | |||
9 | 9 | ||
10 | # Remove default aktualizr primary, and the provisioning configuration (which | 10 | # Remove default aktualizr primary, and the provisioning configuration (which |
11 | # RDEPENDS on aktualizr) | 11 | # RDEPENDS on aktualizr) |
12 | IMAGE_INSTALL_remove = " \ | 12 | IMAGE_INSTALL:remove = " \ |
13 | aktualizr \ | 13 | aktualizr \ |
14 | aktualizr-shared-prov \ | 14 | aktualizr-shared-prov \ |
15 | aktualizr-shared-prov-creds \ | 15 | aktualizr-shared-prov-creds \ |
@@ -19,7 +19,7 @@ IMAGE_INSTALL_remove = " \ | |||
19 | network-configuration \ | 19 | network-configuration \ |
20 | " | 20 | " |
21 | 21 | ||
22 | IMAGE_INSTALL_append = " \ | 22 | IMAGE_INSTALL:append = " \ |
23 | aktualizr-secondary \ | 23 | aktualizr-secondary \ |
24 | secondary-network-config \ | 24 | secondary-network-config \ |
25 | secondary-config \ | 25 | secondary-config \ |
diff --git a/scripts/ci/configure.sh b/scripts/ci/configure.sh index ae78f06..2dbfa20 100755 --- a/scripts/ci/configure.sh +++ b/scripts/ci/configure.sh | |||
@@ -52,18 +52,18 @@ if [ -n "$TEST_AKTUALIZR_REMOTE" ]; then | |||
52 | if [ -n "$TEST_AKTUALIZR_TAG" ]; then | 52 | if [ -n "$TEST_AKTUALIZR_TAG" ]; then |
53 | # tag case | 53 | # tag case |
54 | cat << EOF >> "$SITE_CONF" | 54 | cat << EOF >> "$SITE_CONF" |
55 | SRCREV_pn-aktualizr = "" | 55 | SRCREV:pn-aktualizr = "" |
56 | SRCREV_pn-aktualizr-native = "" | 56 | SRCREV:pn-aktualizr-native = "" |
57 | BRANCH_pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG" | 57 | BRANCH:pn-aktualizr = ";nobranch=1;tag=$TEST_AKTUALIZR_TAG" |
58 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" | 58 | BRANCH:pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" |
59 | EOF | 59 | EOF |
60 | else | 60 | else |
61 | # branch case | 61 | # branch case |
62 | cat << EOF >> "$SITE_CONF" | 62 | cat << EOF >> "$SITE_CONF" |
63 | SRCREV_pn-aktualizr = "$TEST_AKTUALIZR_REV" | 63 | SRCREV:pn-aktualizr = "$TEST_AKTUALIZR_REV" |
64 | SRCREV_pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" | 64 | SRCREV:pn-aktualizr-native = "\${SRCREV_pn-aktualizr}" |
65 | BRANCH_pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" | 65 | BRANCH:pn-aktualizr = "$TEST_AKTUALIZR_BRANCH" |
66 | BRANCH_pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" | 66 | BRANCH:pn-aktualizr-native = "\${BRANCH_pn-aktualizr}" |
67 | EOF | 67 | EOF |
68 | fi | 68 | fi |
69 | fi | 69 | fi |