aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2016-09-04 05:37:49 -0700
committerMatt Madison <matt@madison.systems>2016-09-04 06:34:26 -0700
commit589bbe8bffa19cca737d77754bf4ad6c9592d892 (patch)
tree7398c5756ddaade048bef1bf30ba5da701f8197e /recipes-kernel
parent0c2d5f3fb6aa906908c06104c122c68b2bdf0ffc (diff)
downloadmeta-qcom-589bbe8bffa19cca737d77754bf4ad6c9592d892.tar.gz
meta-qcom-589bbe8bffa19cca737d77754bf4ad6c9592d892.tar.bz2
meta-qcom-589bbe8bffa19cca737d77754bf4ad6c9592d892.zip
linux-qcom-bootimg: use KERNEL_IMAGE_BASE_NAME
and KERNEL_IMAGE_SYMLINK_NAME as the base for the deployed dt and boot image names, to reduce redundancy. Signed-off-by: Matt Madison <matt@madison.systems>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-qcom-bootimg.inc19
1 files changed, 7 insertions, 12 deletions
diff --git a/recipes-kernel/linux/linux-qcom-bootimg.inc b/recipes-kernel/linux/linux-qcom-bootimg.inc
index f0ce8fa..2c806bc 100644
--- a/recipes-kernel/linux/linux-qcom-bootimg.inc
+++ b/recipes-kernel/linux/linux-qcom-bootimg.inc
@@ -7,11 +7,10 @@ QCOM_BOOTIMG_ROOTFS_ifc6410 = "mmcblk0p12"
QCOM_BOOTIMG_ROOTFS_sd-600eval = "mmcblk0p12"
# set output file names
-DT_IMAGE_BASE_NAME = "dt-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-DT_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-
-BOOT_IMAGE_BASE_NAME = "boot-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-BOOT_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
+DT_IMAGE_BASE_NAME = "dt-${KERNEL_IMAGE_BASE_NAME}"
+DT_IMAGE_SYMLINK_NAME = "dt-${KERNEL_IMAGE_SYMLINK_NAME}"
+BOOT_IMAGE_BASE_NAME = "boot-${KERNEL_IMAGE_BASE_NAME}"
+BOOT_IMAGE_SYMLINK_NAME = "boot-${KERNEL_IMAGE_SYMLINK_NAME}"
do_deploy_append_aarch64() {
@@ -34,10 +33,8 @@ do_deploy_append_aarch64() {
--cmdline \
"root=/dev/${QCOM_BOOTIMG_ROOTFS} rw rootwait console=${ttydev},${baudrate}n8"
- cd ${DEPLOYDIR}
- ln -sf ${DT_IMAGE_BASE_NAME}.img dt-${MACHINE}.img
- ln -sf ${BOOT_IMAGE_BASE_NAME}.img boot-${MACHINE}.img
- cd -
+ ln -sf ${DT_IMAGE_BASE_NAME}.img ${DEPLOYDIR}/${DT_IMAGE_SYMLINK_NAME}.img
+ ln -sf ${BOOT_IMAGE_BASE_NAME}.img ${DEPLOYDIR}/${BOOT_IMAGE_SYMLINK_NAME}.img
}
do_deploy_append_apq8064 () {
@@ -58,7 +55,5 @@ do_deploy_append_apq8064 () {
--cmdline \
"root=/dev/${QCOM_BOOTIMG_ROOTFS} rw rootwait console=${ttydev},${baudrate}n8"
- cd ${DEPLOYDIR}
- ln -sf ${BOOT_IMAGE_BASE_NAME}.img boot-${MACHINE}.img
- cd -
+ ln -sf ${BOOT_IMAGE_BASE_NAME}.img ${DEPLOYDIR}/${BOOT_IMAGE_SYMLINK_NAME}.img
}