From 08e225b8e66e25003108921c0b05688c7ea6892e Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 8 Jun 2017 17:54:32 +0200 Subject: Set default SOTA_CLIENT directly in sota.bbclass --- classes/sota.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 2761111..dfd3c27 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -5,6 +5,7 @@ python __anonymous() { OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" +SOTA_CLIENT ??= aktualizr IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}" IMAGE_CLASSES += " image_types_ostree image_types_ota" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}" -- cgit v1.2.3-54-g00ecf From 10fce02ac1dc26921532002f9107b33b8f620b76 Mon Sep 17 00:00:00 2001 From: OYTIS Date: Fri, 9 Jun 2017 13:37:45 +0200 Subject: Fix a typo (missing double quotes) --- classes/sota.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sota.bbclass b/classes/sota.bbclass index dfd3c27..a96429c 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -5,7 +5,7 @@ python __anonymous() { OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" -SOTA_CLIENT ??= aktualizr +SOTA_CLIENT ??= "aktualizr" IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}" IMAGE_CLASSES += " image_types_ostree image_types_ota" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}" -- cgit v1.2.3-54-g00ecf From cdd7e90cba4d5b697a296a69df7e08341299f688 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Wed, 7 Jun 2017 13:09:00 +0200 Subject: Add uptane-capable aktualizr --- classes/image_types_ota.bbclass | 2 +- recipes-sota/aktualizr/aktualizr_git.bb | 18 +++++++++++------- .../aktualizr/files/aktualizr-autoprovision.service | 14 ++++++++++++++ recipes-sota/aktualizr/files/sota_autoprov.toml | 18 ++++++++++++++++++ recipes-sota/rvi-sota-client/rvi-sota-client_git.bb | 2 -- recipes-support/python-petname/python-petname.bb | 1 + 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 recipes-sota/aktualizr/files/aktualizr-autoprovision.service create mode 100644 recipes-sota/aktualizr/files/sota_autoprov.toml (limited to 'classes') diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 8108d51..2dd6846 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -92,7 +92,7 @@ IMAGE_CMD_otaimg () { kargs_list="${kargs_list} --karg-append=$arg" done - ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME} + ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_BRANCHNAME} # Copy deployment /home and /var/sota to sysroot HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index fa71af8..62ee9b0 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -5,35 +5,39 @@ SECTION = "base" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" DEPENDS = "boost curl openssl jansson libsodium ostree" -SRCREV = "4e9344ae375a444f02b964dca52fe808010d17df" -PV = "1.0+git${SRCPV}" SRC_URI = " \ git://github.com/advancedtelematic/aktualizr \ file://aktualizr-manual-provision.service \ + file://aktualizr-autoprovision.service \ + file://sota_autoprov.toml \ " +SRCREV = "2e897310c611e2da46f8af888bb62c09b2a2906a" +PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "aktualizr.service" inherit cmake systemd -EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON" +EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" export SOTA_AUTOPROVISION_CREDENTIALS do_install_append() { - if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" ]; then - bbwarn "Aktualizr recipe currently lacks support for SOTA_AUTOPROVISION_CREDENTIALS. No systemd service will be created" + if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service + install -d ${D}/var/sota + install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/var/sota/sota.toml else install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service fi } -RDEPENDS = "" - FILES_${PN} = " \ ${bindir}/aktualizr \ ${systemd_unitdir}/system/aktualizr.service \ + /var/sota/sota.toml \ " diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service new file mode 100644 index 0000000..a5b92e3 --- /dev/null +++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service @@ -0,0 +1,14 @@ +[Unit] +Description=Aktualizr SOTA Client +Wants=network-online.target +After=network.target network-online.target +Requires=network-online.target + +[Service] +RestartSec=10 +Restart=always +EnvironmentFile=/var/sota/sota_provisioning_url.env +ExecStart=/bin/sh -c "/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --primary-ecu-hardware-id `cat /etc/hostname` --config /var/sota/sota.toml" + +[Install] +WantedBy=multi-user.target diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml new file mode 100644 index 0000000..8799553 --- /dev/null +++ b/recipes-sota/aktualizr/files/sota_autoprov.toml @@ -0,0 +1,18 @@ +[device] +packages_dir = "/tmp/packages_dir" +certificates_directory = "/var/sota" +system_info = "system_info.sh" + +[tls] +ca_file = "root.crt" +client_certificate = "client.pem" +pkey_file = "pkey.pem" + +[uptane] +metadata_path = "/var/sota/metadata" +private_key_path = "ecukey.der" +public_key_path = "ecukey.pub" + +[provision] +p12_path = "sota_provisioning_credentials.p12" + diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb index 52edd26..87fa752 100644 --- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb +++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb @@ -30,8 +30,6 @@ FILES_${PN} = " \ ${bindir}/sota_prov.sh \ ${sysconfdir}/sota_client.version \ ${sysconfdir}/sota_certificates \ - /var/sota/sota_provisioning_credentials.p12 \ - /var/sota/sota_provisioning_url.env \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client_autoprovision.service', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client.service', '', d)} \ " diff --git a/recipes-support/python-petname/python-petname.bb b/recipes-support/python-petname/python-petname.bb index b8a7b88..9abd5d9 100644 --- a/recipes-support/python-petname/python-petname.bb +++ b/recipes-support/python-petname/python-petname.bb @@ -13,3 +13,4 @@ RDEPENDS_${PN} = " python-setuptools \ python-argparse \ " +FILES_${PN} = "${libdir} ${bindir}/petname" -- cgit v1.2.3-54-g00ecf From 1c5b56dcd6d21528e67c681d973cae3a13045bb9 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Wed, 21 Jun 2017 17:25:27 +0200 Subject: Preserve /var/local Fixes SPEC-761 in AGL --- classes/image_types_ota.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 2dd6846..09c30ff 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -96,8 +96,9 @@ IMAGE_CMD_otaimg () { # Copy deployment /home and /var/sota to sysroot HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` - tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true - mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true + tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota ./var/local || true + mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true + mv ${HOME_TMP}/var/local ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true # Create /var/sota if it doesn't exist yet mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true -- cgit v1.2.3-54-g00ecf From ae8a5db4668b153baa1b4aaf814f2cdd685e6466 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Wed, 31 May 2017 10:21:56 +0300 Subject: sota: Support m3ulcb Support Renesas R Car Starter Kit Generation 3 (m3ulcb). Signed-off-by: Leon Anavi --- classes/sota.bbclass | 1 + classes/sota_m3ulcb.bbclass | 9 +++++++++ conf/include/bblayers/sota_m3ulcb.inc | 2 ++ 3 files changed, 12 insertions(+) create mode 100644 classes/sota_m3ulcb.bbclass create mode 100644 conf/include/bblayers/sota_m3ulcb.inc (limited to 'classes') diff --git a/classes/sota.bbclass b/classes/sota.bbclass index a96429c..5073e29 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -25,6 +25,7 @@ SOTA_MACHINE ??="none" SOTA_MACHINE_raspberrypi2 ?= "raspberrypi" SOTA_MACHINE_raspberrypi3 ?= "raspberrypi" SOTA_MACHINE_porter ?= "porter" +SOTA_MACHINE_m3ulcb = "m3ulcb" SOTA_MACHINE_intel-corei7-64 ?= "minnowboard" SOTA_MACHINE_qemux86-64 ?= "qemux86-64" SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass new file mode 100644 index 0000000..21d04ba --- /dev/null +++ b/classes/sota_m3ulcb.bbclass @@ -0,0 +1,9 @@ +# Commit united image to OSTree, not just uImage +OSTREE_KERNEL = "Image" + +EXTRA_IMAGEDEPENDS_append_sota = " m3ulcb-ota-bootfiles" +IMAGE_CLASSES_append_sota = " image_types_uboot " +IMAGE_BOOT_FILES_sota += "m3ulcb-ota-bootfiles/*" + +OSTREE_BOOTLOADER ?= "u-boot" +UBOOT_MACHINE_sota = "m3ulcb_defconfig" diff --git a/conf/include/bblayers/sota_m3ulcb.inc b/conf/include/bblayers/sota_m3ulcb.inc new file mode 100644 index 0000000..04f78e4 --- /dev/null +++ b/conf/include/bblayers/sota_m3ulcb.inc @@ -0,0 +1,2 @@ + +BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas-rcar-gen3 ${METADIR}/meta-openembedded/meta-multimedia" -- cgit v1.2.3-54-g00ecf From dc234532add69842295902d35981dba886468da0 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Mon, 26 Jun 2017 15:13:44 +0200 Subject: Aktualizr updates, including sync() Perform sync() after provisioning Store sota.toml in updatable /usr directory --- classes/image_types_ostree.bbclass | 2 +- recipes-sota/aktualizr/aktualizr_git.bb | 9 +++++---- recipes-sota/aktualizr/files/aktualizr-autoprovision.service | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 2a74e51..72d7df5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -203,7 +203,7 @@ IMAGE_CMD_ostree () { IMAGE_TYPEDEP_ostreepush = "ostree" IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot" IMAGE_CMD_ostreepush () { - if [ ${OSTREE_PUSH_CREDENTIALS} ]; then + if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then garage-push --repo=${OSTREE_REPO} \ --ref=${OSTREE_BRANCHNAME} \ --credentials=${OSTREE_PUSH_CREDENTIALS} \ diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 62ee9b0..39a8ac8 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -12,7 +12,7 @@ SRC_URI = " \ file://aktualizr-autoprovision.service \ file://sota_autoprov.toml \ " -SRCREV = "2e897310c611e2da46f8af888bb62c09b2a2906a" +SRCREV = "33614fb9fc8f6c9ab5fae20c16d1dca0a330b07f" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" @@ -23,13 +23,14 @@ inherit cmake systemd EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" export SOTA_AUTOPROVISION_CREDENTIALS +export SOTA_PACKED_CREDENTIALS do_install_append() { if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service - install -d ${D}/var/sota - install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/var/sota/sota.toml + install -d ${D}/usr/lib/sota + install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/usr/lib/sota/sota.toml else install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service @@ -39,5 +40,5 @@ do_install_append() { FILES_${PN} = " \ ${bindir}/aktualizr \ ${systemd_unitdir}/system/aktualizr.service \ - /var/sota/sota.toml \ + /usr/lib/sota/sota.toml \ " diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service index a5b92e3..fd0ab09 100644 --- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service +++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service @@ -8,7 +8,7 @@ Requires=network-online.target RestartSec=10 Restart=always EnvironmentFile=/var/sota/sota_provisioning_url.env -ExecStart=/bin/sh -c "/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --primary-ecu-hardware-id `cat /etc/hostname` --config /var/sota/sota.toml" +ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml [Install] WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From 56aab3b8ee886436621158fbab8744c75262d571 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 29 Jun 2017 15:51:10 +0200 Subject: Remove also compressed rpi-sdimg.xz --- classes/sota_raspberrypi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index b6cf639..9b103ff 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -1,7 +1,7 @@ IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}" -IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg', '', d)}" +IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}" KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" -- cgit v1.2.3-54-g00ecf From 43163f4ccff4b48cbb28e78e9deebb16b4e29ef5 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 29 Jun 2017 15:54:40 +0200 Subject: Disable noisy warnings ... should only print once. --- classes/sota_none.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/sota_none.bbclass b/classes/sota_none.bbclass index 86eaf0b..c11b070 100644 --- a/classes/sota_none.bbclass +++ b/classes/sota_none.bbclass @@ -1,4 +1,4 @@ # null machine it's here to make bitbake happy when SOTA_MACHINE is undefined -python __anonymous() { - bb.warn("SOTA functionality is not yet supported for your machine") -} +#python __anonymous() { +# bb.warn("SOTA functionality is not yet supported for your machine") +#} -- cgit v1.2.3-54-g00ecf From 109b534b60eb63dfeb6a43a594fd96870699170b Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 29 Jun 2017 15:56:48 +0200 Subject: Use compression on output file to save space We could make that a option to the user ... --- classes/sota_raspberrypi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index b6cf639..544537b 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -1,5 +1,5 @@ IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota.xz', 'rpi-sdimg.xz', d)}" IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg', '', d)}" -- cgit v1.2.3-54-g00ecf From 0c35f176862be36bf0f8b91614d97686d7619dd8 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 4 Jul 2017 17:54:07 +0200 Subject: Fix output directory in sdcard_image-rpi-ota --- classes/sdcard_image-rpi-ota.bbclass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass index 9022aaf..81d71e9 100644 --- a/classes/sdcard_image-rpi-ota.bbclass +++ b/classes/sdcard_image-rpi-ota.bbclass @@ -61,7 +61,7 @@ IMAGE_DEPENDS_rpi-sdimg-ota = " \ IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg" # SD card image name -SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" +SDIMG_OTA = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" # Compression method to apply to SDIMG_OTA after it has been created. Supported # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg-ota file @@ -165,9 +165,6 @@ IMAGE_CMD_rpi-sdimg-ota () { dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync fi - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg-ota - ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg-ota - # Optionally apply compression case "${SDIMG_OTA_COMPRESSION}" in "gzip") @@ -180,9 +177,6 @@ IMAGE_CMD_rpi-sdimg-ota () { xz -k "${SDIMG_OTA}" ;; esac - - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota - ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota } ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " -- cgit v1.2.3-54-g00ecf