diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 6 | ||||
-rw-r--r-- | classes/sota.bbclass | 1 | ||||
-rwxr-xr-x | scripts/ci/checkout-oe.sh | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 56d4d76..5301c18 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -229,6 +229,12 @@ IMAGE_CMD_garagesign () { | |||
229 | ${target_url} \ | 229 | ${target_url} \ |
230 | --sha256 ${ostree_target_hash} \ | 230 | --sha256 ${ostree_target_hash} \ |
231 | --hardwareids ${SOTA_HARDWARE_ID} | 231 | --hardwareids ${SOTA_HARDWARE_ID} |
232 | if [ -n "${GARAGE_CUSTOMIZE_TARGET}" ]; then | ||
233 | bbplain "Running command(${GARAGE_CUSTOMIZE_TARGET}) to customize target" | ||
234 | ${GARAGE_CUSTOMIZE_TARGET} \ | ||
235 | ${GARAGE_SIGN_REPO}/tufrepo/roles/unsigned/targets.json \ | ||
236 | ${GARAGE_TARGET_NAME}-${target_version} | ||
237 | fi | ||
232 | garage-sign targets sign --repo tufrepo \ | 238 | garage-sign targets sign --repo tufrepo \ |
233 | --home-dir ${GARAGE_SIGN_REPO} \ | 239 | --home-dir ${GARAGE_SIGN_REPO} \ |
234 | --key-name=targets | 240 | --key-name=targets |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index bf27b6d..94c3043 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -51,6 +51,7 @@ GARAGE_SIGN_KEYNAME ?= "garage-key" | |||
51 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" | 51 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" |
52 | GARAGE_TARGET_VERSION ?= "" | 52 | GARAGE_TARGET_VERSION ?= "" |
53 | GARAGE_TARGET_URL ?= "" | 53 | GARAGE_TARGET_URL ?= "" |
54 | GARAGE_CUSTOMIZE_TARGET ?= "" | ||
54 | 55 | ||
55 | SOTA_MACHINE ??="none" | 56 | SOTA_MACHINE ??="none" |
56 | SOTA_MACHINE_rpi ?= "raspberrypi" | 57 | SOTA_MACHINE_rpi ?= "raspberrypi" |
diff --git a/scripts/ci/checkout-oe.sh b/scripts/ci/checkout-oe.sh index a99f235..523d71c 100755 --- a/scripts/ci/checkout-oe.sh +++ b/scripts/ci/checkout-oe.sh | |||
@@ -45,6 +45,7 @@ for pin in $PIN_LIST; do | |||
45 | IFS=":" | 45 | IFS=":" |
46 | read -r project rev <<< "$pin" | 46 | read -r project rev <<< "$pin" |
47 | xmlstarlet ed --omit-decl -L \ | 47 | xmlstarlet ed --omit-decl -L \ |
48 | -d "/manifest/project[@name=\"$project\"]/@revision" \ | ||
48 | -i "/manifest/project[@name=\"$project\"]/@revision" -t attr -n "revision" -v "$rev" \ | 49 | -i "/manifest/project[@name=\"$project\"]/@revision" -t attr -n "revision" -v "$rev" \ |
49 | -i "/manifest/project[@name=\"$project\"]" -t attr -n "revision" -v "$rev" \ | 50 | -i "/manifest/project[@name=\"$project\"]" -t attr -n "revision" -v "$rev" \ |
50 | "$MANIFEST_FILE" | 51 | "$MANIFEST_FILE" |