Hi Nicolas - The recipe is already in a custom layer entirely, I just don’t have full control over the source. So I don’t think I need a .bbappend as I can just put it in the main recipe file.
Thanks, Emily > On Mar 20, 2020, at 10:06 AM, Nicolas Jeker <[email protected]> wrote: > > On Thu, 2020-03-19 at 23:10 -0500, Emily wrote: >> Hi all - >> >> I have a recipe that I'd like to patch - the source is in a repo >> which has a submodule, and the patch occurs in the submodule. Is >> there a way I can apply this patch without getting an error? I do >> kind of understand why it's a problem - the patch is changing the >> pointer of the submodule to a commit which doesn't actually exist. Do >> I need to build the submodule as a separate recipe and patch it >> separately maybe? > > Is there a reason why you don't use a bbappend file with your patch in > it in a custom layer? > > Something like this: > > package_ver.bbappend > -------------------- > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > SRC_URI += "file://abc.patch" > > > With this directory structure: > > meta-custom-layer > ├── package_ver.bbappend > └── package > └── abc.patch > > Replace "package" and "ver" with the correct values (if you don't want > to set the version you can use "%" as a wildcard). > > Maybe I missed something about your submodule situation and my advice > is completely wrong, if so, just disregard it. > >> I used devtool for the patch and if I don't run the devtool reset >> command, then everything builds, but I think this is just because the >> workspace created by devtool was added as a layer, which probably >> isn't a good long term solution. > > You should be able to get the above structure by using 'devtool finish > recipe meta-custom-layer'. If that doesn't work you can do it manually > as described above. > >> The error I get (pasted below) says I can "enforce with -f" but I'm >> not sure where that option goes exactly. Thanks for the help! >> >> Emily >> >> Error on build: >> ERROR: opc-ua-server-gfex-1.0+gitAUTOINC+921c563309-r0 do_patch: >> Command Error: 'quilt --quiltrc >> /local/d6/easmith5/rocko_bitbake/poky/build/tmp/work/aarch64-poky- >> linux/opc-ua-server-gfex/1.0+gitAUTOINC+921c563309-r0/recipe-sysroot- >> native/etc/quiltrc push' exited with 0 Output: >> Applying patch 0001-Update-Poverty-to-point-to-boost-python3.patch >> File Poverty is not a regular file -- refusing to patch >> 1 out of 1 hunk ignored -- rejects in file >> Patch 0001-Update-Poverty-to-point-to-boost-python3.patch does not >> apply (enforce with -f) >> ERROR: opc-ua-server-gfex-1.0+gitAUTOINC+921c563309-r0 do_patch: >> Function failed: patch_do_patch > > I don't know why this error occurs, maybe someone else knows more. > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#48877): https://lists.yoctoproject.org/g/yocto/message/48877 Mute This Topic: https://lists.yoctoproject.org/mt/72093333/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
