14723 2022-02-17 01:02:52 +0000 patches not applied by devtool when using overrides in SRC_URI 2025-05-18 12:53:50 +0000 1 1 7 Build System, Metadata & Runtime OE-Core core unspecified x86 Multiple IN PROGRESS DESIGN Medium+ normal 5.99 1 jon.richardson chris.laplante ccasciato chris.laplante ernstp meta.mr.watcher meta.watcher randy.macleod sam.birch --- --- No (bug/feature does not impact docs) oldest_to_newest 92568 0 jon.richardson 2022-02-17 01:02:52 +0000 I have a recipe that specifies patches with SRC_URI overrides. Any override causes the patches to not be applied. Eg- FILESEXTRAPATHS_prepend_${MACHINE_ARCH} := "${THISDIR}/${PN}:${THISDIR}/${PN}/${MACHINE_ARCH}:" SRC_URI += " \ file://base-ces.cfg \ " SRC_URI_append_penguin = " \ file://0001-add-penguin-specific-dts.patch \ file://0002-Add-M41T80-RTC.patch \ " Directory: linux-variscite/penguin/: 0001-add-penguin-specific-dts.patch 0002-Add-M41T80-RTC.patch If I move the patches into SRC_URI it works. This is similar to #14060 but the fix didn't resolve the issue for me. I moved to master and still see the issue: Build Configuration: BB_VERSION = "1.46.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "ubuntu-18.04" TARGET_SYS = "aarch64-poky-linux" MACHINE = "penguin" DISTRO = "ces-linux" DISTRO_VERSION = "CES-1.1.1.B59-20220217003750" TUNE_FEATURES = "aarch64 cortexa53 crc crypto" TARGET_FPU = "" meta meta-poky = "master:fca7b22674a2e23fb1cfcc46550531154c90fee6" Additionally, the SRC_URI has a second git repo and it doesn't get copied over to WORKDIR, even though it's in the temporary workdir if I use devtool modify linux-variscite --keep-temp. See cst-certs below. jonr@jonr:~/work/yocto/latest2/build_penguin/tmp/work/penguin-poky-linux/linux-variscite/5.4.142+gitAUTOINC+meta_machine-r0/devtooltmp-61aflsh1$ ll total 148 drwx------ 5 jonr jonr 4096 Feb 16 16:37 ./ drwxrwxr-x 7 jonr jonr 4096 Feb 16 16:25 ../ -rw-rw-r-- 1 jonr jonr 122545 Feb 16 16:37 .config -rw-rw-r-- 1 jonr jonr 40 Feb 16 16:33 initial_rev -rw-rw-r-- 1 jonr jonr 154 Feb 16 16:33 srcsubdir drwxrwxr-x 3 jonr jonr 4096 Feb 16 16:25 stamps/ drwxrwxr-x 2 jonr jonr 4096 Feb 16 16:37 temp/ drwxrwxr-x 7 jonr jonr 4096 Feb 16 16:37 workdir/ jonr@jonr:~/work/yocto/latest2/build_penguin/tmp/work/penguin-poky-linux/linux-variscite/5.4.142+gitAUTOINC+meta_machine-r0/devtooltmp-61aflsh1$ ll workdir/ total 64 drwxrwxr-x 7 jonr jonr 4096 Feb 16 16:37 ./ drwx------ 5 jonr jonr 4096 Feb 16 16:37 ../ -rw-rw-r-- 1 jonr jonr 6242 Jan 31 17:25 0001-add-penguin-specific-dts.patch -rw-rw-r-- 1 jonr jonr 795 Feb 14 14:51 0002-Add-M41T80-RTC.patch drwxr-xr-x 4 jonr jonr 4096 Feb 16 16:37 build/ drwxr-xr-x 3 jonr jonr 4096 Feb 16 16:26 cst/ drwxr-xr-x 5 jonr jonr 4096 Feb 16 16:26 cst-certs/ -rw-r--r-- 1 jonr jonr 22917 Feb 16 16:33 defconfig drwxrwxr-x 4 jonr jonr 4096 Feb 16 16:36 recipe-sysroot/ drwxrwxr-x 8 jonr jonr 4096 Feb 16 16:36 recipe-sysroot-native/ jonr@jonr:~/work/yocto/latest2/build_penguin/tmp/work/penguin-poky-linux/linux-variscite/5.4.142+gitAUTOINC+meta_machine-r0/devtooltmp-61aflsh1$ 92573 1 randy.macleod 2022-02-17 15:41:24 +0000 Did this work before the over-rides change? 92583 2 jon.richardson 2022-02-17 18:04:53 +0000 Yes, if I remove all overrides then it works fine. As soon as there is any override, even if it doesn't apply to the currently configured machine it fails. 92584 3 saul.wold 2022-02-17 18:18:33 +0000 If you change SRC_URI_append_penguin = " \ to SRC_URI:append:penguin = " \ does it work? This is the new override mechanism, if this works then it means the devtool needs to be fixed (which is likely the case). 92585 4 jon.richardson 2022-02-17 18:51:28 +0000 I'm getting an error with that new syntax. Do you have a commit # that implemented it? ERROR: ParseError at /home/jonr/work/yocto/latest2/sources/meta-ces-linux/dynamic-layers/variscite-fslc/recipes-kernel/linux/linux-variscite_%.bbappend:9: unparsed line: 'SRC_URI:append:penguin = "':01:05 92586 5 jon.richardson 2022-02-17 19:39:56 +0000 Please disregard my previous comment. I introduced the syntax error. Using the new override still doesn't make a difference to devtool though unfortunately. 93112 6 saul.wold 2022-04-16 23:41:05 +0000 Hi Jonathan, I want to double check your failure mode. Does devtool modify complete the extraction/patching correctly or does it fail to create the workspace/sources/linux-variscite? If it completes correctly, when you look at the git repo that's created by devtool in workspace/sources/linux-variscite/ are there branches for the overrides? Are you changes in the devtool-override-penguin? Can you provide a sample layer that fails if the above information does not help. 93179 7 jon.richardson 2022-04-25 22:06:37 +0000 Hi Saul, devtool modify does extract the source code, and it creates the override specific branches, but the patches aren't applied. The patches are in the .kernel-meta directory: jon@jon:~/work/yocto/latest/build_penguin/linux-variscite/.kernel-meta$ tree . ├── bsp_definition ├── cfg │   ├── merge_config_build.log │   └── scratch ├── config.queue ├── configs │   ├── base-ces.cfg │   └── defconfig ├── meta-series ├── non-hardware_frags.txt ├── patches │   ├── 0001-add-penguin-specific-dts.patch │   ├── 0001-kthread-Fix-PF_KTHREAD-vs-to_kthread-race.patch │   ├── 0002-Add-M41T80-RTC.patch │   └── 0003-change-usb1-to-otg.patch ├── patch.queue └── series -> patch.queue 4 directories, 13 files $ git branch commit fe01a41af899ae24944993b5293223430f7a6bbe (HEAD -> devtool, tag: devtool-patched, tag: devtool-base, origin/5.4-2.1.x-imx_var01, devtool-override-penguin, devtool-no-overrides) Author: Alexander Herfurtner <alexander.h@variscite.com> Date: Thu Apr 7 22:35:38 2022 +0200 imx7d-var-som: Override FEC property phy-mode for ADIN PHY I'll try to get you an example using the linux-yocto recipe soon so you can reproduce easily. I'm using a different kernel recipe (so you avoid having to pull in meta-variscite-fslc. Thanks. 93188 8 4864 jon.richardson 2022-04-27 23:05:31 +0000 Created attachment 4864 test layer for linux-yocto 93189 9 jon.richardson 2022-04-27 23:07:41 +0000 I've attached a test layer. Just set MACHINE = penguin. It's a copy of a qemu machine conf. Then devtool modify linux-yocto 93205 10 randy.macleod 2022-04-28 15:02:06 +0000 Leaving as M2. Jonathan, let us know if that's a problem for you. 93899 11 ernstp 2022-08-25 12:15:43 +0000 Ah this happens on Dunfell 3.1.19 also. 96703 12 chris.laplante 2023-10-13 14:47:29 +0000 I've submitted a patch series (with selftests) that fixes this issue here: https://lists.openembedded.org/g/openembedded-core/message/189023. 96719 13 chris.laplante 2023-10-18 17:51:20 +0000 There are issues with my approach, so this isn't ready unfortunately. See my follows up on the mailing list: https://lists.openembedded.org/g/openembedded-core/topic/patch_1_3_kernel_yocto/101926734?p=,,,20,0,0,0::recentpostdate/sticky,,,20,2,0,101926734,previd%3D1697651377341095300,nextid%3D1697630480059494786&previd=1697651377341095300&nextid=1697630480059494786 4864 2022-04-27 23:05:31 +0000 2022-04-27 23:05:31 +0000 test layer for linux-yocto meta-testkernel.tar.gz application/gzip 2015 jon.richardson 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 BAQEBAQEBAQEEP8DRndiNgBQAAA=