Date: Wednesday, August 3, 2022 @ 14:25:32 Author: heftig Revision: 452013
2022.5-2: fix build with current glibc Added: ostree/trunk/unbreak-build.diff Modified: ostree/trunk/PKGBUILD --------------------+ PKGBUILD | 25 ++++++++++++++++--------- unbreak-build.diff | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-03 13:55:50 UTC (rev 452012) +++ PKGBUILD 2022-08-03 14:25:32 UTC (rev 452013) @@ -2,11 +2,10 @@ # Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> # Contributor: Mirco Tischler <mt-ml at gmx dot de> -_name=libostree pkgname=ostree -_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^{} +_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^0 pkgver=2022.5 -pkgrel=1 +pkgrel=2 pkgdesc="Operating system and container binary deployment and upgrades" url="https://ostreedev.github.io/ostree/" arch=(x86_64) @@ -15,21 +14,27 @@ makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc libarchive libsoup libxslt mkinitcpio python systemd) checkdepends=(cpio elfutils gjs parallel python-yaml syslinux) +options=(debug) source=( - git+https://github.com/ostreedev/ostree#commit=$_commit + "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') + 'SKIP' + '6ef3bfcada9422ee43576727496947810f8123326320ae515ee1dee441d1c367bf756f76cf486ad3518c04b8e418026a2eb8dc299d55f2f188032d58f02e1fc7') # upstream ticket about chain of trust: # https://github.com/ostreedev/ostree/issues/2349 validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walt...@redhat.com> prepare() { - cd $pkgname + cd ostree + # https://github.com/ostreedev/ostree/issues/2685 + git apply -3 ../unbreak-build.diff + git submodule init git submodule set-url bsdiff "$srcdir/bsdiff" git submodule set-url libglnx "$srcdir/libglnx" @@ -39,7 +44,7 @@ } build() { - cd $pkgname + cd ostree ./configure \ --prefix=/usr \ @@ -63,7 +68,8 @@ } check() { - make check -k -C $pkgname || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313" + cd ostree + make check -k || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313" } package() { @@ -72,5 +78,6 @@ libgpgme.so libsoup-2.4.so libsystemd.so) provides+=(libostree-1.so) - make DESTDIR="$pkgdir" install -C $pkgname + cd ostree + make DESTDIR="$pkgdir" install } Added: unbreak-build.diff =================================================================== --- unbreak-build.diff (rev 0) +++ unbreak-build.diff 2022-08-03 14:25:32 UTC (rev 452013) @@ -0,0 +1,33 @@ +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"