ostree: upgrade 2026.1 -> 2026.2

0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch
removed since it's included in 2026.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Wang Mingyu
2026-07-08 17:44:23 +08:00
committed by Khem Raj
parent df123bfb0b
commit 9a28381414
2 changed files with 1 additions and 31 deletions
@@ -1,29 +0,0 @@
From 3b8255e24d0785d6049d473471da53b0c5fd52c1 Mon Sep 17 00:00:00 2001
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Thu, 9 Apr 2026 16:28:07 -0700
Subject: [PATCH] trivial-httpd: Fix const-correctness of slash pointer
strrchr() returns a 'const char *' when passed a 'const char *'
argument. Declare the local 'slash' variable as 'const char *'
to match, fixing a build failure with clang when
-Werror,-Wincompatible-pointer-types-discards-qualifiers is active.
Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/3579]
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
src/ostree/ostree-trivial-httpd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c
index 4a0c6b00..b5a52e61 100644
--- a/src/ostree/ostree-trivial-httpd.c
+++ b/src/ostree/ostree-trivial-httpd.c
@@ -281,7 +281,7 @@ do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const
do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const char *path)
#endif
{
- char *slash;
+ const char *slash;
int ret;
struct stat stbuf;
@@ -21,9 +21,8 @@ DEPENDS = " \
GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases"
SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
file://run-ptest \
file://0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch \
"
SRC_URI[sha256sum] = "8e77c285dd6fa5ec5fb063130390977be727fe11107335ed8778a40385069e95"
SRC_URI[sha256sum] = "a281f2db631f3721ecd4b9e2779a1eaf56e2d03f2cc47629a9f0117f12016a83"
S = "${UNPACKDIR}/libostree-${PV}"