diff options
| author | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-09 16:34:08 -0700 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-10 07:59:59 -0700 |
| commit | 69b6ae56b78ea1c9b5f11002e0e47573c22fe476 (patch) | |
| tree | d3094e8eb9649730f6a857cf9447ed16221e665e /meta-oe | |
| parent | 7127c15a0198af057c0722c346ccc33f18317a96 (diff) | |
| download | meta-openembedded-69b6ae56b78ea1c9b5f11002e0e47573c22fe476.tar.gz | |
ostree: Fix build with C23/glibc-2.43
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2025.7.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch b/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch new file mode 100644 index 0000000000..cc0c3d1318 --- /dev/null +++ b/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 3b8255e24d0785d6049d473471da53b0c5fd52c1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Thu, 9 Apr 2026 16:28:07 -0700 | ||
| 4 | Subject: [PATCH] trivial-httpd: Fix const-correctness of slash pointer | ||
| 5 | |||
| 6 | strrchr() returns a 'const char *' when passed a 'const char *' | ||
| 7 | argument. Declare the local 'slash' variable as 'const char *' | ||
| 8 | to match, fixing a build failure with clang when | ||
| 9 | -Werror,-Wincompatible-pointer-types-discards-qualifiers is active. | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/3579] | ||
| 12 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 13 | --- | ||
| 14 | src/ostree/ostree-trivial-httpd.c | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c | ||
| 18 | index 4a0c6b00..b5a52e61 100644 | ||
| 19 | --- a/src/ostree/ostree-trivial-httpd.c | ||
| 20 | +++ b/src/ostree/ostree-trivial-httpd.c | ||
| 21 | @@ -281,7 +281,7 @@ do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const | ||
| 22 | do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const char *path) | ||
| 23 | #endif | ||
| 24 | { | ||
| 25 | - char *slash; | ||
| 26 | + const char *slash; | ||
| 27 | int ret; | ||
| 28 | struct stat stbuf; | ||
| 29 | |||
diff --git a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb index a2094f68c3..363210b452 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2025.7.bb | |||
| @@ -21,6 +21,7 @@ DEPENDS = " \ | |||
| 21 | GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" | 21 | GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" |
| 22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ | 22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ |
| 23 | file://run-ptest \ | 23 | file://run-ptest \ |
| 24 | file://0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch \ | ||
| 24 | " | 25 | " |
| 25 | SRC_URI[sha256sum] = "af8d080b9585e7fd1faba8f022967e1c268ae62e20ecf32ee7b364c1e307570b" | 26 | SRC_URI[sha256sum] = "af8d080b9585e7fd1faba8f022967e1c268ae62e20ecf32ee7b364c1e307570b" |
| 26 | 27 | ||
