From f32cd475d4b188a433e3df22492adf47d4792f6d Mon Sep 17 00:00:00 2001 From: lisimin Date: Tue, 25 Jan 2022 16:53:31 +0800 Subject: [PATCH 1/5] delete KERNEL_VERSION from rpmname such as kernel-module-xxx Signed-off-by: lisimin --- .../raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend | 2 ++ meta-openeuler/recipes-core/images/openeuler-image.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend index 785068b6b46..579132ffe55 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend @@ -2,3 +2,5 @@ SRC_URI += "\ file://src-kernel-5.10/0000-raspberrypi-kernel.patch \ " OPENEULER_KERNEL_CONFIG = "${S}/arch/${ARCH}/configs/bcm2711_defconfig" +#delete v8 in kernel module name, such as kernel-module-xxx-5.10.0-v8 +KERNEL_MODULE_PACKAGE_SUFFIX = "" diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index d598c588fe9..9531e44af37 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -123,7 +123,7 @@ libevhtp \ libarchive \ libevent \ iSulad \ -kernel-module-overlay-5.10.0 \ +kernel-module-overlay \ kernel-img \ kernel-vmlinux \ " -- Gitee From 37095b13a135f9ca67b1ce0a71c00605ea4007c7 Mon Sep 17 00:00:00 2001 From: lisimin Date: Tue, 25 Jan 2022 16:55:11 +0800 Subject: [PATCH 2/5] support build lib32 for raspberrypi4-64 Signed-off-by: lisimin --- bsp/meta-openeuler-bsp/conf/distro/openeuler-bsp.conf | 1 + .../conf/machine/openeuler-raspberrypi4-64.conf | 5 +++++ meta-openeuler/conf/distro/openeuler.conf | 1 + 3 files changed, 7 insertions(+) create mode 100644 bsp/meta-openeuler-bsp/conf/distro/openeuler-bsp.conf create mode 100644 bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf diff --git a/bsp/meta-openeuler-bsp/conf/distro/openeuler-bsp.conf b/bsp/meta-openeuler-bsp/conf/distro/openeuler-bsp.conf new file mode 100644 index 00000000000..e0ead5b7ed9 --- /dev/null +++ b/bsp/meta-openeuler-bsp/conf/distro/openeuler-bsp.conf @@ -0,0 +1 @@ +include conf/machine/openeuler-${MACHINE}.conf diff --git a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf new file mode 100644 index 00000000000..2868a127fe8 --- /dev/null +++ b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf @@ -0,0 +1,5 @@ +require conf/multilib.conf +MULTILIB += "multilib:lib32" +DEFAULTTUNE_virtclass-multilib-lib32 = "armv7a" + +ROOTFS_PACKAGE_ARCH = "aarch64" diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index 24050299a4b..129891979ce 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -75,3 +75,4 @@ INHERIT += "get_rpmdeps" #disable the file checksum of fetch do_fetch[file-checksums] = "" SDK_INCLUDE_BUILDTOOLS = "0" +require conf/distro/openeuler-bsp.conf -- Gitee From 9a76bf5535a0e7399276a17196966c486cab6001 Mon Sep 17 00:00:00 2001 From: lisimin Date: Tue, 25 Jan 2022 16:56:33 +0800 Subject: [PATCH 3/5] build all pkgs for raspberrypi4-64 Signed-off-by: lisimin --- .../recipes-core/images/raspberrypi4-64.inc | 8 -------- .../raspberrypi/recipes-core/images/rpi.inc | 13 +++++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc index 4218b016e35..6168e321728 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc @@ -1,10 +1,2 @@ #image configuration for aarch64 require rpi.inc - -IMAGE_INSTALL = " \ -busybox-linuxrc \ -kernel \ -busybox \ -os-base \ -glibc \ -" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc index 67cedfc46de..18bebaa6274 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc @@ -1,16 +1,17 @@ delete_boot_from_rootfs() { test -d "${OUTPUT_DIR}" || mkdir -p "${OUTPUT_DIR}" pushd "${IMAGE_ROOTFS}" - rm -f "${OUTPUT_DIR}"/*Image* "${OUTPUT_DIR}"/initrd "${OUTPUT_DIR}"/vmlinux* - mv boot/${KERNEL_IMAGETYPE}-* "${OUTPUT_DIR}"/${KERNEL_IMAGETYPE} - mv boot/vmlinux* "${OUTPUT_DIR}"/ - mv boot/Image* "${OUTPUT_DIR}"/ - rm -r ./boot - touch lsm + if [ -d ./boot ];then + rm -f "${OUTPUT_DIR}"/*Image* "${OUTPUT_DIR}"/vmlinux* + mv boot/${KERNEL_IMAGETYPE}-* "${OUTPUT_DIR}"/${KERNEL_IMAGETYPE} + mv boot/vmlinux* "${OUTPUT_DIR}"/ + rm -r ./boot + fi popd } copy_openeuler_distro() { + rm -f "${OUTPUT_DIR}"/initrd cp -fp ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${IMAGE_FSTYPES} "${OUTPUT_DIR}"/initrd } -- Gitee From 5caf8ec0a229b21a1ab38185d77e1223e57170ed Mon Sep 17 00:00:00 2001 From: lisimin Date: Tue, 25 Jan 2022 18:02:39 +0800 Subject: [PATCH 4/5] build zImage for raspberrypi4-64 Signed-off-by: lisimin --- .../conf/machine/openeuler-raspberrypi4-64.conf | 4 ++++ .../raspberrypi/recipes-core/images/raspberrypi4-64.inc | 2 ++ .../raspberrypi/recipes-core/images/rpi.inc | 1 + .../raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend | 2 -- meta-openeuler/recipes-kernel/linux/linux-openeuler.bb | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf index 2868a127fe8..bdd56ee9986 100644 --- a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf +++ b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf @@ -3,3 +3,7 @@ MULTILIB += "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7a" ROOTFS_PACKAGE_ARCH = "aarch64" + +#set 0 to create zImage +RPI_USE_U_BOOT = "0" +KERNEL_IMAGETYPE_DIRECT = "zImage" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc index 6168e321728..ada8babbe54 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/raspberrypi4-64.inc @@ -1,2 +1,4 @@ #image configuration for aarch64 require rpi.inc + +IMAGE_INSTALL += "kernel-image-zimage" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc index 18bebaa6274..4a5350cfda9 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/rpi.inc @@ -5,6 +5,7 @@ delete_boot_from_rootfs() { rm -f "${OUTPUT_DIR}"/*Image* "${OUTPUT_DIR}"/vmlinux* mv boot/${KERNEL_IMAGETYPE}-* "${OUTPUT_DIR}"/${KERNEL_IMAGETYPE} mv boot/vmlinux* "${OUTPUT_DIR}"/ + mv boot/Image* "${OUTPUT_DIR}"// || exit 1 rm -r ./boot fi popd diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend index 579132ffe55..785068b6b46 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend @@ -2,5 +2,3 @@ SRC_URI += "\ file://src-kernel-5.10/0000-raspberrypi-kernel.patch \ " OPENEULER_KERNEL_CONFIG = "${S}/arch/${ARCH}/configs/bcm2711_defconfig" -#delete v8 in kernel module name, such as kernel-module-xxx-5.10.0-v8 -KERNEL_MODULE_PACKAGE_SUFFIX = "" diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb index c823fdc5c65..b936163f612 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb @@ -16,6 +16,8 @@ S = "${WORKDIR}/kernel-5.10" LINUX_VERSION ?= "5.10" LINUX_VERSION_EXTENSION_append = "-openeuler" +#delete v8 in kernel module name, such as kernel-module-xxx-5.10.0-v8 +KERNEL_MODULE_PACKAGE_SUFFIX = "" PV = "${LINUX_VERSION}" -- Gitee From e91860b40741b5ffff97da59e2bb2321402b2ffa Mon Sep 17 00:00:00 2001 From: lisimin Date: Tue, 25 Jan 2022 18:15:05 +0800 Subject: [PATCH 5/5] copy sdk to output Signed-off-by: lisimin --- meta-openeuler/recipes-core/images/openeuler-image.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 9531e44af37..47d81379c13 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -132,4 +132,9 @@ IMAGE_INSTALL += "${ROOTFS_BOOTSTRAP_INSTALL} ${IMAGE_INSTALL_normal} ${IMAGE_IN DISTRO_FEATURES += "glibc" +copy_opeueuler_sdk() { + cp -fp ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh "${OUTPUT_DIR}"/ +} +SDK_POSTPROCESS_COMMAND += "copy_opeueuler_sdk;" + require recipes-core/images/${MACHINE}.inc -- Gitee