[arch-commits] Commit in ostree/trunk (PKGBUILD unbreak-build.diff)

[Jan Steffens]

    Date: Wednesday, August 17, 2022 @ 22:10:00
  Author: heftig
Revision: 453069

2022.5-3: FS#75410 Use fuse3; replace ad-hoc patch with cherry-picks

Modified:
  ostree/trunk/PKGBUILD
Deleted:
  ostree/trunk/unbreak-build.diff

--------------------+
 PKGBUILD           |   10 ++++------
 unbreak-build.diff |   33 ---------------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-17 22:06:12 UTC (rev 453068)
+++ PKGBUILD	2022-08-17 22:10:00 UTC (rev 453069)
@@ -5,12 +5,12 @@
 pkgname=ostree
 _commit=15740d042c9c5258a1c082b5e228cf6f115edbb0  # tags/v2022.5^0
 pkgver=2022.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Operating system and container binary deployment and upgrades"
 url="https://ostreedev.github.io/ostree/"
 arch=(x86_64)
 license=(GPL)
-depends=(fuse2 glibc libgpg-error libsodium util-linux openssl xz zlib)
+depends=(fuse3 glibc libgpg-error libsodium util-linux openssl xz zlib)
 makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc
              libarchive libsoup libxslt mkinitcpio python systemd)
 checkdepends=(cpio elfutils gjs parallel python-yaml syslinux)
@@ -19,12 +19,10 @@
   "git+https://github.com/ostreedev/ostree#commit=$_commit"
   git+https://github.com/mendsley/bsdiff
   git+https://gitlab.gnome.org/GNOME/libglnx.git
-  unbreak-build.diff
 )
 b2sums=('SKIP'
         'SKIP'
-        'SKIP'
-        '6ef3bfcada9422ee43576727496947810f8123326320ae515ee1dee441d1c367bf756f76cf486ad3518c04b8e418026a2eb8dc299d55f2f188032d58f02e1fc7')
+        'SKIP')
 # upstream ticket about chain of trust:
 # https://github.com/ostreedev/ostree/issues/2349
 validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters at redhat.com>
@@ -33,7 +31,7 @@
   cd ostree
 
   # https://github.com/ostreedev/ostree/issues/2685
-  git apply -3 ../unbreak-build.diff
+  git cherry-pick -n edba4b33be10c052 0a908a180fcce98c
 
   git submodule init
   git submodule set-url bsdiff "$srcdir/bsdiff"

Deleted: unbreak-build.diff
===================================================================
--- unbreak-build.diff	2022-08-17 22:06:12 UTC (rev 453068)
+++ unbreak-build.diff	2022-08-17 22:10:00 UTC (rev 453069)
@@ -1,33 +0,0 @@
-diff --git i/src/libostree/ostree-sysroot-deploy.c w/src/libostree/ostree-sysroot-deploy.c
-index 2dc9f58b..b565129a 100644
---- i/src/libostree/ostree-sysroot-deploy.c
-+++ w/src/libostree/ostree-sysroot-deploy.c
-@@ -23,7 +23,6 @@
- #include <gio/gunixoutputstream.h>
- #include <glib-unix.h>
- #include <stdint.h>
--#include <sys/mount.h>
- #include <sys/statvfs.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-@@ -3504,7 +3503,7 @@ _ostree_sysroot_finalize_staged (OstreeSysroot *self,
-     {
-       g_autoptr(GError) writing_error = NULL;
-       g_assert_cmpint (self->boot_fd, !=, -1);
--      if (!glnx_file_replace_contents_at (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH, 
-+      if (!glnx_file_replace_contents_at (self->boot_fd, _OSTREE_FINALIZE_STAGED_FAILURE_PATH,
-                                            (guint8*)finalization_error->message, -1,
-                                            0, cancellable, &writing_error))
-         {
-diff --git i/src/ostree/ot-main.c w/src/ostree/ot-main.c
-index b7b50d67..7a4405a5 100644
---- i/src/ostree/ot-main.c
-+++ w/src/ostree/ot-main.c
-@@ -28,7 +28,6 @@
- #include <string.h>
- #include <sys/statvfs.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
- 
- #include "ot-main.h"
- #include "ostree.h"