From: Andrei Gherzan <[email protected]> * Restructure recipe to use include files as opposed to a bbclass. The latter is unnatural when defining versions, sources etc. * Make the zephyr-kernel-src follow the version as defined by PREFERRED_VERSION_zephyr-kernel. * Make the setup of the zephyr-kernel-src.inc extensible for multiple versions.
Signed-off-by: Andrei Gherzan <[email protected]> --- classes/zephyr-kernel-src.bbclass | 37 ------------------- .../zephyr-kernel/zephyr-kernel-src-2.4.0.inc | 10 +++++ ...kernel-src_2.4.bb => zephyr-kernel-src.bb} | 9 +---- .../zephyr-kernel/zephyr-kernel-src.inc | 20 ++++++++++ 4 files changed, 32 insertions(+), 44 deletions(-) delete mode 100644 classes/zephyr-kernel-src.bbclass create mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.4.0.inc rename recipes-kernel/zephyr-kernel/{zephyr-kernel-src_2.4.bb => zephyr-kernel-src.bb} (80%) create mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc diff --git a/classes/zephyr-kernel-src.bbclass b/classes/zephyr-kernel-src.bbclass deleted file mode 100644 index c6c8d61..0000000 --- a/classes/zephyr-kernel-src.bbclass +++ /dev/null @@ -1,37 +0,0 @@ -#Set relevant variables based on Zephyr kernel version - -PREFERRED_VERSION_zephyr-kernel ??= "2.4.0" - -SRCREV_FORMAT = "default_cmsis" -SRCREV_default = "7a3b253ced7333f5c0269387a7f3ed1dee69739d" -SRCREV_cmsis = "542b2296e6d515b265e25c6b7208e8fea3014f90" -SRCREV_nordic = "d8a6ea9695ddf792bb18bb6035c13b1daac5d79c" -SRCREV_stm32 = "f0e11398128ac9abdff713da5d3035e6c96e9b86" -SRCREV_open-amp = "de1b85a13032a2de1d8b6695ae5f800b613e739d" -SRCREV_libmetal = "9d4ee2c3cfd5f49861939447990f3b7d7bf9bf94" -SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0" - -SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.4-branch;name=default \ - git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;destsuffix=git/modules/cmsis;name=cmsis \ - git://github.com/zephyrproject-rtos/hal_nordic.git;protocol=https;destsuffix=git/modules/hal/nordic;name=nordic \ - git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;destsuffix=git/modules/hal/stm32;name=stm32 \ - git://github.com/zephyrproject-rtos/open-amp.git;protocol=https;destsuffix=git/modules/lib/open-amp;name=open-amp \ - git://github.com/zephyrproject-rtos/libmetal.git;protocol=https;destsuffix=git/modules/hal/libmetal;name=libmetal \ - git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \ - file://0001-cmake-add-yocto-toolchain.patch \ - " - -PV = "2.4.0+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/" - -python () { - src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True) - if src_pn == '2.4.0': - return - else: - bb.error("Unsupported Zephyr kernel version requested") -} diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.4.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.4.0.inc new file mode 100644 index 0000000..d1ef80e --- /dev/null +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.4.0.inc @@ -0,0 +1,10 @@ +SRCREV_FORMAT = "default_cmsis" +SRCREV_default = "7a3b253ced7333f5c0269387a7f3ed1dee69739d" +SRCREV_cmsis = "542b2296e6d515b265e25c6b7208e8fea3014f90" +SRCREV_nordic = "d8a6ea9695ddf792bb18bb6035c13b1daac5d79c" +SRCREV_stm32 = "f0e11398128ac9abdff713da5d3035e6c96e9b86" +SRCREV_open-amp = "de1b85a13032a2de1d8b6695ae5f800b613e739d" +SRCREV_libmetal = "9d4ee2c3cfd5f49861939447990f3b7d7bf9bf94" +SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0" + +PV = "2.4.0+git${SRCPV}" diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.4.bb b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb similarity index 80% rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.4.bb rename to recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb index 8e8b5b8..210cfa7 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.4.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb @@ -1,16 +1,12 @@ +include zephyr-kernel-src.inc -inherit zephyr-kernel-src -inherit cmake - -S = "${WORKDIR}/git" +ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/" IMAGE_NO_MANIFEST = "1" INHIBIT_DEFAULT_DEPS = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" - - do_install () { kerneldir=${D}/usr/src/zephyr install -d $kerneldir @@ -21,4 +17,3 @@ PACKAGES = "${PN}" FILES_${PN} = "/usr/src/zephyr" SYSROOT_DIRS += "/usr/src/zephyr" - diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc new file mode 100644 index 0000000..2dcde74 --- /dev/null +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -0,0 +1,20 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +# Default to a stable version +PREFERRED_VERSION_zephyr-kernel ??= "2.4.0" +include zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc + +inherit cmake + +SRC_URI = "\ + git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=master;name=default \ + git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;destsuffix=git/modules/cmsis;name=cmsis \ + git://github.com/zephyrproject-rtos/hal_nordic.git;protocol=https;destsuffix=git/modules/hal/nordic;name=nordic \ + git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;destsuffix=git/modules/hal/stm32;name=stm32 \ + git://github.com/zephyrproject-rtos/open-amp.git;protocol=https;destsuffix=git/modules/lib/open-amp;name=open-amp \ + git://github.com/zephyrproject-rtos/libmetal.git;protocol=https;destsuffix=git/modules/hal/libmetal;name=libmetal \ + git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \ + file://0001-cmake-add-yocto-toolchain.patch \ + " +S = "${WORKDIR}/git" -- 2.30.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#52335): https://lists.yoctoproject.org/g/yocto/message/52335 Mute This Topic: https://lists.yoctoproject.org/mt/80680668/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
