Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ostree: refresh patches for v2022.7 #64

Merged
merged 1 commit into from
Feb 6, 2023
Merged

ostree: refresh patches for v2022.7 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...001-ostree-pull-set-request-timeout.patch → ...rl-set-a-timeout-for-an-overall-req.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
From 36939494e37b60aa0bb3db5829de3705996e92c6 Mon Sep 17 00:00:00 2001
From 35b42898a9528c4ca1c1ba8dc081d12d6d6f8047 Mon Sep 17 00:00:00 2001
From: Mike Sul <mike.sul@foundries.io>
Date: Sat, 3 Jul 2021 20:37:08 -0300
Subject: [PATCH] ostree-fetcher-curl: set a timeout for an overall request
processing

Signed-off-by: Mike Sul <mike.sul@foundries.io>
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
src/libostree/ostree-fetcher-curl.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c
index 75038ecc..2baf8f59 100644
index 522eacfb..2d058e84 100644
--- a/src/libostree/ostree-fetcher-curl.c
+++ b/src/libostree/ostree-fetcher-curl.c
@@ -931,6 +931,15 @@ initiate_next_curl_request (FetcherRequest *req,
@@ -933,6 +933,15 @@ initiate_next_curl_request (FetcherRequest *req,
rc = curl_easy_setopt (req->easy, CURLOPT_PROGRESSDATA, task);
g_assert_cmpint (rc, ==, CURLM_OK);

Expand Down
2 changes: 1 addition & 1 deletion recipes-extended/ostree/ostree_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

SRC_URI += " \
file://0001-ostree-pull-set-request-timeout.patch \
file://0001-ostree-fetcher-curl-set-a-timeout-for-an-overall-req.patch \
"

PACKAGECONFIG:append = " curl libarchive static builtin-grub2-mkconfig"
Expand Down