Skip to contentSkip to conversation

ccache: 4.9.1 -> 4.10

PATCH In review [email protected] 4 participants 7 messages Jun 12, 2024

lore
Share & tools
lore
#0 lore raw

v2 cover ccache: 4.9.1 -> 4.10

From: Robert Yang <[email protected]>

* V2
Add "License-Update:" tag

* V1
The fmt is from meta-oe, will send a patch to remove it from meta-oe after this patch is merged.

The following changes since commit 07b4c7a2bd23f8645810e13439e814caaaf9cd94:

linuxloader: add -armhf on arm only for TARGET_FPU 'hard' (2024-06-11 11:41:09 +0100)

are available in the Git repository at:

https://github.com/robertlinux/yocto rbt/ccache
https://github.com/robertlinux/yocto/tree/rbt/ccache

Robert Yang (2):
ccache: 4.9.1 -> 4.10
fmt: Add it from meta-oe for ccache 4.10

 meta/conf/distro/include/maintainers.inc      |  1 +
 .../{ccache_4.9.1.bb => ccache_4.10.bb}       | 20 ++++++----
 .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 -------------------
 meta/recipes-devtools/fmt/fmt_10.2.1.bb       | 16 ++++++++
 4 files changed, 30 insertions(+), 44 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%)
 delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
 create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb
Signature · 1 line
2.45.1
#1 lore raw

PATCH v2 1/2 ccache: 4.9.1 -> 4.10

From: Robert Yang <[email protected]>

* Remove 0001-xxhash.h-Fix-build-with-gcc-12.patch since there is no xxhash in ccache by default any more.

* License-Update:
- Update LIC_FILES_CHKSUM becaue a few third party licenses have been removed:

  $ git diff --stat v4.9.1..v4.10 LICENSE.adoc
    LICENSE.adoc | 222 +++++++++---------------------
    1 file changed, 15 insertions(+), 207 deletions(-)

And add more licenses for third party files.

* Add required recipe fmt and xxhash to DEPENDS.

* Set ENABLE_TESTING=OFF since it requires doctest which is not present in oe.

---
 .../{ccache_4.9.1.bb => ccache_4.10.bb}       | 20 ++++++----
 .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 -------------------
 2 files changed, 13 insertions(+), 44 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.9.1.bb => ccache_4.10.bb} (44%)
 delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
meta/recipes-devtools/ccache/ccache_4.10.bb renamed from meta/recipes-devtools/ccache/ccache_4.9.1.bb +13 -7
similarity index 44%
rename from meta/recipes-devtools/ccache/ccache_4.9.1.bb
rename to meta/recipes-devtools/ccache/ccache_4.10.bb
index 0d447c49158..df169b9c2b5 100644
@@ -6,15 +6,18 @@ Objective-C and Objective-C++."
 HOMEPAGE = "http://ccache.samba.org"
 SECTION = "devel"
 
-LICENSE = "GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06"
+LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=c72fa5755dc70ec5b439212d47299414 \
+                    file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=5389d9f5a88a138e42ba58894bbceeac \
+                    file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \
+                    file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \
+"
 
-DEPENDS = "zstd"
+DEPENDS = "zstd fmt xxhash"
 
-SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
-           file://0001-xxhash.h-Fix-build-with-gcc-12.patch \
-           "
-SRC_URI[sha256sum] = "12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
+
+SRC_URI[sha256sum] = "16972ba62c8499045edc3ae7d7b8a0b419a961567f5ff0f01bf5a44194204775"
 
 inherit cmake github-releases
 
@@ -24,3 +27,6 @@ BBCLASSEXTEND = "native nativesdk"
 
 PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc"
 PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis"
+
+# ENABLE_TESTING requires doctest which is not present in oe
+EXTRA_OECMAKE += "-DENABLE_TESTING=OFF"
meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch deleted +0 -37
deleted file mode 100644
index e65b8302577..00000000000
@@ -1,37 +0,0 @@
-From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Mon, 6 Jun 2022 17:53:20 +0800
-Subject: [PATCH] xxhash.h: Fix build with gcc-12
-
-Remove inline attribute to fix below build failure:
-  | /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:3932:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_sse2': function not considered for inlining
-  3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc,
-       | ^~~~~~~~~~~~~~~~~~~~~~~~
-  /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:4369:9: note: called from here
-  4369 |         f_acc512(acc,
-       |         ^~~~~~~~~~~~~
-  4370 |                  in,
-       |                  ~~~
-  4371 |                  secret + n*XXH_SECRET_CONSUME_RATE);
-
-Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720]
-
-Signed-off-by: Mingli Yu <[email protected]>
-
----
- src/third_party/xxhash.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h
-index a18e8c7..1b72307 100644
---- a/src/third_party/xxhash.h
-+++ b/src/third_party/xxhash.h
-@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
- #  define XXH_NO_INLINE static
- /* enable inlining hints */
- #elif defined(__GNUC__) || defined(__clang__)
--#  define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused))
-+#  define XXH_FORCE_INLINE static
- #  define XXH_NO_INLINE static __attribute__((noinline))
- #elif defined(_MSC_VER)  /* Visual Studio */
- #  define XXH_FORCE_INLINE static __forceinline
Signature · 1 line
2.45.1
#2 lore raw

Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v2-1-2-ccache-4.9.1---4.10.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#3 lore raw

Re: Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10

Quoted 8 lines · On 6/12/24 13:50, [email protected] wrote:

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v2-1-2-ccache-4.9.1---4.10.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

I did add "License-Update:" in V2:

* License-Update:
- Update LIC_FILES_CHKSUM becaue a few third party licenses have been
removed:

      $ git diff --stat v4.9.1..v4.10 LICENSE.adoc
        LICENSE.adoc | 222 +++++++++---------------------
        1 file changed, 15 insertions(+), 207 deletions(-)

And add more licenses for third party files.

// Robert

Quoted 35 lines

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#4 lore raw

RE: [OE-core] Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10

Quoted 29 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Robert Yang via lists.openembedded.org
Sent: den 12 juni 2024 07:54
To: [email protected]
Cc: [email protected]
Subject: Re: [OE-core] Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10

Quoted 6 lines · On 6/12/24 13:50, [email protected] wrote:

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v2-1-2-ccache-4.9.1---

4.10.patch

Quoted 2 lines

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM

changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

I did add "License-Update:" in V2:

* License-Update:
- Update LIC_FILES_CHKSUM becaue a few third party licenses have
been
removed:

Quoted 7 lines
       $ git diff --stat v4.9.1..v4.10 LICENSE.adoc
         LICENSE.adoc | 222 +++++++++---------------------
         1 file changed, 15 insertions(+), 207 deletions(-)

And add more licenses for third party files.

// Robert

I believe it is expected to be at the start of the line, i.e., as a Git trailer (similar to, e.g., Signed-off-by).

//Peter

Quoted 53 lines
Quoted 3 lines

PASS: pretest src uri left files

(test_metadata.TestMetadata.pretest_src_uri_left_files)

Quoted 1 line

PASS: test CVE check ignore

(test_metadata.TestMetadata.test_cve_check_ignore)

Quoted 1 line

PASS: test Signed-off-by presence

(test_mbox.TestMbox.test_signed_off_by_presence)

Quoted 2 lines

PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence

(test_mbox.TestMbox.test_commit_message_presence)

Quoted 1 line

PASS: test max line length

(test_metadata.TestMetadata.test_max_line_length)

Quoted 5 lines

PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files

(test_metadata.TestMetadata.test_src_uri_left_files)

Quoted 2 lines

SKIP: pretest pylint: No python related patches, skipping test

(test_python_pylint.PyLint.pretest_pylint)

Quoted 1 line

SKIP: test CVE tag format: No new CVE patches introduced

(test_patch.TestPatch.test_cve_tag_format)

Quoted 1 line

SKIP: test Signed-off-by presence: No new CVE patches introduced

(test_patch.TestPatch.test_signed_off_by_presence)

Quoted 1 line

SKIP: test Upstream-Status presence: No new CVE patches introduced

(test_patch.TestPatch.test_upstream_status_presence_format)

Quoted 1 line

SKIP: test bugzilla entry format: No bug ID found

(test_mbox.TestMbox.test_bugzilla_entry_format)

Quoted 1 line

SKIP: test lic files chksum presence: No added recipes, skipping test

(test_metadata.TestMetadata.test_lic_files_chksum_presence)

Quoted 1 line

SKIP: test license presence: No added recipes, skipping test

(test_metadata.TestMetadata.test_license_presence)

Quoted 1 line

SKIP: test pylint: No python related patches, skipping test

(test_python_pylint.PyLint.test_pylint)

Quoted 1 line

SKIP: test series merge on head: Merge test is disabled for now

(test_mbox.TestMbox.test_series_merge_on_head)

Quoted 1 line

SKIP: test summary presence: No added recipes, skipping test

(test_metadata.TestMetadata.test_summary_presence)

Quoted 1 line

SKIP: test target mailing list: Series merged, no reason to check other

mailing lists (test_mbox.TestMbox.test_target_mailing_list)

Quoted 11 lines

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#5 lore raw

Re: [OE-core] Patchtest results for [PATCH v2 1/2] ccache: 4.9.1 -> 4.10

Quoted 38 lines · Peter Kjellerstedt via lists.openembedded.org
Quoted 38 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Robert Yang via lists.openembedded.org
Sent: den 12 juni 2024 07:54
To: [email protected]
Cc: [email protected]
Subject: Re: [OE-core] Patchtest results for [PATCH v2 1/2] ccache:
4.9.1
-> 4.10

Quoted 6 lines · On 6/12/24 13:50, [email protected] wrote:

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v2-1-2-ccache-4.9.1---

4.10.patch

Quoted 3 lines

FAIL: test lic files chksum modified not mentioned:
LIC_FILES_CHKSUM

changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_ment ioned)

I did add "License-Update:" in V2:

     * License-Update:
       - Update LIC_FILES_CHKSUM becaue a few third party licenses have
been
removed:

       $ git diff --stat v4.9.1..v4.10 LICENSE.adoc
         LICENSE.adoc | 222 +++++++++---------------------
         1 file changed, 15 insertions(+), 207 deletions(-)
Quoted 7 lines
Quoted 3 lines

       And add more licenses for third party files.

// Robert

I believe it is expected to be at the start of the line, i.e., as a Git trailer
(similar to, e.g., Signed-off-by).

I think we can relax the constraint for Lincense-Update a little, the main point is that it gets mentioned somewhere in the commit.

Cheers,

Richard

#6 lore raw

PATCH v2 2/2 fmt: Add it from meta-oe for ccache 4.10

In reply to [email protected]

From: Robert Yang <[email protected]>

It is required by ccache 4.10, from cmake/Dependencies.cmake:
find_package(Fmt 8.0.0 MODULE REQUIRED)

---
 meta/conf/distro/include/maintainers.inc |  1 +
 meta/recipes-devtools/fmt/fmt_10.2.1.bb  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 meta/recipes-devtools/fmt/fmt_10.2.1.bb
meta/conf/distro/include/maintainers.inc +1 -0
index 2977ca54f1e..42599267c1c 100644
@@ -176,6 +176,7 @@ RECIPE_MAINTAINER:pn-file = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-findutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker <[email protected]>"
 RECIPE_MAINTAINER:pn-flex = "Chen Qi <[email protected]>"
+RECIPE_MAINTAINER:pn-fmt = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER:pn-font-alias = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-font-util = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-fontconfig = "Ross Burton <[email protected]>"
meta/recipes-devtools/fmt/fmt_10.2.1.bb new file +16 -0
new file mode 100644
index 00000000000..1437eb48034
@@ -0,0 +1,16 @@
+SUMMARY = "open-source formatting library for C++"
+DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
+HOMEPAGE = "https://fmt.dev"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
+
+SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https"
+SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.45.1