arm,arm-bsp/recipes-kernel: don't use PN in arm-ffa-transport.inc
PATCH 1/1 arm,arm-bsp/recipes-kernel: don't use PN in arm-ffa-transport.inc
There are some cases where PN is not expanded into linux-yocto in the arm-ffa-transport.inc file required from linux-yocto_%.bbappend, because of the := usage, in those cases PN gets "defaultpkgname".
To fix the issue, rename "linux-yocto" folder into "files" and adjust ARMFILESPATHS to point to that in linux-yocto_%.bbappend, prepend ARMFILESPATHS to FILESEXTRAPATHS in arm-ffa-transport.inc.
Remove ARMFILESPATHS prepend from FILESEXTRAPATHS for corstone1000 in meta-arm-bsp, because the platform has always the "arm-ffa" in MACHINE_FEATURES, which causes ARMFILESPATHS to be prepended.
While there, remove the FILESEXTRAPATHS prepend of ARMFILESPATHS for the n1sdp that will be added by arm-ffa-transport.inc only when needed.
---
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 2 --
meta-arm/recipes-kernel/linux/arm-ffa-transport.inc | 2 +-
.../linux/{linux-yocto => files}/arm-ffa-transport.cfg | 0
meta-arm/recipes-kernel/linux/{linux-yocto => files}/efi.cfg | 0
.../generic-arm64-kmeta/generic-arm64-standard.scc | 0
.../linux/{linux-yocto => files}/no-strict-devmem.cfg | 0
meta-arm/recipes-kernel/linux/{linux-yocto => files}/tee.cfg | 0
meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend | 2 +-
8 files changed, 2 insertions(+), 4 deletions(-)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/arm-ffa-transport.cfg (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/efi.cfg (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/generic-arm64-kmeta/generic-arm64-standard.scc (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/no-strict-devmem.cfg (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/tee.cfg (100%)meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0 -2
@@ -36,7 +36,6 @@ SRC_URI:append:corstone500 = " \ # Corstone1000 KMACHINE # FILESEXTRAPATHS:prepend:corstone1000 := "${ARMBSPFILESPATHS}" -FILESEXTRAPATHS:prepend:corstone1000 := "${ARMFILESPATHS}" COMPATIBLE_MACHINE:corstone1000 = "${MACHINE}" KCONFIG_MODE:corstone1000 = "--alldefconfig" KMACHINE:corstone1000 = "corstone1000"
@@ -115,7 +114,6 @@ COMPATIBLE_MACHINE:n1sdp = "n1sdp" KBUILD_DEFCONFIG:n1sdp = "defconfig" KCONFIG_MODE:n1sdp = "--alldefconfig" FILESEXTRAPATHS:prepend:n1sdp := "${ARMBSPFILESPATHS}" -FILESEXTRAPATHS:prepend:n1sdp := "${ARMFILESPATHS}" SRC_URI:append:n1sdp = " \ file://0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch \ file://0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch \
meta-arm/recipes-kernel/linux/arm-ffa-transport.inc +1 -1
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${ARMFILESPATHS}" # Enable ARM-FFA transport SRC_URI:append = " \
meta-arm/recipes-kernel/linux/files/arm-ffa-transport.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/arm-ffa-transport.cfg +0 -0
meta-arm/recipes-kernel/linux/files/efi.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/efi.cfg +0 -0
meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc renamed from meta-arm/recipes-kernel/linux/linux-yocto/generic-arm64-kmeta/generic-arm64-standard.scc +0 -0
meta-arm/recipes-kernel/linux/files/no-strict-devmem.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/no-strict-devmem.cfg +0 -0
meta-arm/recipes-kernel/linux/files/tee.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/tee.cfg +0 -0
meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +1 -1
@@ -1,4 +1,4 @@ -ARMFILESPATHS := "${THISDIR}/${PN}:" +ARMFILESPATHS := "${THISDIR}/files:" COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
Signature · 1 line
2.17.1
Quoted 8 lines · luca fancellu via lists.yoctoproject.org
To fix the issue, rename "linux-yocto" folder into "files" and adjust ARMFILESPATHS to point to that in linux-yocto_%.bbappend, prepend ARMFILESPATHS to FILESEXTRAPATHS in arm-ffa-transport.inc.
Remove ARMFILESPATHS prepend from FILESEXTRAPATHS for corstone1000 in meta-arm-bsp, because the platform has always the "arm-ffa" in
MACHINE_FEATURES, which causes ARMFILESPATHS to be prepended.
Quoted 5 lines
While there, remove the FILESEXTRAPATHS prepend of ARMFILESPATHS for the n1sdp that will be added by arm-ffa-transport.inc only when needed.
Signed-off-by Luca Fancellu <[email protected]>
Hi,
Please can this bug fix be backported to langdale.
Peter
Quoted 85 lines
--- meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 2 -- meta-arm/recipes-kernel/linux/arm-ffa-transport.inc | 2 +- .../linux/{linux-yocto => files}/arm-ffa-transport.cfg | 0 meta-arm/recipes-kernel/linux/{linux-yocto => files}/efi.cfg | 0 .../generic-arm64-kmeta/generic-arm64-standard.scc | 0 .../linux/{linux-yocto => files}/no-strict-devmem.cfg | 0 meta-arm/recipes-kernel/linux/{linux-yocto => files}/tee.cfg | 0 meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend | 2 +- 8 files changed, 2 insertions(+), 4 deletions(-)rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/arm-ffa-transport.cfg (100%) rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/efi.cfg (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/generic-arm64-kmeta/generic-arm64-standard.scc (100%) rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/no-strict-devmem.cfg (100%)
rename meta-arm/recipes-kernel/linux/{linux-yocto => files}/tee.cfg (100%)meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +0
-2@@ -36,7 +36,6 @@ SRC_URI:append:corstone500 = " \ # Corstone1000 KMACHINE # FILESEXTRAPATHS:prepend:corstone1000 := "${ARMBSPFILESPATHS}" -FILESEXTRAPATHS:prepend:corstone1000 := "${ARMFILESPATHS}" COMPATIBLE_MACHINE:corstone1000 = "${MACHINE}" KCONFIG_MODE:corstone1000 = "--alldefconfig" KMACHINE:corstone1000 = "corstone1000"@@ -115,7 +114,6 @@ COMPATIBLE_MACHINE:n1sdp = "n1sdp" KBUILD_DEFCONFIG:n1sdp = "defconfig" KCONFIG_MODE:n1sdp = "--alldefconfig" FILESEXTRAPATHS:prepend:n1sdp := "${ARMBSPFILESPATHS}" -FILESEXTRAPATHS:prepend:n1sdp := "${ARMFILESPATHS}" SRC_URI:append:n1sdp = " \ file://0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch \ file://0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch \meta-arm/recipes-kernel/linux/arm-ffa-transport.inc +1
-1@@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${ARMFILESPATHS}" # Enable ARM-FFA transport SRC_URI:append = " \meta-arm/recipes-kernel/linux/files/arm-ffa-transport.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/arm-ffa-transport.cfg +0
-0meta-arm/recipes-kernel/linux/files/efi.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/efi.cfg +0
-0meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc renamed from meta-arm/recipes-kernel/linux/linux-yocto/generic-arm64-kmeta/generic-arm64-standard.scc +0
-0meta-arm/recipes-kernel/linux/files/no-strict-devmem.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/no-strict-devmem.cfg +0
-0meta-arm/recipes-kernel/linux/files/tee.cfg renamed from meta-arm/recipes-kernel/linux/linux-yocto/tee.cfg +0
-0meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +1
-2@@ -1,4 +1,4 @@ -ARMFILESPATHS := "${THISDIR}/${PN}:" +ARMFILESPATHS := "${THISDIR}/files:" COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#4091): https://lists.yoctoproject.org/g/meta-arm/message/4091
Mute This Topic: https://lists.yoctoproject.org/mt/94862413/5715260
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason
AppliedQuoted 9 lines · Luca Fancellu
There are some cases where PN is not expanded into linux-yocto in the arm-ffa-transport.inc file required from linux-yocto_%.bbappend, because of the := usage, in those cases PN gets "defaultpkgname".
To fix the issue, rename "linux-yocto" folder into "files" and adjust ARMFILESPATHS to point to that in linux-yocto_%.bbappend, prepend ARMFILESPATHS to FILESEXTRAPATHS in arm-ffa-transport.inc.
[...]
Applied, thanks!
[1/1] arm,arm-bsp/recipes-kernel: don't use PN in arm-ffa-transport.inc
commit: 387f32242ec314f9a4b6eccc2105b61ff96fbd17
Best regards,
Signature · 1 line
Jon Mason <[email protected]>