diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 19:56:24 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-08-04 13:24:27 +0200 |
commit | 48389de678da8f059f36c8394d0ed0328e7ddfe5 (patch) | |
tree | b82bc5baa71722a12ebc67b856a896661c447b6e | |
parent | 31a770d3c0cb22c9f4ece068208d2e6b2c28f1ee (diff) | |
download | meta-updater-48389de678da8f059f36c8394d0ed0328e7ddfe5.tar.gz |
Manually fix conversion
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 4 | ||||
-rw-r--r-- | classes/sota.bbclass | 10 | ||||
-rw-r--r-- | conf/layer.conf | 12 |
5 files changed, 16 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc3308f..2fade39 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 5d55cdb..832f945 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -17,7 +17,7 @@ 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}" |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 0bb31de..41c4801 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" | 1 | OTA_SYSROOT = "${WORKDIR}/ota-sysroot" |
2 | TAR_IMAGE_ROOTFS_task-image-ota = "${OTA_SYSROOT}" | 2 | TAR_IMAGE_ROOTFS:task-image-ota = "${OTA_SYSROOT}" |
3 | IMAGE_TYPEDEP_ota = "ostreecommit" | 3 | IMAGE_TYPEDEP_ota = "ostreecommit" |
4 | do_image_ota[dirs] = "${OTA_SYSROOT}" | 4 | do_image_ota[dirs] = "${OTA_SYSROOT}" |
5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" | 5 | do_image_ota[cleandirs] = "${OTA_SYSROOT}" |
@@ -79,7 +79,7 @@ IMAGE_CMD:ota () { | |||
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 |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 32efe5c..9eccdcd 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -47,12 +47,12 @@ 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 | ||
57 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" | 57 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" |
58 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" | 58 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" |
diff --git a/conf/layer.conf b/conf/layer.conf index 672fed8..bce1439 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 \ |