summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-09-18 10:38:54 +0800
committerJia Zhang <zhang.jia@linux.alibaba.com>2018-09-18 11:11:12 +0800
commitf998cc01a868c2d7422679a33ad91284b84f8a1b (patch)
tree17a610248390b0a792ae21eebc5a600a9ff197fc
parent32037a3aa790730beb857ba57c7904c44aaefe0a (diff)
downloadmeta-secure-core-f998cc01a868c2d7422679a33ad91284b84f8a1b.tar.gz
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>
-rw-r--r--meta-efi-secure-boot/recipes-kernel/linux/linux-yocto-efi-secure-boot.inc24
1 files changed, 12 insertions, 12 deletions
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
72do_deploy_append() { 72do_deploy_append() {
73 install -d "${DEPLOYDIR}/efi-unsigned" 73 install -d "${DEPLOYDIR}/efi-unsigned"
74 74
75 for type in ${KERNEL_IMAGETYPES}; do 75 for imageType in ${KERNEL_IMAGETYPES}; do
76 if [ -f "${B}/$type.unsigned" ]; then 76 if [ -f "${B}/$imageType.unsigned" ]; then
77 install -m 0644 "${B}/$type.unsigned" "${DEPLOYDIR}/efi-unsigned/$type" 77 install -m 0644 "${B}/$imageType.unsigned" "${DEPLOYDIR}/efi-unsigned/$imageType"
78 fi 78 fi
79 79
80 if [ -f "${B}/$type.initramfs.unsigned" ]; then 80 if [ -f "${B}/$imageType.initramfs.unsigned" ]; then
81 install -m 0644 "${B}/$type.initramfs.unsigned" "${DEPLOYDIR}/efi-unsigned/$type.initramfs" 81 install -m 0644 "${B}/$imageType.initramfs.unsigned" "${DEPLOYDIR}/efi-unsigned/$imageType.initramfs"
82 fi 82 fi
83 83
84 if [ -f "${D}/boot/$type-initramfs-${MACHINE}.bin.p7b" ]; then 84 if [ -f "${D}/boot/$imageType-initramfs-${MACHINE}.bin.p7b" ]; then
85 install -m 0644 "${D}/boot/$type-initramfs-${MACHINE}.bin.p7b" "${DEPLOYDIR}" 85 install -m 0644 "${D}/boot/$imageType-initramfs-${MACHINE}.bin.p7b" "${DEPLOYDIR}"
86 fi 86 fi
87 87
88 if [ -f "${B}/${KERNEL_OUTPUT_DIR}/$type.p7b" ]; then 88 if [ -f "${B}/${KERNEL_OUTPUT_DIR}/$imageType.p7b" ]; then
89 base_name="${type}-${KERNEL_IMAGE_NAME}.bin.p7b" 89 base_name="${imageType}-${KERNEL_IMAGE_NAME}.bin.p7b"
90 90
91 install -m 0644 "${B}/${KERNEL_OUTPUT_DIR}/$type.p7b" "${DEPLOYDIR}/$base_name" 91 install -m 0644 "${B}/${KERNEL_OUTPUT_DIR}/$imageType.p7b" "${DEPLOYDIR}/$base_name"
92 ln -sf "$base_name" "${DEPLOYDIR}/$type-${KERNEL_IMAGE_LINK_NAME}.bin.p7b" 92 ln -sf "$base_name" "${DEPLOYDIR}/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin.p7b"
93 ln -sf "$base_name" "${DEPLOYDIR}/$type.p7b" 93 ln -sf "$base_name" "${DEPLOYDIR}/$imageType.p7b"
94 fi 94 fi
95 done 95 done
96} 96}