diff mbox series

[meta-oe,13/37] ostree: upgrade 2026.1 -> 2026.2

Message ID 20260708094508.2060-13-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe,01/37] bcc: upgrade 0.36.1 -> 0.37.0 | expand

Commit Message

Wang Mingyu July 8, 2026, 9:44 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 ...x-const-correctness-of-slash-pointer.patch | 29 -------------------
 .../{ostree_2026.1.bb => ostree_2026.2.bb}    |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch
 rename meta-oe/recipes-extended/ostree/{ostree_2026.1.bb => ostree_2026.2.bb} (97%)
diff mbox series

Patch

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
deleted file mode 100644
index cc0c3d1318..0000000000
--- a/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch
+++ /dev/null
@@ -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;
-
diff --git a/meta-oe/recipes-extended/ostree/ostree_2026.1.bb b/meta-oe/recipes-extended/ostree/ostree_2026.2.bb
similarity index 97%
rename from meta-oe/recipes-extended/ostree/ostree_2026.1.bb
rename to meta-oe/recipes-extended/ostree/ostree_2026.2.bb
index af726fff12..69df97f7ef 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2026.1.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2026.2.bb
@@ -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}"