From ae9f8757afcac03150260109cfc875bdfa8c646f Mon Sep 17 00:00:00 2001 From: lisimin Date: Sat, 18 Sep 2021 18:25:53 +0800 Subject: [PATCH] support build arm32: qume-arm Signed-off-by: lisimin --- meta-openeuler/classes/eulertoolchain.bbclass | 2 +- meta-openeuler/conf/machine/qemu-common.inc | 10 +--------- meta-openeuler/recipes-core/glibc/glibc_2.25.bb | 6 ++++-- meta-openeuler/recipes-kernel/linux/linux-openeuler.bb | 10 ++++++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/meta-openeuler/classes/eulertoolchain.bbclass b/meta-openeuler/classes/eulertoolchain.bbclass index 52355216c9b..39670fd598f 100644 --- a/meta-openeuler/classes/eulertoolchain.bbclass +++ b/meta-openeuler/classes/eulertoolchain.bbclass @@ -7,7 +7,7 @@ def eulertoolchain_raw_prefix(arch): def eulertoolchain_euler_prefix(arch): euler_prefix_dict = { - "arm" : "arm-openeuler-linux", + "arm" : "arm-openeuler-linux-gnueabi", "aarch64" : "aarch64-openeuler-linux", } return euler_prefix_dict[arch] diff --git a/meta-openeuler/conf/machine/qemu-common.inc b/meta-openeuler/conf/machine/qemu-common.inc index 25c2ceda48b..8cc61831956 100644 --- a/meta-openeuler/conf/machine/qemu-common.inc +++ b/meta-openeuler/conf/machine/qemu-common.inc @@ -1,9 +1 @@ -# Copyright (C) Huawei Technologies Co., Ltd. 2020. All rights reserved. -# Description: Config for common machine -# Author: Huawei OS Kernel Lab -# Create: Sat Aug 29 01:15:17 2020 - -MACHINEOVERRIDES =. "hongmengmachine:" - -AVAILTUNES += 'rruarm' -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'rruarm', ' -mno-unaligned-access -mfpu=vfpv3-d16 -mfloat-abi=soft -freg-struct-return', '', d)}" +MACHINEOVERRIDES =. "eulermachine:" diff --git a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb index a369413cd78..ad573508dff 100644 --- a/meta-openeuler/recipes-core/glibc/glibc_2.25.bb +++ b/meta-openeuler/recipes-core/glibc/glibc_2.25.bb @@ -22,10 +22,12 @@ INHIBIT_DEFAULT_DEPS = "1" PR = "r1" -SRC_URI = "file://sysroot-glibc-linaro-2.25-2018.05-aarch64-linux-gnu" +SRC_URI_aarch64 = "file://sysroot-glibc-linaro-2.25-2018.05-aarch64-linux-gnu" +SRC_URI_arm = "file://sysroot-glibc-linaro-2.25-2018.05-arm-linux-gnueabi" #FILESPATH_prepend += "${LOCAL_FILES}:" DL_DIR = "${LOCAL_SYSROOT_DL_DIR}" -S = "${WORKDIR}/sysroot-glibc-linaro-2.25-2018.05-aarch64-linux-gnu" +S_aarch64 = "${WORKDIR}/sysroot-glibc-linaro-2.25-2018.05-aarch64-linux-gnu" +S_arm = "${WORKDIR}/sysroot-glibc-linaro-2.25-2018.05-arm-linux-gnueabi" PSEUDO_DISABLED = "1" PRIVATE_LIBS_${PN}-dev_append = "libdl.so.2 libresolv.so.2 libm.so.6 librt.so.1 libnsl.so.1 libnss_files.so.2 " diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb index 779707946e3..3db25d12379 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb @@ -62,9 +62,11 @@ COMPATIBLE_HOST = ".*-linux" PR = "r1" SRC_URI = "file://kernel-5.10 \ - file://yocto-embedded-tools/config/arm64/defconfig-kernel \ - file://yocto-embedded-tools/patches/arm64/0001-arm64-add-zImage-support-for-arm64.patch \ + file://yocto-embedded-tools/config/${ARCH}/defconfig-kernel \ " +SRC_URI_append_aarch64 += " \ + file://yocto-embedded-tools/patches/${ARCH}/0001-arm64-add-zImage-support-for-arm64.patch \ +" S = "${WORKDIR}/kernel-5.10" B = "${WORKDIR}/build" @@ -96,10 +98,10 @@ python do_symlink_kernsrc () { addtask symlink_kernsrc before do_patch do_configure after do_unpack do_configure() { - cp ../yocto-embedded-tools/config/arm64/defconfig-kernel .config + cp ../yocto-embedded-tools/config/${ARCH}/defconfig-kernel .config set -e unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C ${S} ARCH=arm64 mrproper + oe_runmake -C ${S} ARCH=${ARCH} mrproper ${KERNEL_CONFIG_COMMAND} #yes '' | oe_runmake oldconfig oe_runmake -C ${B} savedefconfig -- Gitee