yocto - 如何在yocto中打补丁

Question

我正在使用BBB来了解yocto项目。我不确定修补的工作方式。这是我的项目目录

├── meta-testlayer
├── poky

元测试层包含一个helloworld示例

├── conf
│   └── layer.conf
├── COPYING.MIT
├── README
└── recipes-hello
    └── helloworld
        ├── helloworld-0.1
        │   ├── helloworld.c
        │   ├── helloworld.patch
        │   └── newhelloworld.c
        └── helloworld_0.1.bb

helloworld.c和newhelloworld.c的区别仅在于一个printf语句。这是helloworld.c的内容

#include <stdio.h>

int main(int argc, char **argv)
{

    printf("Hi, this is my first custom recipe. Have a good day\n");
    return 0;
}

newhelloworld.c
＃包括

int main(int argc, char **argv)
{

    printf("Let see if patch works\n");
    printf("Hi, this patch is from the test-layer\n");
    return 0;
}

这是我使用diff helloworld.c newhelloworld.c > helloworld.patch命令创建的补丁。

6c6,7
<     printf("Hi, this is my first custom recipe. Have a good day\n");
---
>     printf("Let see if patch works\n");
>     printf("Hi, this patch is from the test-layer\n");

这是helloworld_0.1.bb文件的内容

SUMMARY = "Simple helloworld application"
SECTION = "examples"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

#here we specify the source we want to build
SRC_URI = "file://helloworld.c"
SRC_URI += "file://helloworld.patch"

#here we specify the source directory, where we can do all the building and expect sources to be placed
S = "${WORKDIR}"

#bitbake task
do_compile() {
         ${CC} ${LDFLAGS} helloworld.c -o helloworld
}

#bitbake task
do_install() {
         install -d ${D}${bindir}
         install -m 0755 helloworld ${D}${bindir}
}

这是我运行bitbake -c patch helloworld时的错误消息

NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
ERROR: helloworld-0.1-r0 do_patch: Command Error: 'quilt --quiltrc /home/guest/yocto_practice/poky/build-beaglebone/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/helloworld/0.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
Applying patch helloworld.patch
patch: **** Only garbage was found in the patch input.
Patch helloworld.patch does not apply (enforce with -f)
ERROR: helloworld-0.1-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/guest/yocto_practice/poky/build-beaglebone/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/helloworld/0.1-r0/temp/log.do_patch.22267
ERROR: Task (/home/guest/yocto_practice/meta-testlayer/recipes-hello/helloworld/helloworld_0.1.bb:do_patch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 11 tasks of which 8 didn't need to be rerun and 1 failed.

Summary: 1 task failed:
  /home/guest/yocto_practice/meta-testlayer/recipes-hello/helloworld/helloworld_0.1.bb:do_patch
Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

Answer 1

首先，创建补丁:

diff -u helloworld.c newhelloworld.c > helloworld.patch

或使用Git(将x替换为您要提取补丁的提交数):

git format-patch -x

应用补丁的两种方法:

将其放入测试层，在.bb文件上添加一行:SRC_URI += " file://example.patch "

将它放在另一层中，但仅当它不是您的层时才需要(meta-oe，meta-fsl，meta-qt ...)

对于这种情况，请在.bbappend文件中使用:

FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " file://helloworld.patch "