From 378135b9c688f590ddf10fab61d64f6070c03591 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Thu, 20 Oct 2022 09:58:18 +0200 Subject: [PATCH] dualboot: rename firmware-update-dual.sh to update-firmware Use the same name for both firmware update mechanism. Add a dependency to only add recovery-utils used by the non dual-boot firmware update system. Adding this only one binary/script called update-firmware will be added. Signed-off-by: Francisco Gil --- meta-digi-dey/recipes-digi/dualboot/dualboot.bb | 8 ++++---- .../dualboot/{firmware-update-dual.sh => update-firmware} | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename meta-digi-dey/recipes-digi/dualboot/dualboot/{firmware-update-dual.sh => update-firmware} (98%) diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb index 6afd29dab..8cab8bf69 100644 --- a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb +++ b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Digi International Inc. +# Copyright (C) 2021-2022 Digi International Inc. SUMMARY = "Digi Embedded Yocto Dual boot support" SECTION = "base" @@ -14,7 +14,7 @@ DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'virtual/kernel open SRC_URI = " \ file://dualboot-init \ - file://firmware-update-dual.sh \ + file://update-firmware \ file://firmware-update-check.service \ file://on-the-fly-swap-partition.sh \ " @@ -29,7 +29,7 @@ do_install() { ln -sf /etc/dualboot-init ${D}${sysconfdir}/init.d/dualboot-init install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/firmware-update-dual.sh ${D}${bindir} + install -m 0755 ${WORKDIR}/update-firmware ${D}${bindir} install -m 0755 ${WORKDIR}/on-the-fly-swap-partition.sh ${D}${bindir} install -d ${D}${systemd_unitdir}/system/ @@ -64,7 +64,7 @@ do_install() { FILES:${PN} += " \ ${sysconfdir}/dualboot-init \ ${sysconfdir}/init.d/dualboot-init \ - ${bindir}/firmware-update-dual.sh \ + ${bindir}/update-firmware \ ${bindir}/on-the-fly-swap-partition.sh \ ${systemd_unitdir}/system/firmware-update-check.service \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', '${sysconfdir}/ssl/certs/key.pub', '', d)} \ diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot/firmware-update-dual.sh b/meta-digi-dey/recipes-digi/dualboot/dualboot/update-firmware similarity index 98% rename from meta-digi-dey/recipes-digi/dualboot/dualboot/firmware-update-dual.sh rename to meta-digi-dey/recipes-digi/dualboot/dualboot/update-firmware index 5ff8e8b51..d1650644a 100755 --- a/meta-digi-dey/recipes-digi/dualboot/dualboot/firmware-update-dual.sh +++ b/meta-digi-dey/recipes-digi/dualboot/dualboot/update-firmware @@ -1,9 +1,9 @@ #!/bin/sh #=============================================================================== # -# update-firmware-dual.sh +# update-firmware # -# Copyright (C) 2021 by Digi International Inc. +# Copyright (C) 2021-2022 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it