Merge pull request #454 from jonte/fix/uboot-devtool-override

u-boot: Unconditionally add files/ to FILESEXTRAPATHS
2025-12-23 21:47:10 +01:00 · 2025-10-22 14:47:35 +02:00 · 2025-10-22 14:41:06 +02:00 · 2025-08-15 11:42:22 +02:00 · 2025-08-15 12:22:33 +03:00 · 2025-08-15 12:22:29 +03:00
5 changed files with 15 additions and 5 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"
 LAYERDEPENDS_sunxi = "core meta-python meta-arm"
-LAYERSERIES_COMPAT_sunxi = "styhead"
+LAYERSERIES_COMPAT_sunxi = "walnascar"
--- a/conf/machine/olinuxino-a20som204.conf
+++ b/conf/machine/olinuxino-a20som204.conf
@@ -0,0 +1,9 @@
 #@TYPE: Machine
 #@NAME: Olimex A20-SOM204
 #@DESCRIPTION: Machine configuration for the Olimex A20-SOM204 Evaluation Board, based on Allwinner A20 CPU
 #https://github.com/OLIMEX/SOM204
 require conf/machine/include/sun7i.inc
 KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som204-evb.dtb"
 UBOOT_MACHINE = "A20-Olimex-SOM204-EVB_defconfig"
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
 DEPENDS:append:sun50i = " trusted-firmware-a"
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=4e584373bb0f46ef1e423cb7df37847d"
 DEPENDS = "python3"
 # No GPIO mappings for other machines yet
-COMPATIBLE_MACHINE = "(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)"
+COMPATIBLE_MACHINE = "^(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10lime|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a13som|olinuxino-a20som)$"
 SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
           file://mapping.h \
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -35,9 +35,10 @@ kernel_conf_variable() {
    fi
 }
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-cc:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
 do_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot"
 do_configure:prepend() {
    CONF_SED_SCRIPT=""
Author	SHA1	Message	Date
Marek Belisko	3bf96b053a	Merge pull request #454 from jonte/fix/uboot-devtool-override u-boot: Unconditionally add files/ to FILESEXTRAPATHS	2025-10-22 14:47:35 +02:00
Jonatan Pålsson	751495a8e8	u-boot: Unconditionally add files/ to FILESEXTRAPATHS This works around an issue where devtool doesn't find patches for machines other than the current machine. "devtool modify" tries to create git branches for each SRC_URI override (i.e. sunxi, sun9i, mangopi-mq-t-t113). When doing this devtool modifies the OVERRIDES for do_patch and filters out any other overrides used for SRC_URI in the current recipe. Since "sunxi" is used as an SRC_URI override it gets removed from OVERRIDES when processing e.g. sun9i, leading to FILESEXTRAPATHS not containing the patch directory for the recipe. By unconditionally setting FILESEXTRAPATHS without an override specified we work around this behavior and ensure all patches are always available when applying patches to the different devtool-override-* branches. Signed-off-by: Jonatan Pålsson <jonatan@jptk.se>	2025-10-22 14:41:06 +02:00
Marek Belisko	a69afa656d	Merge pull request #452 from ovpanait/master Add support for Olimex A20-SOM204-EVB board	2025-08-15 11:42:22 +02:00
Ovidiu Panait	cd83074dee	olinuxino-a20som204.conf: add support for Olimex A20-SOM204-EVB board Add machine file for Olimex A20-SOM204-EVB board. It is an expansion board for the Olimex A20-SOM204 SOM that uses the sun7i Allwinner A20 Soc. It is supported in U-Boot and mainline Linux kernel. Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>	2025-08-15 12:22:33 +03:00
Ovidiu Panait	afae76b548	pya20: fix COMPATIBLE_MACHINE regex The current regex in COMPATIBLE_MACHINE will also match machine names which are not in the list, such as 'olinuxino-a20som204'. Since 'olinuxino-a20som204' SOM is newer, a mapping.h file is not available for it in upstream pya20, so there is no need to build the recipe for it. Add "^$" to the regex in order to restrict the pya20 recipe only to those machines that have a mapping.h file. Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>	2025-08-15 12:22:29 +03:00
Marek Belisko	8052a49f1e	Merge pull request #447 from leon-anavi/feature/support-walnascar Support Walnascar	2025-04-05 23:06:08 +02:00
Leon Anavi	ac38a90036	linux.inc: virtual/XXX-gcc to virtual/cross-cc Switch from virtual/XXX-gcc to virtual/cross-cc (and c++/binutils) as in Poky commit 90e0a0f7f4536e1aeb311ab2b061be71b4129e4e: https://web.git.yoctoproject.org/poky/commit/?id=90e0a0f7f4536e1aeb311ab2b061be71b4129e4e Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2025-04-04 18:21:35 +03:00
Leon Anavi	bd41971e70	conf/layer.conf: Support Walnascar Support Yocto release Walnascar. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>	2025-04-04 18:21:30 +03:00
`@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"`

	`LAYERDEPENDS_sunxi = "core meta-python meta-arm"`	`LAYERDEPENDS_sunxi = "core meta-python meta-arm"`

	`LAYERSERIES_COMPAT_sunxi = "styhead"`	`LAYERSERIES_COMPAT_sunxi = "walnascar"`