The variable names for devboot follow the names used by global.bootm. This is confusing though as they differ from what's used for boot net.
To make it possible to use the same artifacts with boot net and devboot, rename the artifacts that are looked up: user-image-hostname -> user-linux-hostname user-initrd-hostname -> user-initramfs-hostname Signed-off-by: Ahmad Fatoum <[email protected]> --- Documentation/user/devboot.rst | 4 ++-- defaultenv/defaultenv-2-devboot/devboot/defaults | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/user/devboot.rst b/Documentation/user/devboot.rst index 5872973f5650..54bebb419b43 100644 --- a/Documentation/user/devboot.rst +++ b/Documentation/user/devboot.rst @@ -207,9 +207,9 @@ which the configuration script can source instead of spelling them out: ``/env/devboot/defaults`` Sets ``devboot_image``, ``devboot_oftree`` and ``devboot_initrd`` to - ``${global.user}-image-${global.hostname}``, + ``${global.user}-linux-${global.hostname}``, ``${global.user}-oftree-${global.hostname}`` and - ``${global.user}-initrd-${global.hostname}`` respectively, but only + ``${global.user}-initramfs-${global.hostname}`` respectively, but only for those files that exist in the fetch directory. Symlink the build artifacts under these names into the TFTP directory and the script needs no further configuration. diff --git a/defaultenv/defaultenv-2-devboot/devboot/defaults b/defaultenv/defaultenv-2-devboot/devboot/defaults index 371051143268..b8a087b463b9 100644 --- a/defaultenv/defaultenv-2-devboot/devboot/defaults +++ b/defaultenv/defaultenv-2-devboot/devboot/defaults @@ -1,7 +1,7 @@ -# Use ${global.user}-{image,oftree,initrd}-${global.hostname} from the +# Use ${global.user}-{linux,oftree,initramfs}-${global.hostname} from the # fetch directory as overrides -devboot_default="${global.user}-image-${global.hostname}" +devboot_default="${global.user}-linux-${global.hostname}" if [ -f "${devboot_default}" ]; then devboot_image="${devboot_default}" fi @@ -16,7 +16,7 @@ if [ -f "${devboot_default}" ]; then devboot_oftree="${devboot_oftree}:${devboot_default}" fi -devboot_default="${global.user}-initrd-${global.hostname}" +devboot_default="${global.user}-initramfs-${global.hostname}" if [ -f "${devboot_default}" ]; then devboot_initrd="${devboot_default}" fi -- 2.47.3
