[PATCH honister 0/2] Backport: Remove redundant code from kernel recipe and unwanted images.

[PATCH honister 0/2] Backport: Remove redundant code from kernel recipe and unwanted images.

[harry.moulton]

From: Harry Moulton <harry.moulton@arm.com>

These patches remove some redundant code from the kernel recipe which was 
deleting kernel images, and replaces it with the addition of RDEPENDS.

Harry Moulton (2):
  arm-bsp/linux-yocto: backport remove redundant kernel hacking
  arm-bsp/corstone1000: Add RDEPENDS to remove unwanted images.

 .../conf/machine/include/corstone1000.inc      |  2 ++
 .../linux/linux-arm-platforms.inc              | 18 ------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

-- 
2.17.1

[PATCH honister 1/2] arm-bsp/linux-yocto: backport remove redundant kernel hacking

[harry.moulton]

From: Harry Moulton <harry.moulton@arm.com>

Backport of 7fc51c7c from master which removes some redundant code to
reduce the size of the resulting corstone1000 binary.

Signed-off-by: Harry Moulton <harry.moulton@arm.com>
---
 .../linux/linux-arm-platforms.inc              | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 49f92ce..73c52f7 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -143,24 +143,6 @@ SRC_URI:append:corstone1000 = " ${@bb.utils.contains('MACHINE_FEATURES', \
 # corstone1000 has limited flash memory constraints
 KERNEL_EXTRA_FEATURES:corstone1000 = ""
 KERNEL_FEATURES:corstone1000 = ""
-# No need to include the kernel image in the rootfs
-# So, let's delete the package doing that and uninstalling the initial
-# kernel binary.
-# The kernel binary needed is the initramfs bundle
-
-FILES:kernel-image-image:corstone1000=""
-
-# Uninstalling the initial kernel binary
-
-do_install:append:corstone1000() {
-    if [ -e "${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}" ]; then
-        rm ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
-    fi
-
-    if [ -e "${D}/${KERNEL_IMAGEDEST}/$imageType" ]; then
-        rm ${D}/${KERNEL_IMAGEDEST}/$imageType
-    fi
-}
 
 #
 # FVP BASE KMACHINE
-- 
2.17.1

[PATCH honister 2/2] arm-bsp/corstone1000: Add RDEPENDS to remove unwanted images.

[harry.moulton]

From: Harry Moulton <harry.moulton@arm.com>

Remove unwanted build images that push the binaries size over the size
limit for corstone1000.

Signed-off-by: Harry Moulton <harry.moulton@arm.com>
---
 meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc
index 6ec0982..200fad1 100644
--- a/meta-arm-bsp/conf/machine/include/corstone1000.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc
@@ -51,6 +51,8 @@ KERNEL_IMAGETYPE = "Image"
 
 INITRAMFS_IMAGE_BUNDLE ?= "1"
 
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= ""
+
 #telling the build system which image is responsible of the generation of the initramfs rootfs
 INITRAMFS_IMAGE = "corstone1000-initramfs-image"
 
-- 
2.17.1

Re: [PATCH honister 2/2] arm-bsp/corstone1000: Add RDEPENDS to remove unwanted images.

[Jon Mason]

On Mon, Mar 14, 2022 at 04:25:02PM +0000, harry.moulton@arm.com wrote:
> From: Harry Moulton <harry.moulton@arm.com>
> 
> Remove unwanted build images that push the binaries size over the size
> limit for corstone1000.

I don't see this in the master branch.  Is this not needed there (if
so, please add to the comment above as to why).  If so, please send
there first.

Thanks,
Jon

> 
> Signed-off-by: Harry Moulton <harry.moulton@arm.com>
> ---
>  meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc
> index 6ec0982..200fad1 100644
> --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc
> +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc
> @@ -51,6 +51,8 @@ KERNEL_IMAGETYPE = "Image"
>  
>  INITRAMFS_IMAGE_BUNDLE ?= "1"
>  
> +RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= ""
> +
>  #telling the build system which image is responsible of the generation of the initramfs rootfs
>  INITRAMFS_IMAGE = "corstone1000-initramfs-image"
>  
> -- 
> 2.17.1
> 
>