diff options
| -rw-r--r-- | conf/layer.conf | 9 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-device-prov-creds.bb | 5 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | 5 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-device-prov.bb | 4 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb | 7 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-shared-prov.bb | 3 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | 5 |
7 files changed, 37 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 145c806..4bc341a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
| @@ -11,3 +11,12 @@ BBFILE_PRIORITY_sota = "7" | |||
| 11 | 11 | ||
| 12 | LAYERDEPENDS_sota = "filesystems-layer" | 12 | LAYERDEPENDS_sota = "filesystems-layer" |
| 13 | LAYERSERIES_COMPAT_sota = "thud warrior zeus" | 13 | LAYERSERIES_COMPAT_sota = "thud warrior zeus" |
| 14 | |||
| 15 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | ||
| 16 | aktualizr-device-prov->aktualizr \ | ||
| 17 | aktualizr-device-prov-creds->aktualizr \ | ||
| 18 | aktualizr-device-prov-hsm->aktualizr \ | ||
| 19 | aktualizr-shared-prov->aktualizr \ | ||
| 20 | aktualizr-shared-prov-creds->aktualizr \ | ||
| 21 | aktualizr-uboot-env-rollback->aktualizr \ | ||
| 22 | " | ||
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb index d8b29b4..a3c7d66 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb | |||
| @@ -15,6 +15,11 @@ inherit allarch | |||
| 15 | DEPENDS = "aktualizr aktualizr-native openssl-native" | 15 | DEPENDS = "aktualizr aktualizr-native openssl-native" |
| 16 | ALLOW_EMPTY_${PN} = "1" | 16 | ALLOW_EMPTY_${PN} = "1" |
| 17 | 17 | ||
| 18 | # If the config file from aktualizr used here is changed, you will need to bump | ||
| 19 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! | ||
| 20 | PV = "1.0" | ||
| 21 | PR = "1" | ||
| 22 | |||
| 18 | SRC_URI = " \ | 23 | SRC_URI = " \ |
| 19 | file://ca.cnf \ | 24 | file://ca.cnf \ |
| 20 | " | 25 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb index e8ef513..8d4bc9c 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | |||
| @@ -12,10 +12,13 @@ inherit allarch | |||
| 12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
| 13 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds softhsm-testtoken' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | 13 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds softhsm-testtoken' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" |
| 14 | 14 | ||
| 15 | SRC_URI = "" | 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 | PV = "1.0" | 17 | PV = "1.0" |
| 17 | PR = "6" | 18 | PR = "6" |
| 18 | 19 | ||
| 20 | SRC_URI = "" | ||
| 21 | |||
| 19 | do_install() { | 22 | do_install() { |
| 20 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 23 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
| 21 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred-hsm.toml \ | 24 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred-hsm.toml \ |
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb index fbe29a1..e8c75bb 100644 --- a/recipes-sota/aktualizr/aktualizr-device-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb | |||
| @@ -12,9 +12,13 @@ inherit allarch | |||
| 12 | DEPENDS = "aktualizr" | 12 | DEPENDS = "aktualizr" |
| 13 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | 13 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" |
| 14 | 14 | ||
| 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! | ||
| 15 | PV = "1.0" | 17 | PV = "1.0" |
| 16 | PR = "1" | 18 | PR = "1" |
| 17 | 19 | ||
| 20 | SRC_URI = "" | ||
| 21 | |||
| 18 | do_install() { | 22 | do_install() { |
| 19 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 23 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
| 20 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred.toml \ | 24 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred.toml \ |
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb index b3b539d..9c6f0dd 100644 --- a/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb | |||
| @@ -9,6 +9,13 @@ inherit allarch | |||
| 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 | ||
| 13 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! | ||
| 14 | PV = "1.0" | ||
| 15 | PR = "1" | ||
| 16 | |||
| 17 | SRC_URI = "" | ||
| 18 | |||
| 12 | require credentials.inc | 19 | require credentials.inc |
| 13 | 20 | ||
| 14 | do_install() { | 21 | do_install() { |
diff --git a/recipes-sota/aktualizr/aktualizr-shared-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb index 00588dc..2ee47a1 100644 --- a/recipes-sota/aktualizr/aktualizr-shared-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb | |||
| @@ -11,6 +11,9 @@ inherit allarch | |||
| 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 d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | 13 | RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" |
| 14 | |||
| 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! | ||
| 14 | PV = "1.0" | 17 | PV = "1.0" |
| 15 | PR = "6" | 18 | PR = "6" |
| 16 | 19 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb index 5a49d16..2895e5c 100644 --- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb +++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | |||
| @@ -8,6 +8,11 @@ inherit allarch | |||
| 8 | 8 | ||
| 9 | DEPENDS = "aktualizr" | 9 | DEPENDS = "aktualizr" |
| 10 | 10 | ||
| 11 | # If the config file from aktualizr used here is changed, you will need to bump | ||
| 12 | # the version here because of SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS! | ||
| 13 | PV = "1.0" | ||
| 14 | PR = "1" | ||
| 15 | |||
| 11 | SRC_URI = "" | 16 | SRC_URI = "" |
| 12 | 17 | ||
| 13 | do_install() { | 18 | do_install() { |
