diff options
Diffstat (limited to 'meta/lib/patchtest/selftest/files')
34 files changed, 930 insertions, 837 deletions
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.fail index 0c40cdc1b6..30c1bc4624 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.fail | |||
@@ -1,32 +1,43 @@ | |||
1 | From 1fbb446d1849b1208012cbdae5d85d228cdbe4a6 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: First Last <first.last@example.com> | 2 | From: First Last <first.last@example.com> |
3 | Date: Tue, 29 Aug 2023 13:32:24 -0400 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] selftest-hello: add a summary | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This patch should fail the selftests because the author address is from the | 6 | This should fail the test_author_valid test. |
7 | invalid "example.com". | ||
8 | 7 | ||
9 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
10 | --- | 9 | --- |
11 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 3 ++- | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 21 insertions(+) |
12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb | ||
13 | 13 | ||
14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
15 | index 547587bef4..491f0a3df7 100644 | 15 | new file mode 100644 |
16 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | index 00000000000..f3dec1b220c |
17 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 17 | --- /dev/null |
18 | @@ -1,3 +1,4 @@ | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
19 | +SUMMARY = "A cool sample" | 19 | @@ -0,0 +1,21 @@ |
20 | DESCRIPTION = "Simple helloworld application -- selftest variant" | 20 | +SUMMARY = "This is an example summary" |
21 | SECTION = "examples" | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
22 | LICENSE = "MIT" | 22 | +SECTION = "examples" |
23 | @@ -16,4 +17,4 @@ do_install() { | 23 | +LICENSE = "MIT" |
24 | install -m 0755 helloworld ${D}${bindir} | 24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
25 | } | 25 | + |
26 | 26 | +SRC_URI = "file://helloworld.c" | |
27 | -BBCLASSEXTEND = "native nativesdk" | 27 | + |
28 | \ No newline at end of file | 28 | +S = "${WORKDIR}/sources" |
29 | +UNPACKDIR = "${S}" | ||
30 | + | ||
31 | +do_compile() { | ||
32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld | ||
33 | +} | ||
34 | + | ||
35 | +do_install() { | ||
36 | + install -d ${D}${bindir} | ||
37 | + install -m 0755 helloworld ${D}${bindir} | ||
38 | +} | ||
39 | + | ||
29 | +BBCLASSEXTEND = "native nativesdk" | 40 | +BBCLASSEXTEND = "native nativesdk" |
30 | -- | 41 | -- |
31 | 2.41.0 | 42 | 2.45.1 |
32 | 43 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.pass index cbb8ef2cef..6e82b08bc6 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.1.pass | |||
@@ -1,31 +1,43 @@ | |||
1 | From 1fbb446d1849b1208012cbdae5d85d228cdbe4a6 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: First Last <first.last@address.com> | 2 | From: First Last <first.last@address.com> |
3 | Date: Tue, 29 Aug 2023 13:32:24 -0400 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] selftest-hello: add a summary | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This patch should pass the selftests because the author address is in a valid format. | 6 | This should pass the test_author_valid test. |
7 | 7 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 3 ++- | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 21 insertions(+) |
12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb | ||
12 | 13 | ||
13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
14 | index 547587bef4..491f0a3df7 100644 | 15 | new file mode 100644 |
15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | index 00000000000..f3dec1b220c |
16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 17 | --- /dev/null |
17 | @@ -1,3 +1,4 @@ | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
18 | +SUMMARY = "A cool sample" | 19 | @@ -0,0 +1,21 @@ |
19 | DESCRIPTION = "Simple helloworld application -- selftest variant" | 20 | +SUMMARY = "This is an example summary" |
20 | SECTION = "examples" | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
21 | LICENSE = "MIT" | 22 | +SECTION = "examples" |
22 | @@ -16,4 +17,4 @@ do_install() { | 23 | +LICENSE = "MIT" |
23 | install -m 0755 helloworld ${D}${bindir} | 24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
24 | } | 25 | + |
25 | 26 | +SRC_URI = "file://helloworld.c" | |
26 | -BBCLASSEXTEND = "native nativesdk" | 27 | + |
27 | \ No newline at end of file | 28 | +S = "${WORKDIR}/sources" |
29 | +UNPACKDIR = "${S}" | ||
30 | + | ||
31 | +do_compile() { | ||
32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld | ||
33 | +} | ||
34 | + | ||
35 | +do_install() { | ||
36 | + install -d ${D}${bindir} | ||
37 | + install -m 0755 helloworld ${D}${bindir} | ||
38 | +} | ||
39 | + | ||
28 | +BBCLASSEXTEND = "native nativesdk" | 40 | +BBCLASSEXTEND = "native nativesdk" |
29 | -- | 41 | -- |
30 | 2.41.0 | 42 | 2.45.1 |
31 | 43 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.fail index 3e2b81bca1..745a8f45d9 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.fail | |||
@@ -1,31 +1,43 @@ | |||
1 | From 1fbb446d1849b1208012cbdae5d85d228cdbe4a6 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: Upgrade Helper <auh@auh.yoctoproject.org> | 2 | From: Upgrade Helper <auh@auh.yoctoproject.org> |
3 | Date: Tue, 29 Aug 2023 13:32:24 -0400 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] selftest-hello: add a summary | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This patch should fail the selftests because AUH is an invalid sender. | 6 | This should fail the test_author_valid test. |
7 | 7 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 3 ++- | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 21 insertions(+) |
12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb | ||
12 | 13 | ||
13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
14 | index 547587bef4..491f0a3df7 100644 | 15 | new file mode 100644 |
15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | index 00000000000..f3dec1b220c |
16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 17 | --- /dev/null |
17 | @@ -1,3 +1,4 @@ | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
18 | +SUMMARY = "A cool sample" | 19 | @@ -0,0 +1,21 @@ |
19 | DESCRIPTION = "Simple helloworld application -- selftest variant" | 20 | +SUMMARY = "This is an example summary" |
20 | SECTION = "examples" | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
21 | LICENSE = "MIT" | 22 | +SECTION = "examples" |
22 | @@ -16,4 +17,4 @@ do_install() { | 23 | +LICENSE = "MIT" |
23 | install -m 0755 helloworld ${D}${bindir} | 24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
24 | } | 25 | + |
25 | 26 | +SRC_URI = "file://helloworld.c" | |
26 | -BBCLASSEXTEND = "native nativesdk" | 27 | + |
27 | \ No newline at end of file | 28 | +S = "${WORKDIR}/sources" |
29 | +UNPACKDIR = "${S}" | ||
30 | + | ||
31 | +do_compile() { | ||
32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld | ||
33 | +} | ||
34 | + | ||
35 | +do_install() { | ||
36 | + install -d ${D}${bindir} | ||
37 | + install -m 0755 helloworld ${D}${bindir} | ||
38 | +} | ||
39 | + | ||
28 | +BBCLASSEXTEND = "native nativesdk" | 40 | +BBCLASSEXTEND = "native nativesdk" |
29 | -- | 41 | -- |
30 | 2.41.0 | 42 | 2.45.1 |
31 | 43 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.pass index f84e1265a7..56cb77fa69 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_author_valid.2.pass | |||
@@ -1,31 +1,43 @@ | |||
1 | From 1fbb446d1849b1208012cbdae5d85d228cdbe4a6 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: First Last <averylongemailaddressthatishardtoread.from@address.com> | 2 | From: First Last <averylongemailaddressthatishardtoread.from@address.com> |
3 | Date: Tue, 29 Aug 2023 13:32:24 -0400 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] selftest-hello: add a summary | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This patch should pass the selftests because the author address is in a valid format. | 6 | This should pass the test_author_valid test. |
7 | 7 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 3 ++- | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 21 insertions(+) |
12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb | ||
12 | 13 | ||
13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
14 | index 547587bef4..491f0a3df7 100644 | 15 | new file mode 100644 |
15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | index 00000000000..f3dec1b220c |
16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 17 | --- /dev/null |
17 | @@ -1,3 +1,4 @@ | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
18 | +SUMMARY = "A cool sample" | 19 | @@ -0,0 +1,21 @@ |
19 | DESCRIPTION = "Simple helloworld application -- selftest variant" | 20 | +SUMMARY = "This is an example summary" |
20 | SECTION = "examples" | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
21 | LICENSE = "MIT" | 22 | +SECTION = "examples" |
22 | @@ -16,4 +17,4 @@ do_install() { | 23 | +LICENSE = "MIT" |
23 | install -m 0755 helloworld ${D}${bindir} | 24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
24 | } | 25 | + |
25 | 26 | +SRC_URI = "file://helloworld.c" | |
26 | -BBCLASSEXTEND = "native nativesdk" | 27 | + |
27 | \ No newline at end of file | 28 | +S = "${WORKDIR}/sources" |
29 | +UNPACKDIR = "${S}" | ||
30 | + | ||
31 | +do_compile() { | ||
32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld | ||
33 | +} | ||
34 | + | ||
35 | +do_install() { | ||
36 | + install -d ${D}${bindir} | ||
37 | + install -m 0755 helloworld ${D}${bindir} | ||
38 | +} | ||
39 | + | ||
28 | +BBCLASSEXTEND = "native nativesdk" | 40 | +BBCLASSEXTEND = "native nativesdk" |
29 | -- | 41 | -- |
30 | 2.41.0 | 42 | 2.45.1 |
31 | 43 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail index 854d7eb8c7..6facb8c756 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.fail | |||
@@ -1,26 +1,67 @@ | |||
1 | From f06e14633723c1e78bc7a4b0fd0d3b79d09f0c68 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: name@somedomain.com <email@address.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 2 May 2024 10:21:45 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] README.OE-Core.md: Add foo to header | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This test patch adds 'foo' to the header of README.OE-Core.md | 6 | This should fail the test_bugzilla_entry_format test. |
7 | 7 | ||
8 | [YOCTO 1234] | 8 | [YOCTO 1234] |
9 | CVE: CVE-1234-56789 | ||
9 | 10 | ||
10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
11 | --- | 12 | --- |
12 | README.OE-Core.md | 1 + | 13 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
13 | 1 file changed, 1 insertion(+) | 14 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
15 | 2 files changed, 29 insertions(+), 1 deletion(-) | ||
16 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
14 | 17 | ||
15 | diff --git a/README.OE-Core.md b/README.OE-Core.md | 18 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | index 687c58e410c..9d863891134 100644 | 19 | new file mode 100644 |
17 | --- a/README.OE-Core.md | 20 | index 00000000000..8a4f9329303 |
18 | +++ b/README.OE-Core.md | 21 | --- /dev/null |
19 | @@ -1,3 +1,4 @@ | 22 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | +**** FOO **** | 23 | @@ -0,0 +1,26 @@ |
21 | OpenEmbedded-Core | 24 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | ================= | 25 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
26 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
27 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
28 | + | ||
29 | +CVE: CVE-1234-56789 | ||
30 | +Upstream-Status: Backport(http://example.com/example) | ||
31 | + | ||
32 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
33 | +--- | ||
34 | + strlen.c | 1 + | ||
35 | + 1 file changed, 1 insertion(+) | ||
36 | + | ||
37 | +diff --git a/strlen.c b/strlen.c | ||
38 | +index 1788f38..83d7918 100644 | ||
39 | +--- a/strlen.c | ||
40 | ++++ b/strlen.c | ||
41 | + | ||
42 | +int main() { | ||
43 | + | ||
44 | + printf("%d\n", str_len(string1)); | ||
45 | + printf("%d\n", str_len(string2)); | ||
46 | + printf("CVE FIXED!!!\n"); | ||
47 | + | ||
48 | + return 0; | ||
49 | +} | ||
50 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
51 | index 2dc352d479e..d937759f157 100644 | ||
52 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
53 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
54 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
55 | LICENSE = "MIT" | ||
56 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
23 | 57 | ||
58 | -SRC_URI = "file://helloworld.c" | ||
59 | +SRC_URI = "file://helloworld.c \ | ||
60 | + file://0001-Fix-CVE-1234-56789.patch \ | ||
61 | + " | ||
62 | |||
63 | S = "${WORKDIR}/sources" | ||
64 | UNPACKDIR = "${S}" | ||
24 | -- | 65 | -- |
25 | 2.44.0 | 66 | 2.45.1 |
26 | 67 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass index 2648b03364..2f35458b4f 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_bugzilla_entry_format.pass | |||
@@ -1,25 +1,67 @@ | |||
1 | From fdfd605e565d874502522c4b70b786c8c5aa0bad Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: name@somedomain.com <email@address.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 17 Feb 2017 16:29:21 -0600 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] README: adds 'foo' to the header | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This test patch adds 'foo' to the header | 6 | This should pass the test_bugzilla_entry_format test. |
7 | 7 | ||
8 | [YOCTO #1234] | 8 | [YOCTO #1234] |
9 | CVE: CVE-1234-56789 | ||
9 | 10 | ||
10 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
11 | --- | 12 | --- |
12 | README | 1 + | 13 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
13 | 1 file changed, 1 insertion(+) | 14 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
15 | 2 files changed, 29 insertions(+), 1 deletion(-) | ||
16 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
14 | 17 | ||
15 | diff --git a/README b/README | 18 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | index 521916cd4f..cdf29dcea3 100644 | 19 | new file mode 100644 |
17 | --- a/README | 20 | index 00000000000..8a4f9329303 |
18 | +++ b/README | 21 | --- /dev/null |
19 | @@ -1,3 +1,4 @@ | 22 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | +**** FOO **** | 23 | @@ -0,0 +1,26 @@ |
21 | OpenEmbedded-Core | 24 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | ================= | 25 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
26 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
27 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
28 | + | ||
29 | +CVE: CVE-1234-56789 | ||
30 | +Upstream-Status: Backport(http://example.com/example) | ||
31 | + | ||
32 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
33 | +--- | ||
34 | + strlen.c | 1 + | ||
35 | + 1 file changed, 1 insertion(+) | ||
36 | + | ||
37 | +diff --git a/strlen.c b/strlen.c | ||
38 | +index 1788f38..83d7918 100644 | ||
39 | +--- a/strlen.c | ||
40 | ++++ b/strlen.c | ||
41 | + | ||
42 | +int main() { | ||
43 | + | ||
44 | + printf("%d\n", str_len(string1)); | ||
45 | + printf("%d\n", str_len(string2)); | ||
46 | + printf("CVE FIXED!!!\n"); | ||
47 | + | ||
48 | + return 0; | ||
49 | +} | ||
50 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
51 | index 2dc352d479e..d937759f157 100644 | ||
52 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
53 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
54 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
55 | LICENSE = "MIT" | ||
56 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
57 | |||
58 | -SRC_URI = "file://helloworld.c" | ||
59 | +SRC_URI = "file://helloworld.c \ | ||
60 | + file://0001-Fix-CVE-1234-56789.patch \ | ||
61 | + " | ||
62 | |||
63 | S = "${WORKDIR}/sources" | ||
64 | UNPACKDIR = "${S}" | ||
65 | -- | ||
66 | 2.45.1 | ||
23 | 67 | ||
24 | -- | ||
25 | 2.11.0 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail index 93ca0f9119..6f4e61c0da 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.fail | |||
@@ -1,22 +1,62 @@ | |||
1 | From 0a52a62c9430c05d22cb7f46380488f2280b69bb Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 1 Sep 2023 08:56:14 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] README.OE-Core.md: add foo | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 6 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
7 | --- | 7 | --- |
8 | README.OE-Core.md | 1 + | 8 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
9 | 1 file changed, 1 insertion(+) | 9 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
10 | 2 files changed, 29 insertions(+), 1 deletion(-) | ||
11 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
10 | 12 | ||
11 | diff --git a/README.OE-Core.md b/README.OE-Core.md | 13 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
12 | index 2f2127fb03..48464252c8 100644 | 14 | new file mode 100644 |
13 | --- a/README.OE-Core.md | 15 | index 00000000000..8a4f9329303 |
14 | +++ b/README.OE-Core.md | 16 | --- /dev/null |
15 | @@ -1,3 +1,4 @@ | 17 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | +** FOO ** | 18 | @@ -0,0 +1,26 @@ |
17 | OpenEmbedded-Core | 19 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
18 | ================= | 20 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
21 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
22 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
23 | + | ||
24 | +CVE: CVE-1234-56789 | ||
25 | +Upstream-Status: Backport(http://example.com/example) | ||
26 | + | ||
27 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
28 | +--- | ||
29 | + strlen.c | 1 + | ||
30 | + 1 file changed, 1 insertion(+) | ||
31 | + | ||
32 | +diff --git a/strlen.c b/strlen.c | ||
33 | +index 1788f38..83d7918 100644 | ||
34 | +--- a/strlen.c | ||
35 | ++++ b/strlen.c | ||
36 | + | ||
37 | +int main() { | ||
38 | + | ||
39 | + printf("%d\n", str_len(string1)); | ||
40 | + printf("%d\n", str_len(string2)); | ||
41 | + printf("CVE FIXED!!!\n"); | ||
42 | + | ||
43 | + return 0; | ||
44 | +} | ||
45 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
46 | index 2dc352d479e..d937759f157 100644 | ||
47 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
48 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
49 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
50 | LICENSE = "MIT" | ||
51 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
19 | 52 | ||
53 | -SRC_URI = "file://helloworld.c" | ||
54 | +SRC_URI = "file://helloworld.c \ | ||
55 | + file://0001-Fix-CVE-1234-56789.patch \ | ||
56 | + " | ||
57 | |||
58 | S = "${WORKDIR}/sources" | ||
59 | UNPACKDIR = "${S}" | ||
20 | -- | 60 | -- |
21 | 2.41.0 | 61 | 2.45.1 |
22 | 62 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass index 5e3dcbd58b..3fbc23fd00 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_commit_message_presence.pass | |||
@@ -1,24 +1,66 @@ | |||
1 | From 0a52a62c9430c05d22cb7f46380488f2280b69bb Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 1 Sep 2023 08:56:14 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] README.OE-Core.md: add foo | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This is a commit message | 6 | This should pass the test_commit_message_presence test. |
7 | |||
8 | CVE: CVE-1234-56789 | ||
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | README.OE-Core.md | 1 + | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | 1 file changed, 1 insertion(+) | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
14 | 2 files changed, 29 insertions(+), 1 deletion(-) | ||
15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
12 | 16 | ||
13 | diff --git a/README.OE-Core.md b/README.OE-Core.md | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | index 2f2127fb03..48464252c8 100644 | 18 | new file mode 100644 |
15 | --- a/README.OE-Core.md | 19 | index 00000000000..8a4f9329303 |
16 | +++ b/README.OE-Core.md | 20 | --- /dev/null |
17 | @@ -1,3 +1,4 @@ | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
18 | +** FOO ** | 22 | @@ -0,0 +1,26 @@ |
19 | OpenEmbedded-Core | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
20 | ================= | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
26 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
27 | + | ||
28 | +CVE: CVE-1234-56789 | ||
29 | +Upstream-Status: Backport(http://example.com/example) | ||
30 | + | ||
31 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
32 | +--- | ||
33 | + strlen.c | 1 + | ||
34 | + 1 file changed, 1 insertion(+) | ||
35 | + | ||
36 | +diff --git a/strlen.c b/strlen.c | ||
37 | +index 1788f38..83d7918 100644 | ||
38 | +--- a/strlen.c | ||
39 | ++++ b/strlen.c | ||
40 | + | ||
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
50 | index 2dc352d479e..d937759f157 100644 | ||
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
54 | LICENSE = "MIT" | ||
55 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
56 | |||
57 | -SRC_URI = "file://helloworld.c" | ||
58 | +SRC_URI = "file://helloworld.c \ | ||
59 | + file://0001-Fix-CVE-1234-56789.patch \ | ||
60 | + " | ||
21 | 61 | ||
62 | S = "${WORKDIR}/sources" | ||
63 | UNPACKDIR = "${S}" | ||
22 | -- | 64 | -- |
23 | 2.41.0 | 65 | 2.45.1 |
24 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.1.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.1.fail deleted file mode 100644 index 9cc4aab38a..0000000000 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.1.fail +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From d12db4cfa913b0e7a4b5bd858d3019acc53ce426 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Wed, 30 Aug 2023 12:15:00 -0400 | ||
4 | Subject: [PATCH] selftest-hello: upgrade 1.0 -> 1.1 | ||
5 | |||
6 | This test should fail the mbox formatting test and the merge on head | ||
7 | test. | ||
8 | |||
9 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
10 | --- | ||
11 | .../{selftest-hello_1.0.bb => selftest-hello_1.1.bb} | 3 ++- | ||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
13 | rename meta-selftest/recipes-test/selftest-hello/{selftest-hello_1.0.bb => selftest-hello_1.1.bb} (88%) | ||
14 | |||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
16 | similarity index 88% | ||
17 | rename from meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
18 | rename to meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
19 | index 547587bef4..acc388ec2c 100644 | ||
20 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
21 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
22 | @@ -1,3 +1,4 @@ | ||
23 | %+SUMMARY = "Hello!" | ||
24 | DESCRIPTION = "Simple helloworld application -- selftest variant" | ||
25 | SECTION = "examples" | ||
26 | LICENSE = "MIT" | ||
27 | @@ -16,4 +17,4 @@ do_install() { | ||
28 | install -m 0755 helloworld ${D}${bindir} | ||
29 | } | ||
30 | |||
31 | -BBCLASSEXTEND = "native nativesdk" | ||
32 | \ No newline at end of file | ||
33 | +BBCLASSEXTEND = "native nativesdk" | ||
34 | -- | ||
35 | 2.41.0 | ||
36 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.2.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.2.fail deleted file mode 100644 index eca1c60085..0000000000 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.2.fail +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From d12db4cfa913b0e7a4b5bd858d3019acc53ce426 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Wed, 30 Aug 2023 12:15:00 -0400 | ||
4 | Subject: [PATCH] selftest-hello: upgrade 1.0 -> 1.1 | ||
5 | |||
6 | This test should fail the merge-on-head and mbox formatting tests. | ||
7 | |||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
9 | --- | ||
10 | .../{selftest-hello_1.0.bb => selftest-hello_1.1.bb} | 3 ++- | ||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
12 | rename meta-selftest/recipes-test/selftest-hello/{selftest-hello_1.0.bb => selftest-hello_1.1.bb} (88%) | ||
13 | |||
14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
15 | similarity index 88% | ||
16 | rename from meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
17 | rename to meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
18 | index 547587bef4..acc388ec2c 100644 | ||
19 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
20 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | ||
21 | @@ -1,3 +1,4 @@ | ||
22 | %+SUMMARY = "Hello!" | ||
23 | DESCRIPTION = "Simple helloworld application -- selftest variant" | ||
24 | SECTION = "examples" | ||
25 | LICENSE = "MIT" | ||
26 | @@ -16,4 +17,4 @@ do_install() { | ||
27 | install -m 0755 helloworld ${D}${bindir} | ||
28 | } | ||
29 | |||
30 | -BBCLASSEXTEND = "native nativesdk" | ||
31 | \ No newline at end of file | ||
32 | +BBCLASSEXTEND = "native nativesdk" | ||
33 | -- | ||
34 | 2.41.0 | ||
35 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.fail new file mode 100644 index 0000000000..0dda6802d1 --- /dev/null +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.fail | |||
@@ -0,0 +1,66 @@ | |||
1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Fri, 31 May 2024 09:54:50 -0400 | ||
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | ||
5 | |||
6 | This should fail the test_mbox_format test. | ||
7 | |||
8 | CVE: CVE-1234-56789 | ||
9 | |||
10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
11 | --- | ||
12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ | ||
13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- | ||
14 | 2 files changed, 29 insertions(+), 1 deletion(-) | ||
15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
16 | |||
17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
18 | new file mode 100644 | ||
19 | index 00000000000..8a4f9329303 | ||
20 | --- /dev/null | ||
21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
22 | @@ -0,0 +1,26 @@ | ||
23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | ||
24 | +From: Trevor Gamblin <tgamblin@baylibre.com> | ||
25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
26 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
27 | + | ||
28 | +CVE: CVE-1234-56789 | ||
29 | +Upstream-Status: Backport(http://example.com/example) | ||
30 | + | ||
31 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
32 | +--- | ||
33 | + strlen.c | 1 + | ||
34 | + 1 file changed, 1 insertion(+) | ||
35 | + | ||
36 | +diff --git a/strlen.c b/strlen.c | ||
37 | +index 1788f38..83d7918 100644 | ||
38 | +--- a/strlen.c | ||
39 | ++++ b/strlen.c | ||
40 | + | ||
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
50 | index 2dc352d479e..d937759f157 100644 | ||
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | ||
54 | LICENSE = "MIT" | ||
55 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
56 | |||
57 | -SRC_URI = "file://helloworld.c" | ||
58 | +SRC_URI = "file://helloworld.c \ | ||
59 | %+ file://0001-Fix-CVE-1234-56789.patch \ | ||
60 | + " | ||
61 | |||
62 | S = "${WORKDIR}/sources" | ||
63 | UNPACKDIR = "${S}" | ||
64 | -- | ||
65 | 2.45.1 | ||
66 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass index 33940adffc..f06ae11d04 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_mbox_format.pass | |||
@@ -1,33 +1,66 @@ | |||
1 | From d12db4cfa913b0e7a4b5bd858d3019acc53ce426 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Wed, 30 Aug 2023 12:15:00 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: upgrade 1.0 -> 1.1 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | |||
6 | This should pass the test_mbox_format test. | ||
7 | |||
8 | CVE: CVE-1234-56789 | ||
5 | 9 | ||
6 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
7 | --- | 11 | --- |
8 | .../{selftest-hello_1.0.bb => selftest-hello_1.1.bb} | 3 ++- | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
9 | 1 file changed, 2 insertions(+), 1 deletion(-) | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
10 | rename meta-selftest/recipes-test/selftest-hello/{selftest-hello_1.0.bb => selftest-hello_1.1.bb} (88%) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | ||
11 | 16 | ||
12 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
13 | similarity index 88% | 18 | new file mode 100644 |
14 | rename from meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 19 | index 00000000000..8a4f9329303 |
15 | rename to meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | 20 | --- /dev/null |
16 | index 547587bef4..acc388ec2c 100644 | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
22 | @@ -0,0 +1,26 @@ | ||
23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | ||
24 | +From: Trevor Gamblin <tgamblin@baylibre.com> | ||
25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | ||
26 | +Subject: [PATCH] Fix CVE-NOT-REAL | ||
27 | + | ||
28 | +CVE: CVE-1234-56789 | ||
29 | +Upstream-Status: Backport(http://example.com/example) | ||
30 | + | ||
31 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
32 | +--- | ||
33 | + strlen.c | 1 + | ||
34 | + 1 file changed, 1 insertion(+) | ||
35 | + | ||
36 | +diff --git a/strlen.c b/strlen.c | ||
37 | +index 1788f38..83d7918 100644 | ||
38 | +--- a/strlen.c | ||
39 | ++++ b/strlen.c | ||
40 | + | ||
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | ||
50 | index 2dc352d479e..d937759f157 100644 | ||
17 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.1.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
19 | @@ -1,3 +1,4 @@ | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
20 | +SUMMARY = "Hello!" | ||
21 | DESCRIPTION = "Simple helloworld application -- selftest variant" | ||
22 | SECTION = "examples" | ||
23 | LICENSE = "MIT" | 54 | LICENSE = "MIT" |
24 | @@ -16,4 +17,4 @@ do_install() { | 55 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
25 | install -m 0755 helloworld ${D}${bindir} | 56 | |
26 | } | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | ||
59 | + file://0001-Fix-CVE-1234-56789.patch \ | ||
60 | + " | ||
27 | 61 | ||
28 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
29 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
30 | +BBCLASSEXTEND = "native nativesdk" | ||
31 | -- | 64 | -- |
32 | 2.41.0 | 65 | 2.45.1 |
33 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_series_merge_on_head.1.skip b/meta/lib/patchtest/selftest/files/TestMbox.test_series_merge_on_head.1.skip index 2a72457878..072ccc28c0 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_series_merge_on_head.1.skip +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_series_merge_on_head.1.skip | |||
@@ -3,7 +3,7 @@ From: Trevor Gamblin <tgamblin@baylibre.com> | |||
3 | Date: Wed, 30 Aug 2023 12:15:00 -0400 | 3 | Date: Wed, 30 Aug 2023 12:15:00 -0400 |
4 | Subject: [PATCH] selftest-hello: upgrade 1.0 -> 1.1 | 4 | Subject: [PATCH] selftest-hello: upgrade 1.0 -> 1.1 |
5 | 5 | ||
6 | This file should pass the test_series_merge_on_head test. | 6 | This file should skip the test_series_merge_on_head test. |
7 | 7 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail index cdbbc61b61..c5e4df2549 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.fail | |||
@@ -1,23 +1,25 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello% fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello% fix CVE-1234-56789 |
5 | 5 | ||
6 | This should fail the test_shortlog_format test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -56,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
56 | 56 | ||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass index ef6017037c..4948e26afc 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_format.pass | |||
@@ -1,23 +1,25 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should pass the test_shortlog_format test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -56,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
56 | 56 | ||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail index 629e78540b..4ed1242821 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.fail | |||
@@ -1,23 +1,25 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: this is a very long commit shortlog with way too many words included in it to pass the test | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 this is a very long commit shortlog with way too many words included in it to pass the test |
5 | |||
6 | This should fail the test_shortlong_length test. | ||
5 | 7 | ||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -57,17 +57,10 @@ index 547587bef4..76975a6729 100644 | |||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://0001-Fix-CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass index ef6017037c..ef5066a650 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_shortlog_length.pass | |||
@@ -1,23 +1,25 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should pass the test_shortlog_length test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -56,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
56 | 56 | ||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail index 35d92aeed7..4ede7271ee 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.1.fail | |||
@@ -1,22 +1,24 @@ | |||
1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should fail the test_signed_off_by_presence test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | --- | 10 | --- |
9 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | 11 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
10 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 12 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
11 | 2 files changed, 31 insertions(+), 2 deletions(-) | 13 | 2 files changed, 29 insertions(+), 1 deletion(-) |
12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 14 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
13 | 15 | ||
14 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 16 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
15 | new file mode 100644 | 17 | new file mode 100644 |
16 | index 0000000000..869cfb6fe5 | 18 | index 00000000000..8a4f9329303 |
17 | --- /dev/null | 19 | --- /dev/null |
18 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 20 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
19 | @@ -0,0 +1,27 @@ | 21 | @@ -0,0 +1,26 @@ |
20 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 22 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
21 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 23 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
22 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 24 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -34,18 +36,17 @@ index 0000000000..869cfb6fe5 | |||
34 | +index 1788f38..83d7918 100644 | 36 | +index 1788f38..83d7918 100644 |
35 | +--- a/strlen.c | 37 | +--- a/strlen.c |
36 | ++++ b/strlen.c | 38 | ++++ b/strlen.c |
37 | +@@ -8,6 +8,7 @@ int main() { | 39 | + |
38 | + | 40 | +int main() { |
39 | + printf("%d\n", str_len(string1)); | 41 | + |
40 | + printf("%d\n", str_len(string2)); | 42 | + printf("%d\n", str_len(string1)); |
41 | ++ printf("CVE FIXED!!!\n"); | 43 | + printf("%d\n", str_len(string2)); |
42 | + | 44 | + printf("CVE FIXED!!!\n"); |
43 | + return 0; | 45 | + |
44 | + } | 46 | + return 0; |
45 | +-- | 47 | +} |
46 | +2.41.0 | ||
47 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 48 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
48 | index 547587bef4..76975a6729 100644 | 49 | index 2dc352d479e..d937759f157 100644 |
49 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
51 | @@ -3,7 +3,9 @@ SECTION = "examples" | 52 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -54,18 +55,11 @@ index 547587bef4..76975a6729 100644 | |||
54 | 55 | ||
55 | -SRC_URI = "file://helloworld.c" | 56 | -SRC_URI = "file://helloworld.c" |
56 | +SRC_URI = "file://helloworld.c \ | 57 | +SRC_URI = "file://helloworld.c \ |
57 | + file://CVE-1234-56789.patch \ | 58 | + file://0001-Fix-CVE-1234-56789.patch \ |
58 | + " | 59 | + " |
59 | |||
60 | S = "${WORKDIR}" | ||
61 | |||
62 | @@ -16,4 +18,4 @@ do_install() { | ||
63 | install -m 0755 helloworld ${D}${bindir} | ||
64 | } | ||
65 | 60 | ||
66 | -BBCLASSEXTEND = "native nativesdk" | 61 | S = "${WORKDIR}/sources" |
67 | \ No newline at end of file | 62 | UNPACKDIR = "${S}" |
68 | +BBCLASSEXTEND = "native nativesdk" | ||
69 | -- | 63 | -- |
70 | 2.41.0 | 64 | 2.45.1 |
71 | 65 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail index 68f38dee06..f7c3f5145a 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.2.fail | |||
@@ -1,23 +1,25 @@ | |||
1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should fail the test_signed_off_by_presence test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Approved: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Approved-of-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..869cfb6fe5 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,18 +37,17 @@ index 0000000000..869cfb6fe5 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | 40 | + |
39 | + | 41 | +int main() { |
40 | + printf("%d\n", str_len(string1)); | 42 | + |
41 | + printf("%d\n", str_len(string2)); | 43 | + printf("%d\n", str_len(string1)); |
42 | ++ printf("CVE FIXED!!!\n"); | 44 | + printf("%d\n", str_len(string2)); |
43 | + | 45 | + printf("CVE FIXED!!!\n"); |
44 | + return 0; | 46 | + |
45 | + } | 47 | + return 0; |
46 | +-- | 48 | +} |
47 | +2.41.0 | ||
48 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
49 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -55,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
55 | 56 | ||
56 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
57 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
58 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
59 | + " | 60 | + " |
60 | |||
61 | S = "${WORKDIR}" | ||
62 | |||
63 | @@ -16,4 +18,4 @@ do_install() { | ||
64 | install -m 0755 helloworld ${D}${bindir} | ||
65 | } | ||
66 | 61 | ||
67 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
68 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
69 | +BBCLASSEXTEND = "native nativesdk" | ||
70 | -- | 64 | -- |
71 | 2.41.0 | 65 | 2.45.1 |
72 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass index ea34c76f0d..2661c1416f 100644 --- a/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass +++ b/meta/lib/patchtest/selftest/files/TestMbox.test_signed_off_by_presence.pass | |||
@@ -1,23 +1,25 @@ | |||
1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should pass the test_signed_off_by_presence test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..869cfb6fe5 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,18 +37,17 @@ index 0000000000..869cfb6fe5 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | 40 | + |
39 | + | 41 | +int main() { |
40 | + printf("%d\n", str_len(string1)); | 42 | + |
41 | + printf("%d\n", str_len(string2)); | 43 | + printf("%d\n", str_len(string1)); |
42 | ++ printf("CVE FIXED!!!\n"); | 44 | + printf("%d\n", str_len(string2)); |
43 | + | 45 | + printf("CVE FIXED!!!\n"); |
44 | + return 0; | 46 | + |
45 | + } | 47 | + return 0; |
46 | +-- | 48 | +} |
47 | +2.41.0 | ||
48 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
49 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -55,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
55 | 56 | ||
56 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
57 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
58 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
59 | + " | 60 | + " |
60 | |||
61 | S = "${WORKDIR}" | ||
62 | |||
63 | @@ -16,4 +18,4 @@ do_install() { | ||
64 | install -m 0755 helloworld ${D}${bindir} | ||
65 | } | ||
66 | 61 | ||
67 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
68 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
69 | +BBCLASSEXTEND = "native nativesdk" | ||
70 | -- | 64 | -- |
71 | 2.41.0 | 65 | 2.45.1 |
72 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.fail b/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.fail index 3574463ade..dccafcd9bc 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.fail +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.fail | |||
@@ -1,30 +1,25 @@ | |||
1 | From c4ca86b9cca3643097db0328e2f34dccffbba309 Mon Sep 17 00:00:00 2001 | 1 | From 60450eefbc2c438a37c5e08759d021b18f0df0a3 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Simone=20Wei=C3=9F?= <simone.p.weiss@posteo.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Sat, 10 Feb 2024 13:18:44 +0100 | 3 | Date: Fri, 31 May 2024 09:18:17 -0400 |
4 | Subject: [PATCH] selftest-hello: add CVE_CHECK_IGNORE | 4 | Subject: [PATCH] selftest-hello: add CVE_CHECK_IGNORE |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | 5 | ||
9 | This should fail the test_cve_tag_format selftest. | 6 | This should fail the test_cve_tag_format selftest. |
10 | 7 | ||
11 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
12 | --- | 9 | --- |
13 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 3 ++- | 10 | meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 1 + |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+) |
15 | 12 | ||
16 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
17 | index 547587bef4..3ef9b87c34 100644 | 14 | index 2dc352d479e..cc103de6e2e 100644 |
18 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
20 | @@ -16,4 +16,5 @@ do_install() { | 17 | @@ -17,4 +17,5 @@ do_install() { |
21 | install -m 0755 helloworld ${D}${bindir} | 18 | install -m 0755 helloworld ${D}${bindir} |
22 | } | 19 | } |
23 | 20 | ||
24 | -BBCLASSEXTEND = "native nativesdk" | ||
25 | \ No newline at end of file | ||
26 | +CVE_CHECK_IGNORE = "CVE-2024-12345" | 21 | +CVE_CHECK_IGNORE = "CVE-2024-12345" |
27 | +BBCLASSEXTEND = "native nativesdk" | 22 | BBCLASSEXTEND = "native nativesdk" |
28 | -- | 23 | -- |
29 | 2.39.2 | 24 | 2.45.1 |
30 | 25 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.pass b/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.pass index 10f942a6eb..93a6cc91fb 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.pass +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_cve_check_ignore.pass | |||
@@ -1,31 +1,25 @@ | |||
1 | From 7d4d3fee0c7111830ee9b2b049ae3ce265b26030 Mon Sep 17 00:00:00 2001 | 1 | From f91073242268d2b2c1a1a705e7fd585679f78a59 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Simone=20Wei=C3=9F?= <simone.p.weiss@posteo.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Sat, 10 Feb 2024 13:23:56 +0100 | 3 | Date: Fri, 31 May 2024 09:18:17 -0400 |
4 | Subject: [PATCH] selftest-hello: add CVE_STATUS | 4 | Subject: [PATCH] selftest-hello: add CVE_STATUS |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | 5 | ||
9 | This should pass the test_cve_tag_format selftest. | 6 | This should pass the test_cve_tag_format selftest. |
10 | 7 | ||
11 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
12 | --- | 9 | --- |
13 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 4 +++- | 10 | meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 1 + |
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+) |
15 | 12 | ||
16 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
17 | index 547587bef4..9908b3b417 100644 | 14 | index 2dc352d479e..88c5c98608f 100644 |
18 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
20 | @@ -16,4 +16,6 @@ do_install() { | 17 | @@ -17,4 +17,5 @@ do_install() { |
21 | install -m 0755 helloworld ${D}${bindir} | 18 | install -m 0755 helloworld ${D}${bindir} |
22 | } | 19 | } |
23 | 20 | ||
24 | -BBCLASSEXTEND = "native nativesdk" | ||
25 | \ No newline at end of file | ||
26 | +CVE_STATUS[CVE-2024-12345] = "not-applicable-platform: Issue only applies on Windows" | 21 | +CVE_STATUS[CVE-2024-12345] = "not-applicable-platform: Issue only applies on Windows" |
27 | + | 22 | BBCLASSEXTEND = "native nativesdk" |
28 | +BBCLASSEXTEND = "native nativesdk" | ||
29 | -- | 23 | -- |
30 | 2.39.2 | 24 | 2.45.1 |
31 | 25 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.fail b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.fail index ab6c52c374..61b3784e3c 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.fail +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.fail | |||
@@ -1,19 +1,17 @@ | |||
1 | From f89919ea86d38404dd621521680a0162367bb965 Mon Sep 17 00:00:00 2001 | 1 | From 974c3a143bc67faaff9abcc0a06a3d5e692fc660 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Wed, 6 Sep 2023 09:09:27 -0400 | 3 | Date: Fri, 31 May 2024 11:51:15 -0400 |
4 | Subject: [PATCH] selftest-hello: update LIC_FILES_CHKSUM | 4 | Subject: [PATCH] selftest-hello: update LIC_FILES_CHKSUM |
5 | 5 | ||
6 | This test should fail the | 6 | This should fail the test_lic_files_chksum_modified_not_mentioned test. |
7 | test_metadata_lic_files_chksum.LicFilesChkSum.test_lic_files_chksum_modified_not_mentioned | ||
8 | test. | ||
9 | 7 | ||
10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
11 | --- | 9 | --- |
12 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 4 ++-- | 10 | meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 2 +- |
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 12 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
16 | index 547587bef4..65dda40aba 100644 | 14 | index 2dc352d479e..356921db1dd 100644 |
17 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
19 | @@ -1,7 +1,7 @@ | 17 | @@ -1,7 +1,7 @@ |
@@ -25,13 +23,6 @@ index 547587bef4..65dda40aba 100644 | |||
25 | 23 | ||
26 | SRC_URI = "file://helloworld.c" | 24 | SRC_URI = "file://helloworld.c" |
27 | 25 | ||
28 | @@ -16,4 +16,4 @@ do_install() { | ||
29 | install -m 0755 helloworld ${D}${bindir} | ||
30 | } | ||
31 | |||
32 | -BBCLASSEXTEND = "native nativesdk" | ||
33 | \ No newline at end of file | ||
34 | +BBCLASSEXTEND = "native nativesdk" | ||
35 | -- | 26 | -- |
36 | 2.41.0 | 27 | 2.45.1 |
37 | 28 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.pass b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.pass index 99d9f144da..b7be1e8e55 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.pass +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_modified_not_mentioned.pass | |||
@@ -1,21 +1,19 @@ | |||
1 | From f89919ea86d38404dd621521680a0162367bb965 Mon Sep 17 00:00:00 2001 | 1 | From 974c3a143bc67faaff9abcc0a06a3d5e692fc660 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Wed, 6 Sep 2023 09:09:27 -0400 | 3 | Date: Fri, 31 May 2024 11:51:15 -0400 |
4 | Subject: [PATCH] selftest-hello: update LIC_FILES_CHKSUM | 4 | Subject: [PATCH] selftest-hello: update LIC_FILES_CHKSUM |
5 | 5 | ||
6 | License-Update: Fix checksum | 6 | This should pass the test_lic_files_chksum_modified_not_mentioned test. |
7 | 7 | ||
8 | This test should pass the | 8 | License-Update: Stuff happened! |
9 | test_metadata_lic_files_chksum.LicFilesChkSum.test_lic_files_chksum_modified_not_mentioned | ||
10 | test. | ||
11 | 9 | ||
12 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
13 | --- | 11 | --- |
14 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 4 ++-- | 12 | meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 2 +- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 14 | ||
17 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 15 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
18 | index 547587bef4..65dda40aba 100644 | 16 | index 2dc352d479e..356921db1dd 100644 |
19 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 17 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
20 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
21 | @@ -1,7 +1,7 @@ | 19 | @@ -1,7 +1,7 @@ |
@@ -27,13 +25,6 @@ index 547587bef4..65dda40aba 100644 | |||
27 | 25 | ||
28 | SRC_URI = "file://helloworld.c" | 26 | SRC_URI = "file://helloworld.c" |
29 | 27 | ||
30 | @@ -16,4 +16,4 @@ do_install() { | ||
31 | install -m 0755 helloworld ${D}${bindir} | ||
32 | } | ||
33 | |||
34 | -BBCLASSEXTEND = "native nativesdk" | ||
35 | \ No newline at end of file | ||
36 | +BBCLASSEXTEND = "native nativesdk" | ||
37 | -- | 28 | -- |
38 | 2.41.0 | 29 | 2.45.1 |
39 | 30 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.fail b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.fail index e14d644bb2..a7a0b0bacb 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.fail +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.fail | |||
@@ -1,53 +1,42 @@ | |||
1 | From 66430e7c6fbd5187b66560909a510e136fed91c0 Mon Sep 17 00:00:00 2001 | 1 | From 74bc209a4fbe4da2f57e153ccfff3d2241dada8d Mon Sep 17 00:00:00 2001 |
2 | From: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 23 Feb 2017 10:34:27 -0600 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] meta: adding hello-yocto recipe | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This is a sample recipe | 6 | This should fail the test_lic_files_chksum_presence test. |
7 | 7 | ||
8 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../hello-world/hello-world/hello_world.c | 5 +++++ | 10 | .../selftest-hello-extra_1.0.bb | 20 +++++++++++++++++++ |
11 | .../hello-world/hello-world_1.0.bb | 18 ++++++++++++++++++ | 11 | 1 file changed, 20 insertions(+) |
12 | 2 files changed, 23 insertions(+) | 12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
13 | create mode 100644 meta/recipes-devtools/hello-world/hello-world/hello_world.c | ||
14 | create mode 100644 meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
15 | 13 | ||
16 | diff --git a/meta/recipes-devtools/hello-world/hello-world/hello_world.c b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
17 | new file mode 100644 | 15 | new file mode 100644 |
18 | index 0000000000..0d59f57d4c | 16 | index 00000000000..875bcbef859 |
19 | --- /dev/null | 17 | --- /dev/null |
20 | +++ b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
21 | @@ -0,0 +1,5 @@ | 19 | @@ -0,0 +1,20 @@ |
22 | +#include <stdio.h> | 20 | +SUMMARY = "This is an example summary" |
23 | + | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
24 | +int main(){ | 22 | +SECTION = "examples" |
25 | + printf("Hello World\n"); | ||
26 | +} | ||
27 | diff --git a/meta/recipes-devtools/hello-world/hello-world_1.0.bb b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
28 | new file mode 100644 | ||
29 | index 0000000000..3c990c108a | ||
30 | --- /dev/null | ||
31 | +++ b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
32 | @@ -0,0 +1,18 @@ | ||
33 | +SUMMARY = "This is a sample summary" | ||
34 | +DESCRIPTION = "This is a sample description" | ||
35 | +HOMEPAGE = "https://sample.com/this-is-a-sample" | ||
36 | +LICENSE = "MIT" | 23 | +LICENSE = "MIT" |
37 | + | 24 | + |
38 | +SRC_URI += "file://hello_world.c" | 25 | +SRC_URI = "file://helloworld.c" |
39 | + | 26 | + |
40 | +SRC_URI[md5sum] = "4ee21e9dcc9b5b6012c23038734e1632" | 27 | +S = "${WORKDIR}/sources" |
41 | +SRC_URI[sha256sum] = "edef2bbde0fbf0d88232782a0eded323f483a0519d6fde9a3b1809056fd35f3e" | 28 | +UNPACKDIR = "${S}" |
42 | + | 29 | + |
43 | +do_compile(){ | 30 | +do_compile() { |
44 | + ${CC} -o hello_world ../hello_world.c | 31 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld |
45 | +} | 32 | +} |
46 | + | 33 | + |
47 | +do_install(){ | 34 | +do_install() { |
48 | + install -d ${D}${bindir} | 35 | + install -d ${D}${bindir} |
49 | + install -m +x hello_world ${D}${bindir}/hello_world | 36 | + install -m 0755 helloworld ${D}${bindir} |
50 | +} | 37 | +} |
38 | + | ||
39 | +BBCLASSEXTEND = "native nativesdk" | ||
51 | -- | 40 | -- |
52 | 2.41.0 | 41 | 2.45.1 |
53 | 42 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.pass b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.pass index b8da16dfe5..8ffa97ec56 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.pass +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_lic_files_chksum_presence.pass | |||
@@ -1,54 +1,43 @@ | |||
1 | From 5144d2ba1aa763312c047dd5f8901368cff79da6 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 23 Feb 2017 10:34:27 -0600 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] meta: adding hello-yocto recipe | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This is a sample recipe | 6 | This should pass the test_lic_files_chksum_presence test. |
7 | 7 | ||
8 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../hello-world/hello-world/hello_world.c | 5 +++++ | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
11 | .../hello-world/hello-world_1.0.bb | 19 +++++++++++++++++++ | 11 | 1 file changed, 21 insertions(+) |
12 | 2 files changed, 24 insertions(+) | 12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
13 | create mode 100644 meta/recipes-devtools/hello-world/hello-world/hello_world.c | ||
14 | create mode 100644 meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
15 | 13 | ||
16 | diff --git a/meta/recipes-devtools/hello-world/hello-world/hello_world.c b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
17 | new file mode 100644 | 15 | new file mode 100644 |
18 | index 0000000000..0d59f57d4c | 16 | index 00000000000..f3dec1b220c |
19 | --- /dev/null | 17 | --- /dev/null |
20 | +++ b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
21 | @@ -0,0 +1,5 @@ | 19 | @@ -0,0 +1,21 @@ |
22 | +#include <stdio.h> | 20 | +SUMMARY = "This is an example summary" |
23 | + | 21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
24 | +int main(){ | 22 | +SECTION = "examples" |
25 | + printf("Hello World\n"); | ||
26 | +} | ||
27 | diff --git a/meta/recipes-devtools/hello-world/hello-world_1.0.bb b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
28 | new file mode 100644 | ||
29 | index 0000000000..44d888c82a | ||
30 | --- /dev/null | ||
31 | +++ b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
32 | @@ -0,0 +1,19 @@ | ||
33 | +SUMMARY = "This is a sample summary" | ||
34 | +DESCRIPTION = "This is a sample description" | ||
35 | +HOMEPAGE = "https://sample.com/this-is-a-sample" | ||
36 | +LICENSE = "MIT" | 23 | +LICENSE = "MIT" |
37 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
38 | + | 25 | + |
39 | +SRC_URI += "file://hello_world.c" | 26 | +SRC_URI = "file://helloworld.c" |
40 | + | 27 | + |
41 | +SRC_URI[md5sum] = "4ee21e9dcc9b5b6012c23038734e1632" | 28 | +S = "${WORKDIR}/sources" |
42 | +SRC_URI[sha256sum] = "edef2bbde0fbf0d88232782a0eded323f483a0519d6fde9a3b1809056fd35f3e" | 29 | +UNPACKDIR = "${S}" |
43 | + | 30 | + |
44 | +do_compile(){ | 31 | +do_compile() { |
45 | + ${CC} -o hello_world ../hello_world.c | 32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld |
46 | +} | 33 | +} |
47 | + | 34 | + |
48 | +do_install(){ | 35 | +do_install() { |
49 | + install -d ${D}${bindir} | 36 | + install -d ${D}${bindir} |
50 | + install -m +x hello_world ${D}${bindir}/hello_world | 37 | + install -m 0755 helloworld ${D}${bindir} |
51 | +} | 38 | +} |
39 | + | ||
40 | +BBCLASSEXTEND = "native nativesdk" | ||
52 | -- | 41 | -- |
53 | 2.41.0 | 42 | 2.45.1 |
54 | 43 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.fail b/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.fail index 983b6e0c2b..0a402d0a3e 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.fail +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.fail | |||
@@ -1,17 +1,17 @@ | |||
1 | From 4ab06b5f81455249cd5e89d2cce9863803b5ecb5 Mon Sep 17 00:00:00 2001 | 1 | From f2f7b6bcb831289bc3ba2343ad7dc5bee6d6e0cd Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 8 Sep 2023 14:41:00 -0400 | 3 | Date: Fri, 31 May 2024 08:45:41 -0400 |
4 | Subject: [PATCH] selftest-hello: remove helloworld.c | 4 | Subject: [PATCH] selftest-hello: remove helloworld.c |
5 | 5 | ||
6 | This should fail the test_src_uri_left_files selftest. | 6 | This should fail the test_src_uri_left_files selftest. |
7 | 7 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 4 +--- | 10 | meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 2 -- |
11 | 1 file changed, 1 insertion(+), 3 deletions(-) | 11 | 1 file changed, 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 13 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
14 | index 547587bef4..f6817f05bc 100644 | 14 | index 2dc352d479e..e95270adaeb 100644 |
15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 15 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 16 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
17 | @@ -3,8 +3,6 @@ SECTION = "examples" | 17 | @@ -3,8 +3,6 @@ SECTION = "examples" |
@@ -20,16 +20,9 @@ index 547587bef4..f6817f05bc 100644 | |||
20 | 20 | ||
21 | -SRC_URI = "file://helloworld.c" | 21 | -SRC_URI = "file://helloworld.c" |
22 | - | 22 | - |
23 | S = "${WORKDIR}" | 23 | S = "${WORKDIR}/sources" |
24 | UNPACKDIR = "${S}" | ||
24 | 25 | ||
25 | do_compile() { | ||
26 | @@ -16,4 +14,4 @@ do_install() { | ||
27 | install -m 0755 helloworld ${D}${bindir} | ||
28 | } | ||
29 | |||
30 | -BBCLASSEXTEND = "native nativesdk" | ||
31 | \ No newline at end of file | ||
32 | +BBCLASSEXTEND = "native nativesdk" | ||
33 | -- | 26 | -- |
34 | 2.41.0 | 27 | 2.45.1 |
35 | 28 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.pass b/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.pass index 1f1a77e581..a675c028d0 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.pass +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_src_uri_left_files.pass | |||
@@ -1,6 +1,6 @@ | |||
1 | From 6c7ac367a873bf827c19b81085c943eace917a99 Mon Sep 17 00:00:00 2001 | 1 | From e79933e2fc68570066eca66f0b599d259b7a1731 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 8 Sep 2023 14:41:00 -0400 | 3 | Date: Fri, 31 May 2024 08:18:48 -0400 |
4 | Subject: [PATCH] selftest-hello: remove helloworld.c | 4 | Subject: [PATCH] selftest-hello: remove helloworld.c |
5 | 5 | ||
6 | This should pass the test_src_uri_left_files selftest. | 6 | This should pass the test_src_uri_left_files selftest. |
@@ -8,13 +8,13 @@ This should pass the test_src_uri_left_files selftest. | |||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../recipes-test/selftest-hello/files/helloworld.c | 8 -------- | 10 | .../recipes-test/selftest-hello/files/helloworld.c | 8 -------- |
11 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 4 +--- | 11 | .../recipes-test/selftest-hello/selftest-hello_1.0.bb | 2 -- |
12 | 2 files changed, 1 insertion(+), 11 deletions(-) | 12 | 2 files changed, 10 deletions(-) |
13 | delete mode 100644 meta-selftest/recipes-test/selftest-hello/files/helloworld.c | 13 | delete mode 100644 meta-selftest/recipes-test/selftest-hello/files/helloworld.c |
14 | 14 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/helloworld.c b/meta-selftest/recipes-test/selftest-hello/files/helloworld.c | 15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/helloworld.c b/meta-selftest/recipes-test/selftest-hello/files/helloworld.c |
16 | deleted file mode 100644 | 16 | deleted file mode 100644 |
17 | index fc7169b7b8..0000000000 | 17 | index fc7169b7b83..00000000000 |
18 | --- a/meta-selftest/recipes-test/selftest-hello/files/helloworld.c | 18 | --- a/meta-selftest/recipes-test/selftest-hello/files/helloworld.c |
19 | +++ /dev/null | 19 | +++ /dev/null |
20 | @@ -1,8 +0,0 @@ | 20 | @@ -1,8 +0,0 @@ |
@@ -27,7 +27,7 @@ index fc7169b7b8..0000000000 | |||
27 | - return 0; | 27 | - return 0; |
28 | -} | 28 | -} |
29 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 29 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
30 | index 547587bef4..f6817f05bc 100644 | 30 | index 2dc352d479e..e95270adaeb 100644 |
31 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 31 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
32 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 32 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
33 | @@ -3,8 +3,6 @@ SECTION = "examples" | 33 | @@ -3,8 +3,6 @@ SECTION = "examples" |
@@ -36,16 +36,9 @@ index 547587bef4..f6817f05bc 100644 | |||
36 | 36 | ||
37 | -SRC_URI = "file://helloworld.c" | 37 | -SRC_URI = "file://helloworld.c" |
38 | - | 38 | - |
39 | S = "${WORKDIR}" | 39 | S = "${WORKDIR}/sources" |
40 | UNPACKDIR = "${S}" | ||
40 | 41 | ||
41 | do_compile() { | ||
42 | @@ -16,4 +14,4 @@ do_install() { | ||
43 | install -m 0755 helloworld ${D}${bindir} | ||
44 | } | ||
45 | |||
46 | -BBCLASSEXTEND = "native nativesdk" | ||
47 | \ No newline at end of file | ||
48 | +BBCLASSEXTEND = "native nativesdk" | ||
49 | -- | 42 | -- |
50 | 2.41.0 | 43 | 2.45.1 |
51 | 44 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.fail b/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.fail index 2d2b4e683d..1087843619 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.fail +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.fail | |||
@@ -1,46 +1,42 @@ | |||
1 | From e29da5faa74409be394caa09d9f3b7b60f8592b9 Mon Sep 17 00:00:00 2001 | 1 | From f4b72cc24f5e2a290a8637775c4d41c16d5d83aa Mon Sep 17 00:00:00 2001 |
2 | From: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 23 Feb 2017 10:34:27 -0600 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] meta: adding hello-yocto recipe | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This is a sample recipe | 6 | This should fail the test_summary_presence test. |
7 | 7 | ||
8 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | meta/recipes-devtools/hello-world/hello-world/hello_world.c | 5 +++++ | 10 | .../selftest-hello-extra_1.0.bb | 20 +++++++++++++++++++ |
11 | meta/recipes-devtools/hello-world/hello-world_1.0.bb | 12 ++++++++++++ | 11 | 1 file changed, 20 insertions(+) |
12 | 2 files changed, 17 insertions(+) | 12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
13 | create mode 100644 meta/recipes-devtools/hello-world/hello-world/hello_world.c | ||
14 | create mode 100644 meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
15 | 13 | ||
16 | diff --git a/meta/recipes-devtools/hello-world/hello-world/hello_world.c b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
17 | new file mode 100644 | 15 | new file mode 100644 |
18 | index 0000000000..0d59f57d4c | 16 | index 00000000000..2dc352d479e |
19 | --- /dev/null | 17 | --- /dev/null |
20 | +++ b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
21 | @@ -0,0 +1,5 @@ | 19 | @@ -0,0 +1,20 @@ |
22 | +#include <stdio.h> | 20 | +DESCRIPTION = "Simple helloworld application -- selftest variant" |
21 | +SECTION = "examples" | ||
22 | +LICENSE = "MIT" | ||
23 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
23 | + | 24 | + |
24 | +int main(){ | 25 | +SRC_URI = "file://helloworld.c" |
25 | + printf("Hello World\n"); | ||
26 | +} | ||
27 | diff --git a/meta/recipes-devtools/hello-world/hello-world_1.0.bb b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
28 | new file mode 100644 | ||
29 | index 0000000000..c4e1359217 | ||
30 | --- /dev/null | ||
31 | +++ b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
32 | @@ -0,0 +1,12 @@ | ||
33 | +LICENSE = "CLOSED" | ||
34 | + | 26 | + |
35 | +SRC_URI += "file://hello_world.c" | 27 | +S = "${WORKDIR}/sources" |
28 | +UNPACKDIR = "${S}" | ||
36 | + | 29 | + |
37 | +do_compile(){ | 30 | +do_compile() { |
38 | + ${CC} -o hello_world ../hello_world.c | 31 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld |
39 | +} | 32 | +} |
40 | + | 33 | + |
41 | +do_install(){ | 34 | +do_install() { |
42 | + install -d ${D}${bindir} | 35 | + install -d ${D}${bindir} |
43 | + install -m +x hello_world ${D}${bindir}/hello_world | 36 | + install -m 0755 helloworld ${D}${bindir} |
44 | +} | 37 | +} |
45 | -- | 38 | + |
46 | 2.11.0 | 39 | +BBCLASSEXTEND = "native nativesdk" |
40 | -- | ||
41 | 2.45.1 | ||
42 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.pass b/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.pass index 55f0309b3f..3d35a8d8fb 100644 --- a/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.pass +++ b/meta/lib/patchtest/selftest/files/TestMetadata.test_summary_presence.pass | |||
@@ -1,49 +1,43 @@ | |||
1 | From 0cd2fed12ce4b7b071edde12aec4481ad7a6f107 Mon Sep 17 00:00:00 2001 | 1 | From 04eb94a0134ef5eb5b5fd783b303104fbfcd8437 Mon Sep 17 00:00:00 2001 |
2 | From: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 23 Feb 2017 10:34:27 -0600 | 3 | Date: Fri, 31 May 2024 11:03:47 -0400 |
4 | Subject: [PATCH] meta: adding hello-yocto recipe | 4 | Subject: [PATCH] selftest-hello: add selftest-hello-extra |
5 | 5 | ||
6 | This is a sample recipe | 6 | This should pass the test_summary_presence test. |
7 | 7 | ||
8 | Signed-off-by: Daniela Plascencia <daniela.plascencia@linux.intel.com> | 8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 9 | --- |
10 | .../hello-world/hello-world/hello_world.c | 5 +++++ | 10 | .../selftest-hello-extra_1.0.bb | 21 +++++++++++++++++++ |
11 | meta/recipes-devtools/hello-world/hello-world_1.0.bb | 15 +++++++++++++++ | 11 | 1 file changed, 21 insertions(+) |
12 | 2 files changed, 20 insertions(+) | 12 | create mode 100644 meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
13 | create mode 100644 meta/recipes-devtools/hello-world/hello-world/hello_world.c | ||
14 | create mode 100644 meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
15 | 13 | ||
16 | diff --git a/meta/recipes-devtools/hello-world/hello-world/hello_world.c b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 14 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
17 | new file mode 100644 | 15 | new file mode 100644 |
18 | index 0000000000..0d59f57d4c | 16 | index 00000000000..f3dec1b220c |
19 | --- /dev/null | 17 | --- /dev/null |
20 | +++ b/meta/recipes-devtools/hello-world/hello-world/hello_world.c | 18 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello-extra_1.0.bb |
21 | @@ -0,0 +1,5 @@ | 19 | @@ -0,0 +1,21 @@ |
22 | +#include <stdio.h> | 20 | +SUMMARY = "This is an example summary" |
21 | +DESCRIPTION = "Simple helloworld application -- selftest variant" | ||
22 | +SECTION = "examples" | ||
23 | +LICENSE = "MIT" | ||
24 | +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||
23 | + | 25 | + |
24 | +int main(){ | 26 | +SRC_URI = "file://helloworld.c" |
25 | + printf("Hello World\n"); | ||
26 | +} | ||
27 | diff --git a/meta/recipes-devtools/hello-world/hello-world_1.0.bb b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
28 | new file mode 100644 | ||
29 | index 0000000000..c54283eece | ||
30 | --- /dev/null | ||
31 | +++ b/meta/recipes-devtools/hello-world/hello-world_1.0.bb | ||
32 | @@ -0,0 +1,15 @@ | ||
33 | +SUMMARY = "This is a sample summary" | ||
34 | +DESCRIPTION = "This is a sample description" | ||
35 | +HOMEPAGE = "https://sample.com/this-is-a-sample" | ||
36 | +LICENSE = "CLOSED" | ||
37 | + | 27 | + |
38 | +SRC_URI += "file://hello_world.c" | 28 | +S = "${WORKDIR}/sources" |
29 | +UNPACKDIR = "${S}" | ||
39 | + | 30 | + |
40 | +do_compile(){ | 31 | +do_compile() { |
41 | + ${CC} -o hello_world ../hello_world.c | 32 | + ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld |
42 | +} | 33 | +} |
43 | + | 34 | + |
44 | +do_install(){ | 35 | +do_install() { |
45 | + install -d ${D}${bindir} | 36 | + install -d ${D}${bindir} |
46 | + install -m +x hello_world ${D}${bindir}/hello_world | 37 | + install -m 0755 helloworld ${D}${bindir} |
47 | +} | 38 | +} |
48 | -- | 39 | + |
49 | 2.11.0 | 40 | +BBCLASSEXTEND = "native nativesdk" |
41 | -- | ||
42 | 2.45.1 | ||
43 | |||
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail index c763a7506e..f64f2a40b0 100644 --- a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail +++ b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.fail | |||
@@ -1,29 +1,31 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | CVE: CVE-BAD-FORMAT | 6 | This should fail the test_cve_tag_format test. |
7 | |||
8 | CVE: CVE-1234-56789 | ||
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
24 | +Subject: [PATCH] Fix CVE-NOT-REAL | 26 | +Subject: [PATCH] Fix CVE-NOT-REAL |
25 | + | 27 | + |
26 | +CVE: CVE-BAD-FORMAT | 28 | +CVE: CVE-BAD_FORMAT |
27 | +Upstream-Status: Backport(http://example.com/example) | 29 | +Upstream-Status: Backport(http://example.com/example) |
28 | + | 30 | + |
29 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 31 | +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -56,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
56 | 56 | ||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass index ef6017037c..3819487041 100644 --- a/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass +++ b/meta/lib/patchtest/selftest/files/TestPatch.test_cve_tag_format.pass | |||
@@ -1,23 +1,25 @@ | |||
1 | From 35ccee3cee96fb29514475279248078d88907231 Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should pass the test_cve_tag format test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../files/0001-Fix-CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..9219b8db62 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,19 +37,17 @@ index 0000000000..9219b8db62 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | ||
39 | + | ||
40 | + printf("%d\n", str_len(string1)); | ||
41 | + printf("%d\n", str_len(string2)); | ||
42 | ++ printf("CVE FIXED!!!\n"); | ||
43 | + | ||
44 | + return 0; | ||
45 | + } | ||
46 | +-- | ||
47 | +2.41.0 | ||
48 | + | 40 | + |
41 | +int main() { | ||
42 | + | ||
43 | + printf("%d\n", str_len(string1)); | ||
44 | + printf("%d\n", str_len(string2)); | ||
45 | + printf("CVE FIXED!!!\n"); | ||
46 | + | ||
47 | + return 0; | ||
48 | +} | ||
49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
53 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -56,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
56 | 56 | ||
57 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
58 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
59 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
60 | + " | 60 | + " |
61 | |||
62 | S = "${WORKDIR}" | ||
63 | |||
64 | @@ -16,4 +18,4 @@ do_install() { | ||
65 | install -m 0755 helloworld ${D}${bindir} | ||
66 | } | ||
67 | 61 | ||
68 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
69 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
70 | +BBCLASSEXTEND = "native nativesdk" | ||
71 | -- | 64 | -- |
72 | 2.41.0 | 65 | 2.45.1 |
73 | 66 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail index ce8bf7b7d1..b2d0fab9e3 100644 --- a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail +++ b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.fail | |||
@@ -1,23 +1,25 @@ | |||
1 | From 5a2d0ac780a0f4c046fb1a3c3463d3e726f191cb Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should fail the test_signed_off_by_presence test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../selftest-hello/files/CVE-1234-56789.patch | 26 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 25 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 30 insertions(+), 2 deletions(-) | 14 | 2 files changed, 28 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..92a5b65a53 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,26 @@ | 22 | @@ -0,0 +1,25 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -34,18 +36,17 @@ index 0000000000..92a5b65a53 | |||
34 | +index 1788f38..83d7918 100644 | 36 | +index 1788f38..83d7918 100644 |
35 | +--- a/strlen.c | 37 | +--- a/strlen.c |
36 | ++++ b/strlen.c | 38 | ++++ b/strlen.c |
37 | +@@ -8,6 +8,7 @@ int main() { | 39 | + |
38 | + | 40 | +int main() { |
39 | + printf("%d\n", str_len(string1)); | 41 | + |
40 | + printf("%d\n", str_len(string2)); | 42 | + printf("%d\n", str_len(string1)); |
41 | ++ printf("CVE FIXED!!!\n"); | 43 | + printf("%d\n", str_len(string2)); |
42 | + | 44 | + printf("CVE FIXED!!!\n"); |
43 | + return 0; | 45 | + |
44 | + } | 46 | + return 0; |
45 | +-- | 47 | +} |
46 | +2.41.0 | ||
47 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 48 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
48 | index 547587bef4..76975a6729 100644 | 49 | index 2dc352d479e..d937759f157 100644 |
49 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
50 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
51 | @@ -3,7 +3,9 @@ SECTION = "examples" | 52 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -54,18 +55,11 @@ index 547587bef4..76975a6729 100644 | |||
54 | 55 | ||
55 | -SRC_URI = "file://helloworld.c" | 56 | -SRC_URI = "file://helloworld.c" |
56 | +SRC_URI = "file://helloworld.c \ | 57 | +SRC_URI = "file://helloworld.c \ |
57 | + file://CVE-1234-56789.patch \ | 58 | + file://0001-Fix-CVE-1234-56789.patch \ |
58 | + " | 59 | + " |
59 | |||
60 | S = "${WORKDIR}" | ||
61 | |||
62 | @@ -16,4 +18,4 @@ do_install() { | ||
63 | install -m 0755 helloworld ${D}${bindir} | ||
64 | } | ||
65 | 60 | ||
66 | -BBCLASSEXTEND = "native nativesdk" | 61 | S = "${WORKDIR}/sources" |
67 | \ No newline at end of file | 62 | UNPACKDIR = "${S}" |
68 | +BBCLASSEXTEND = "native nativesdk" | ||
69 | -- | 63 | -- |
70 | 2.41.0 | 64 | 2.45.1 |
71 | 65 | ||
diff --git a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass index ea34c76f0d..2661c1416f 100644 --- a/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass +++ b/meta/lib/patchtest/selftest/files/TestPatch.test_signed_off_by_presence.pass | |||
@@ -1,23 +1,25 @@ | |||
1 | From 14d72f6973270f78455a8628143f2cff90e8f41e Mon Sep 17 00:00:00 2001 | 1 | From c9519f11502d5bb5c143ed43b4c981b6a211bdf9 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 29 Aug 2023 14:12:27 -0400 | 3 | Date: Fri, 31 May 2024 09:54:50 -0400 |
4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 | 4 | Subject: [PATCH] selftest-hello: fix CVE-1234-56789 |
5 | 5 | ||
6 | This should pass the test_signed_off_by_presence test. | ||
7 | |||
6 | CVE: CVE-1234-56789 | 8 | CVE: CVE-1234-56789 |
7 | 9 | ||
8 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 10 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
9 | --- | 11 | --- |
10 | .../selftest-hello/files/CVE-1234-56789.patch | 27 +++++++++++++++++++ | 12 | .../files/0001-Fix-CVE-1234-56789.patch | 26 +++++++++++++++++++ |
11 | .../selftest-hello/selftest-hello_1.0.bb | 6 +++-- | 13 | .../selftest-hello/selftest-hello_1.0.bb | 4 ++- |
12 | 2 files changed, 31 insertions(+), 2 deletions(-) | 14 | 2 files changed, 29 insertions(+), 1 deletion(-) |
13 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 15 | create mode 100644 meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
14 | 16 | ||
15 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 17 | diff --git a/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000000..869cfb6fe5 | 19 | index 00000000000..8a4f9329303 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/meta-selftest/recipes-test/selftest-hello/files/CVE-1234-56789.patch | 21 | +++ b/meta-selftest/recipes-test/selftest-hello/files/0001-Fix-CVE-1234-56789.patch |
20 | @@ -0,0 +1,27 @@ | 22 | @@ -0,0 +1,26 @@ |
21 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 | 23 | +From b26a31186e6ee2eb1f506d5f2f9394d327a0df2f Mon Sep 17 00:00:00 2001 |
22 | +From: Trevor Gamblin <tgamblin@baylibre.com> | 24 | +From: Trevor Gamblin <tgamblin@baylibre.com> |
23 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 | 25 | +Date: Tue, 29 Aug 2023 14:08:20 -0400 |
@@ -35,18 +37,17 @@ index 0000000000..869cfb6fe5 | |||
35 | +index 1788f38..83d7918 100644 | 37 | +index 1788f38..83d7918 100644 |
36 | +--- a/strlen.c | 38 | +--- a/strlen.c |
37 | ++++ b/strlen.c | 39 | ++++ b/strlen.c |
38 | +@@ -8,6 +8,7 @@ int main() { | 40 | + |
39 | + | 41 | +int main() { |
40 | + printf("%d\n", str_len(string1)); | 42 | + |
41 | + printf("%d\n", str_len(string2)); | 43 | + printf("%d\n", str_len(string1)); |
42 | ++ printf("CVE FIXED!!!\n"); | 44 | + printf("%d\n", str_len(string2)); |
43 | + | 45 | + printf("CVE FIXED!!!\n"); |
44 | + return 0; | 46 | + |
45 | + } | 47 | + return 0; |
46 | +-- | 48 | +} |
47 | +2.41.0 | ||
48 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 49 | diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
49 | index 547587bef4..76975a6729 100644 | 50 | index 2dc352d479e..d937759f157 100644 |
50 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 51 | --- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
51 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb | 52 | +++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb |
52 | @@ -3,7 +3,9 @@ SECTION = "examples" | 53 | @@ -3,7 +3,9 @@ SECTION = "examples" |
@@ -55,18 +56,11 @@ index 547587bef4..76975a6729 100644 | |||
55 | 56 | ||
56 | -SRC_URI = "file://helloworld.c" | 57 | -SRC_URI = "file://helloworld.c" |
57 | +SRC_URI = "file://helloworld.c \ | 58 | +SRC_URI = "file://helloworld.c \ |
58 | + file://CVE-1234-56789.patch \ | 59 | + file://0001-Fix-CVE-1234-56789.patch \ |
59 | + " | 60 | + " |
60 | |||
61 | S = "${WORKDIR}" | ||
62 | |||
63 | @@ -16,4 +18,4 @@ do_install() { | ||
64 | install -m 0755 helloworld ${D}${bindir} | ||
65 | } | ||
66 | 61 | ||
67 | -BBCLASSEXTEND = "native nativesdk" | 62 | S = "${WORKDIR}/sources" |
68 | \ No newline at end of file | 63 | UNPACKDIR = "${S}" |
69 | +BBCLASSEXTEND = "native nativesdk" | ||
70 | -- | 64 | -- |
71 | 2.41.0 | 65 | 2.45.1 |
72 | 66 | ||