Re: [PATCH 10/10] meta-isar: add creator-ci40-marduk machine (mipsel + mainline kernel)

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 24 Oct 2019 11:02:24 +0200
schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:

> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>  .../creator-ci40-image-extension.bbclass      |  9 +++++++
>  meta-isar/conf/local.conf.sample              |  1 +
>  .../conf/machine/creator-ci40-marduk.conf     | 14 ++++++++++
>  .../creator-ci40-marduk-buster.conf           |  7 +++++
>  ...tachio-set-KBUILD_IMAGE-to-uImage.gz.patch | 27
> +++++++++++++++++++ .../recipes-kernel/linux/files/no-display.cfg |
> 1 + .../recipes-kernel/linux/files/no-fs-nfs.cfg  |  6 +++++
>  .../recipes-kernel/linux/files/no-sound.cfg   |  1 +
>  .../linux/linux-mainline_4.19.80.bb           |  6 +++++
>  9 files changed, 72 insertions(+)
>  create mode 100644
> meta-isar/classes/creator-ci40-image-extension.bbclass create mode
> 100644 meta-isar/conf/machine/creator-ci40-marduk.conf create mode
> 100644 meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf
> create mode 100644
> meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch
> create mode 100644
> meta-isar/recipes-kernel/linux/files/no-display.cfg create mode
> 100644 meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg create mode
> 100644 meta-isar/recipes-kernel/linux/files/no-sound.cfg
> 
> diff --git a/meta-isar/classes/creator-ci40-image-extension.bbclass
> b/meta-isar/classes/creator-ci40-image-extension.bbclass new file
> mode 100644 index 0000000..9879cd7
> --- /dev/null
> +++ b/meta-isar/classes/creator-ci40-image-extension.bbclass
> @@ -0,0 +1,9 @@
> +# This software is a part of ISAR.
> +# Copyright (C) Mentor Graphics, a Siemens business, 2019
> +
> +ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_creator_ci40"
> +image_postprocess_creator_ci40() {
> +    sudo mv ${IMAGE_ROOTFS}/boot/vmlinux-* ${IMAGE_ROOTFS}/uImage
> +    sudo mv ${IMAGE_ROOTFS}/usr/lib/linux-*/img/*dtb ${IMAGE_ROOTFS}/
> +    sudo rm -f ${IMAGE_ROOTFS}/vmlinux*
> +}

And this is what you needed the hacky feature for. I understand but i
guess is can be done with postinst. I think the symlinks in / are done
by postinst scripts. And the final location is really only interesting
for your bootloader, which should maybe look in /boot.

Moving these files around will cause an inconsistent view of your
package manager on your rootfs. Copies to /usr/local/ would maybe be
fine.

Henning

> diff --git a/meta-isar/conf/local.conf.sample
> b/meta-isar/conf/local.conf.sample index d73da1d..62218c2 100644
> --- a/meta-isar/conf/local.conf.sample
> +++ b/meta-isar/conf/local.conf.sample
> @@ -59,6 +59,7 @@ BBMULTICONFIG = " \
>      hikey-stretch \
>      nand-ubi-demo-buster \
>      rpi-stretch \
> +    creator-ci40-marduk-buster \
>  "
>  
>  #
> diff --git a/meta-isar/conf/machine/creator-ci40-marduk.conf
> b/meta-isar/conf/machine/creator-ci40-marduk.conf new file mode 100644
> index 0000000..41c3b3d
> --- /dev/null
> +++ b/meta-isar/conf/machine/creator-ci40-marduk.conf
> @@ -0,0 +1,14 @@
> +#
> +# Copyright (c) Mentor Graphics, a Siemens business, 2019
> +#
> +# SPDX-License-Identifier: MIT
> +
> +DISTRO_ARCH ?= "mipsel"
> +
> +KERNEL_NAME ?= "mainline"
> +KERNEL_DEFCONFIG ?= "pistachio_defconfig"
> +KERNEL_FILE ?= "vmlinux"
> +KBUILD_DEPENDS_append = " u-boot-tools "
> +
> +IMAGE_TYPE ?= "ext4-img"
> +CUSTOM_IMAGE_EXTENSIONS_append = " creator-ci40-image-extension "
> diff --git
> a/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf
> b/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf new file
> mode 100644 index 0000000..b634a56 --- /dev/null
> +++ b/meta-isar/conf/multiconfig/creator-ci40-marduk-buster.conf
> @@ -0,0 +1,7 @@
> +#
> +# Copyright (c) Mentor Graphics, a Siemens business, 2019
> +#
> +# SPDX-License-Identifier: MIT
> +
> +MACHINE = "creator-ci40-marduk"
> +DISTRO = "debian-buster"
> diff --git
> a/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch
> b/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch
> new file mode 100644 index 0000000..33ee90f --- /dev/null
> +++
> b/meta-isar/recipes-kernel/linux/files/0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch
> @@ -0,0 +1,27 @@ +From 7b8209dd21049d57e80ece10862d90105a1f6340 Mon
> Sep 17 00:00:00 2001 +From: Cedric Hombourger
> <Cedric_Hombourger@mentor.com> +Date: Thu, 13 Jun 2019 15:56:48 -0400
> +Subject: [PATCH] MIPS: pistachio: set KBUILD_IMAGE to uImage.gz
> +
> +scripts/package/builddep uses the image_name make target to determine
> +the kernel image binary to be included in the linux-image package. As
> +the u-boot binary expects a kernel in the uImage format, make sure
> +"make -s image_name" prints arch/mips/boot/uImage.gz.
> +
> +Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> +---
> + arch/mips/pistachio/Platform | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/arch/mips/pistachio/Platform
> b/arch/mips/pistachio/Platform +index c3592b374ad2..ab3962b8c3b4
> 100644 +--- a/arch/mips/pistachio/Platform
> ++++ b/arch/mips/pistachio/Platform
> +@@ -7,3 +7,4 @@ cflags-$(CONFIG_MACH_PISTACHIO)
> +=				\
> + load-$(CONFIG_MACH_PISTACHIO)		+= 0xffffffff80400000
> + zload-$(CONFIG_MACH_PISTACHIO)		+= 0xffffffff81000000
> + all-$(CONFIG_MACH_PISTACHIO)		:= uImage.gz
> ++KBUILD_IMAGE                            := arch/mips/boot/uImage.gz
> +-- 
> +2.11.0
> +
> diff --git a/meta-isar/recipes-kernel/linux/files/no-display.cfg
> b/meta-isar/recipes-kernel/linux/files/no-display.cfg new file mode
> 100644 index 0000000..7310c1a
> --- /dev/null
> +++ b/meta-isar/recipes-kernel/linux/files/no-display.cfg
> @@ -0,0 +1 @@
> +# CONFIG_FB is not set
> diff --git a/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg
> b/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg new file mode
> 100644 index 0000000..00a1fd2
> --- /dev/null
> +++ b/meta-isar/recipes-kernel/linux/files/no-fs-nfs.cfg
> @@ -0,0 +1,6 @@
> +# CONFIG_NFS is not set
> +# CONFIG_NFS_COMMON is not set
> +# CONFIG_NFS_V2 is not set
> +# CONFIG_NFS_V3 is not set
> +# CONFIG_ROOT_NFS is not set
> +# CONFIG_LOCKD is not set
> diff --git a/meta-isar/recipes-kernel/linux/files/no-sound.cfg
> b/meta-isar/recipes-kernel/linux/files/no-sound.cfg new file mode
> 100644 index 0000000..c4f3666
> --- /dev/null
> +++ b/meta-isar/recipes-kernel/linux/files/no-sound.cfg
> @@ -0,0 +1 @@
> +# CONFIG_SOUND is not set
> diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb
> b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb index
> 83038f0..13018a4 100644 ---
> a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb +++
> b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.80.bb @@ -19,6
> +19,12 @@ SRC_URI[sha256sum] =
> "80a9ba764e088aa7fddfef5a97c0236905e291468a37832243b6f3828d
> SRC_URI_append_de0-nano-soc = " \
> file://0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch"
> +SRC_URI_append_creator-ci40-marduk = " \
> +    file://0001-MIPS-pistachio-set-KBUILD_IMAGE-to-uImage.gz.patch \
> +    file://no-display.cfg \
> +    file://no-fs-nfs.cfg \
> +    file://no-sound.cfg"
> +
>  S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"
>  
>  KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig"