mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

kernel-artifact-names, kernel-fitimage: add KERNEL_FIT_BASE_NAME, KERNEL_FIT_SYMLINK_NAME variables

Browse Source 
* use the same naming scheme for fitImage files like all other deployed artifacts
* remove unnecessary cd to DEPLOYDIR
* remove unnecessary cd to B

(From OE-Core rev: fd69f8b2d7dd950cee9e820ef91ea90521c95ace)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2018-08-19 22:15:59 +00:00
committed by Richard Purdie
parent a65c1216d7
commit d0a8532abb
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/kernel-artifact-names.bbclass
+3
View File
@@ -4,6 +4,9 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}"
KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}"
KERNEL_FIT_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
KERNEL_FIT_SYMLINK_NAME ?= "${MACHINE}"
MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
meta/classes/kernel-fitimage.bbclass
+12 -22
View File
@@ -1,4 +1,4 @@
inherit kernel-uboot uboot-sign inherit kernel-uboot kernel-artifact-names uboot-sign
python __anonymous () { python __anonymous () {
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
@@ -488,32 +488,22 @@ kernel_do_deploy[vardepsexclude] = "DATETIME"
kernel_do_deploy_append() { kernel_do_deploy_append() {
# Update deploy directory # Update deploy directory
if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
cd ${B}
echo "Copying fit-image.its source file..." echo "Copying fit-image.its source file..."
its_base_name="fitImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}" install -m 0644 ${B}/fit-image.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_BASE_NAME}.its
its_symlink_name=fitImage-its-${MACHINE} ln -snf fitImage-its-${KERNEL_FIT_BASE_NAME} ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_SYMLINK_NAME}
install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its
linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}" echo "Copying linux.bin file..."
linux_bin_symlink_name=fitImage-linux.bin-${MACHINE} install -m 0644 ${B}/linux.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin
install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin ln -snf fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_SYMLINK_NAME}
if [ -n "${INITRAMFS_IMAGE}" ]; then if [ -n "${INITRAMFS_IMAGE}" ]; then
echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}" install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its
its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE_NAME} ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME}
install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its
fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}"
fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE_NAME}
install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin
fi
cd ${DEPLOYDIR} echo "Copying fitImage-${INITRAMFS_IMAGE} file..."
ln -sf ${its_base_name}.its ${its_symlink_name}.its install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin
ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME}
if [ -n "${INITRAMFS_IMAGE}" ]; then
ln -sf ${its_initramfs_base_name}.its ${its_initramfs_symlink_name}.its
ln -sf ${fit_initramfs_base_name}.bin ${fit_initramfs_symlink_name}.bin
fi fi
fi fi
} }