zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-09-12 18:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

zephyr-kernel: Checkout zephyr in subdir to match West usage

Browse Source 
When using West, Zephyr is checked out in a "zephyr" subdirectory of the
working directory. At the moment Zephyr is checked out at the root,
meaning a workaround is required to extract the module information.

In order to remove the workaround, change the Zephyr destsuffix in
SRC_URI and ZEPHYR_BASE. As a result of this change, modify patchdir for
the patches and the path to the LICENSE file.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Peter Hoyes
2022-08-08 08:42:56 +01:00
committed by Naveen Saini
parent e6cef8658b
commit 1e7bafa120
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta-zephyr-core/classes/zephyr.bbclass
View File

@@ -34,16 +34,10 @@ do_get_zmods() {
rm -rf .west; mkdir .west
cat << EOF >> ${S}/.west/config
[manifest]
path = .
path = zephyr
file = west.yml
EOF
# Because of how we structure things, we need to either structure this more like a west workspace or just tweak
# the manifest in order to get access to the west extentions like build and whatnot. Tweaking the manifest is the
# easier path here and minimizes the amount of breakage that might occur.
sed -i 's/path: zephyr/path: ./' west.yml
# Get all available modules and add them to ZEPHYR_MODULES
for i in $(west list|awk 'NR>1 {print $2}'); do
ZEPHYR_MODULES="${S}/$i\;${ZEPHYR_MODULES}"

2
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
View File

@@ -30,7 +30,7 @@ ZEPHYR_EXTRA_MODULES = ""
EXTRA_OECMAKE:append = " -DZEPHYR_EXTRA_MODULES=${ZEPHYR_EXTRA_MODULES}"
export ZEPHYR_BASE="${S}"
export ZEPHYR_BASE="${S}/zephyr"
DEPENDS += "gperf-native"

6
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.7.2.inc
View File

@@ -63,8 +63,8 @@ ZEPHYR_BRANCH = "v2.7-branch"
PV = "2.7.2+git${SRCPV}"
SRC_URI:append = " \
file://dtc.patch \
file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
file://0001-2.7-cmake-add-yocto-toolchain.patch \
file://dtc.patch;patchdir=zephyr \
file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
file://0001-2.7-cmake-add-yocto-toolchain.patch;patchdir=zephyr \
git://github.com/zephyrproject-rtos/hal_cypress.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/cypress;name=cypress \
"

4
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.1.0.inc
View File

@@ -72,6 +72,6 @@ ZEPHYR_BRANCH = "v3.1-branch"
PV = "3.1.0+git${SRCPV}"
SRC_URI += " \
file://0001-3.1-cmake-add-yocto-toolchain.patch \
file://0001-3.1-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \
file://0001-3.1-cmake-add-yocto-toolchain.patch;patchdir=zephyr \
file://0001-3.1-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
"

4
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
View File

@@ -1,5 +1,5 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
LIC_FILES_CHKSUM = "file://zephyr/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
CVE_PRODUCT = "zephyr"
@@ -11,7 +11,7 @@ inherit cmake
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI = "\
git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=${ZEPHYR_BRANCH};name=default \
git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=${ZEPHYR_BRANCH};name=default;destsuffix=git/zephyr \
git://github.com/zephyrproject-rtos/canopennode.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/canopennode;name=canopennode \
git://github.com/zephyrproject-rtos/civetweb.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/civetweb;name=civetweb \
git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;nobranch=1;destsuffix=git/modules/hal/cmsis;name=cmsis \