From f998cc01a868c2d7422679a33ad91284b84f8a1b Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Tue, 18 Sep 2018 10:38:54 +0800
Subject: linux-yocto-efi-secure-boot: rename type variable to imageType

The oe-core commit 8d454ea754c96561257b1cc011fa638ceaa771db renamed type
variable to imageType in kernel.bbclass to avoid confusion with "type"
command in shell. We also do the same thing here.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../linux/linux-yocto-efi-secure-boot.inc          | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'meta-efi-secure-boot')

diff --git a/meta-efi-secure-boot/recipes-kernel/linux/linux-yocto-efi-secure-boot.inc b/meta-efi-secure-boot/recipes-kernel/linux/linux-yocto-efi-secure-boot.inc
index b80f112..27107aa 100644
--- a/meta-efi-secure-boot/recipes-kernel/linux/linux-yocto-efi-secure-boot.inc
+++ b/meta-efi-secure-boot/recipes-kernel/linux/linux-yocto-efi-secure-boot.inc
@@ -72,25 +72,25 @@ addtask sign_bundled_kernel after do_bundle_initramfs before do_deploy
 do_deploy_append() {
     install -d "${DEPLOYDIR}/efi-unsigned"
 
-    for type in ${KERNEL_IMAGETYPES}; do
-        if [ -f "${B}/$type.unsigned" ]; then
-            install -m 0644 "${B}/$type.unsigned" "${DEPLOYDIR}/efi-unsigned/$type"
+    for imageType in ${KERNEL_IMAGETYPES}; do
+        if [ -f "${B}/$imageType.unsigned" ]; then
+            install -m 0644 "${B}/$imageType.unsigned" "${DEPLOYDIR}/efi-unsigned/$imageType"
         fi
 
-        if [ -f "${B}/$type.initramfs.unsigned" ]; then
-            install -m 0644 "${B}/$type.initramfs.unsigned" "${DEPLOYDIR}/efi-unsigned/$type.initramfs"
+        if [ -f "${B}/$imageType.initramfs.unsigned" ]; then
+            install -m 0644 "${B}/$imageType.initramfs.unsigned" "${DEPLOYDIR}/efi-unsigned/$imageType.initramfs"
         fi
 
-        if [ -f "${D}/boot/$type-initramfs-${MACHINE}.bin.p7b" ]; then
-            install -m 0644 "${D}/boot/$type-initramfs-${MACHINE}.bin.p7b" "${DEPLOYDIR}"
+        if [ -f "${D}/boot/$imageType-initramfs-${MACHINE}.bin.p7b" ]; then
+            install -m 0644 "${D}/boot/$imageType-initramfs-${MACHINE}.bin.p7b" "${DEPLOYDIR}"
         fi
 
-        if [ -f "${B}/${KERNEL_OUTPUT_DIR}/$type.p7b" ]; then
-            base_name="${type}-${KERNEL_IMAGE_NAME}.bin.p7b"
+        if [ -f "${B}/${KERNEL_OUTPUT_DIR}/$imageType.p7b" ]; then
+            base_name="${imageType}-${KERNEL_IMAGE_NAME}.bin.p7b"
 
-            install -m 0644 "${B}/${KERNEL_OUTPUT_DIR}/$type.p7b" "${DEPLOYDIR}/$base_name"
-            ln -sf "$base_name" "${DEPLOYDIR}/$type-${KERNEL_IMAGE_LINK_NAME}.bin.p7b"
-            ln -sf "$base_name" "${DEPLOYDIR}/$type.p7b"
+            install -m 0644 "${B}/${KERNEL_OUTPUT_DIR}/$imageType.p7b" "${DEPLOYDIR}/$base_name"
+            ln -sf "$base_name" "${DEPLOYDIR}/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin.p7b"
+            ln -sf "$base_name" "${DEPLOYDIR}/$imageType.p7b"
         fi
     done
 }
-- 
cgit v1.2.3-54-g00ecf