From 0cfc1e9c267f4a49a412f0117304a349fbcfdbd6 Mon Sep 17 00:00:00 2001
From: liangqifeng <liangqifeng@ncti-gba.cn>
Date: Wed, 22 May 2024 19:10:16 +0800
Subject: [PATCH] Optimzed: optimze kernel-image installation & removal

* verified qemu-x86-64 hi3093, hieulerpi1
* remove kernel-image installation and removal script

Signed-off-by: liangqifeng <liangqifeng@ncti-gba.cn>
---
 .../recipes-core/images/bsp-hi3093.inc        |  3 +++
 .../recipes-core/images/bsp-hieulerpi1.inc    |  1 -
 .../recipes-core/images/hieulerpi1.inc        | 26 +++----------------
 .../packagegroups/packagegroup-base.bbappend  |  1 -
 .../recipes-kernel/linux/hieulerpi1-tf-a.bb   |  7 +++++
 .../packagegroup-core-boot.bbappend           |  4 ---
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/bsp/meta-hisilicon/recipes-core/images/bsp-hi3093.inc b/bsp/meta-hisilicon/recipes-core/images/bsp-hi3093.inc
index 0150b47d1c4..b7dccf8ffbd 100644
--- a/bsp/meta-hisilicon/recipes-core/images/bsp-hi3093.inc
+++ b/bsp/meta-hisilicon/recipes-core/images/bsp-hi3093.inc
@@ -1,4 +1,7 @@
 # add bsp depends here, should use for all images(tiny, standard, etc)
 
 IMAGE_INSTALL:append = " \
+    kernel \
+    kernel-img \
+    kernel-image \
 "
diff --git a/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc b/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc
index a2c05ac3a2b..a46c353d7b1 100644
--- a/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc
+++ b/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc
@@ -1,7 +1,6 @@
 # add bsp depends here, should use for all images(tiny, standard, etc)
 
 IMAGE_INSTALL:append = " \
-hieulerpi1-tf-a \
 hieulerpi1-bsp-pkg \
 i2c-soft \
 mcu-tool \
diff --git a/bsp/meta-hisilicon/recipes-core/images/hieulerpi1.inc b/bsp/meta-hisilicon/recipes-core/images/hieulerpi1.inc
index 930506c1501..5d71ac1a827 100644
--- a/bsp/meta-hisilicon/recipes-core/images/hieulerpi1.inc
+++ b/bsp/meta-hisilicon/recipes-core/images/hieulerpi1.inc
@@ -1,23 +1,5 @@
-delete_unneeded_from_rootfs() {
-    set -x
-    test -d "${OUTPUT_DIR}" || mkdir -p "${OUTPUT_DIR}"
-    rm -rf "${OUTPUT_DIR}"/*
-    cd "${IMAGE_ROOTFS}"
-    cp -r boot/* "${OUTPUT_DIR}"
-    # just need the boot dir, others in boot are not needed to reduce the size of image.
-    rm -rf ./boot/*
-    cd -
-    set +x
+DEPENDS += "hieulerpi1-tf-a"
+copy_kernel_distro() {
+    cp ${DEPLOY_DIR_IMAGE}/kernel-pi ${OUTPUT_DIR}
 }
-IMAGE_PREPROCESS_COMMAND += "delete_unneeded_from_rootfs;"
-
-copy_928_distro() {
-    set -x
-    for IMAGETYPE in ${IMAGE_FSTYPES}
-    do
-        rm -f "${OUTPUT_DIR}"/${IMAGE_NAME}${IMAGE_NAME_SUFFIX%.rootfs}.*${IMAGETYPE}
-        cp -fp ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX%.rootfs}.*${IMAGETYPE} ${OUTPUT_DIR}/
-    done
-    set +x
-}
-IMAGE_POSTPROCESS_COMMAND += "copy_928_distro;"
+IMAGE_POSTPROCESS_COMMAND:append = "copy_kernel_distro;"
diff --git a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend
index eb5768b8be0..9e683452120 100644
--- a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend
+++ b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend
@@ -3,6 +3,5 @@ e2fsprogs-resize2fs \
 "
 
 RDEPENDS:packagegroup-base:append:hieulerpi1 = " \
-hieulerpi1-tf-a \
 hieulerpi1-bsp-pkg \
 "
diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/hieulerpi1-tf-a.bb b/bsp/meta-hisilicon/recipes-kernel/linux/hieulerpi1-tf-a.bb
index 1d050401ee2..8f9933e4e7d 100644
--- a/bsp/meta-hisilicon/recipes-kernel/linux/hieulerpi1-tf-a.bb
+++ b/bsp/meta-hisilicon/recipes-kernel/linux/hieulerpi1-tf-a.bb
@@ -35,3 +35,10 @@ do_install:append() {
 }
 
 FILES:${PN} += " /boot/kernel-pi "
+
+addtask do_deploy after do_install
+
+do_deploy() {
+    test -d "${OUTPUT_DIR}" || mkdir -p "${OUTPUT_DIR}"
+    echo ${OUTPUT_DIR} ${DEPLOY_DIR_IMAGE} | xargs -n 1 cp -fp ${D}/boot/kernel-pi
+}
diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend
index 7aa1a5c6540..1a56e129e89 100644
--- a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend
+++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend
@@ -2,10 +2,6 @@
 
 # we add kernel-img and kernel-vmlinux
 RDEPENDS:${PN} += " \
-    kernel \
-    kernel-img \
-    kernel-image \
-    kernel-vmlinux \
     os-base \
     os-release \
 "
-- 
Gitee