diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2016-10-21 22:07:28 +1000 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-25 03:57:54 +0000 |
| commit | 578589a02c7f8c43b1c57cb7b90d498ae0ed7514 (patch) | |
| tree | cf1e49bb216834b85719513747caa41298015e75 /import-layers | |
| parent | b4a4dc0de8b301a2970d8ad2f79297becec7816e (diff) | |
| download | talos-openbmc-578589a02c7f8c43b1c57cb7b90d498ae0ed7514.tar.gz talos-openbmc-578589a02c7f8c43b1c57cb7b90d498ae0ed7514.zip | |
kernel-fitimage.bbclass: Don't assume KERNEL_IMAGETYPE == fitImage
The name of the output image for a fitImage that contains a ramdisk
should match the same as for the fitImage that does not contain a
ramdisk. As such it should not be assumed that KERNEL_IMAGETYPE is
"fitImage". This change explicitly sets the name of the output
ramdisk/initramfs to start with fitImage as does the non-ramdisk output.
(From OE-Core rev: 81caed2b7071ffc9ed8077d7d76952f2a2a4713d)
Change-Id: I13d03a9c8739df9ddb48cb46d073472c75b7b508
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Rick Altherr <raltherr@google.com>
(cherry picked from commit 4c88512843de6d1e9de6f56efe63d8b27b0957f2)
Diffstat (limited to 'import-layers')
| -rw-r--r-- | import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass b/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass index 3d1f85588..d5d0fce19 100644 --- a/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass +++ b/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass @@ -323,11 +323,11 @@ kernel_do_deploy_append() { if [ -n "${INITRAMFS_IMAGE}" ]; then echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." - its_initramfs_base_name="${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}" - its_initramfs_symlink_name=${KERNEL_IMAGETYPE}-its-${INITRAMFS_IMAGE}-${MACHINE} + its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}" + its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE}-${MACHINE} install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its - fit_initramfs_base_name="${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}" - fit_initramfs_symlink_name=${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE} + fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE}-${PV}-${PR}-${MACHINE}-${DATETIME}" + fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE}-${MACHINE} install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin fi |
