diff options
| author |   Alex Kiernan <alex.kiernan@gmail.com> | 2023-07-01 08:21:26 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-07-01 06:54:37 -0700 |
| commit | d43b337c9f41d34f78cc16fc8c3f8c7f2f61fadb (patch) | |
| tree | 8af508aae5065b91e2a94c0dc6f76baed6a0d5a8 /meta-oe/recipes-extended | |
| parent | bb4461e6ae469e33d4cda875dc35185f025291ef (diff) | |
| download | meta-openembedded-contrib-d43b337c9f41d34f78cc16fc8c3f8c7f2f61fadb.tar.gz | |
ostree: Upgrade 2023.4 -> 2023.5
Drop upstreamed __off_t patch.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2023.5.bb (renamed from meta-oe/recipes-extended/ostree/ostree_2023.4.bb) | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch b/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch deleted file mode 100644 index a64d9de5ef..0000000000 --- a/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d690ebf64ce640afce3085f01da8694a04853a9 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Tue, 20 Jun 2023 19:24:04 +0100 -Subject: [PATCH] lib/deploy: Use off_t not __off_t - -Not clear why this was __off_t which is the sole appearance in the code -base, but it breaks musl builds. - -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2896] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - src/libostree/ostree-sysroot-deploy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 8fcd5e802758..2454a5877d94 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint - /* This is a roundabout but more trustworthy way of doing a space check than - * relying on statvfs's f_bfree when you know the size of the objects. */ - static gboolean --dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error) -+dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error) - { - /* If the requested size is 0 then return early. Passing a 0 len to - * fallocate results in EINVAL */ diff --git a/meta-oe/recipes-extended/ostree/ostree_2023.4.bb b/meta-oe/recipes-extended/ostree/ostree_2023.5.bb index d2a7b04562..3028c4c92a 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2023.4.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2023.5.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-lib-deploy-Use-off_t-not-__off_t.patch \ " -SRC_URI[sha256sum] = "7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1" +SRC_URI[sha256sum] = "bc593afb31fe1ac3d50419f917fafe321a0a3561d7bb2ba498a83740fe3adb14" S = "${WORKDIR}/libostree-${PV}" |