Date: Tuesday, October 25, 2022 @ 19:50:16 Author: heftig Revision: 458991
2022.6-2: use curl to avoid soup conflicts Modified: ostree/trunk/PKGBUILD ostree/trunk/ostree-2022.6-use_fuse3.patch -------------------------------+ PKGBUILD | 57 +++++++++++++++++++++------------------- ostree-2022.6-use_fuse3.patch | 17 +---------- 2 files changed, 32 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-25 19:31:52 UTC (rev 458990) +++ PKGBUILD 2022-10-25 19:50:16 UTC (rev 458991) @@ -5,14 +5,14 @@ pkgname=ostree _commit=73744a3a4dfc7aa9ab183a9700273eee2f49750a # tags/v2022.6 pkgver=2022.6 -pkgrel=1 +pkgrel=2 pkgdesc="Operating system and container binary deployment and upgrades" url="https://ostreedev.github.io/ostree/"; arch=(x86_64) license=(GPL) -depends=(fuse3 glibc libgpg-error libsodium util-linux openssl xz zlib) +depends=(fuse3 glibc libgpg-error libsodium util-linux openssl xz zlib curl) makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc -libarchive libsoup libxslt mkinitcpio python systemd) + libarchive libxslt mkinitcpio python systemd) checkdepends=(cpio elfutils gjs parallel python-yaml syslinux) options=(debug) source=( @@ -19,21 +19,23 @@ git+https://github.com/ostreedev/ostree#tag=$_commit git+https://github.com/mendsley/bsdiff git+https://gitlab.gnome.org/GNOME/libglnx.git - $pkgname-2022.6-use_fuse3.patch + ostree-2022.6-use_fuse3.patch ) b2sums=('SKIP' 'SKIP' 'SKIP' - '78f728dc7b6ef820a746c049076830049c5f21f56d8553ee739033591dccc55f624fe76f086e90f437107f3eb9759d574db64d511c217ad5397f9c199a4b7b58') + '82a8f557f4f21a0a769709c8e2ffb9165a8f3ad60e2d9b6722f3d06a34b102a22cd137f77530e6dc9d84a9dcdf429c5907653022f07f368c2bb2703711aab435') # upstream ticket about chain of trust: # https://github.com/ostreedev/ostree/issues/2349 validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <[email protected]> prepare() { + cd ostree + # use fusemount3 (fuse3) - patch -Np1 -d $pkgname -i ../$pkgname-2022.6-use_fuse3.patch + git apply -3 ../ostree-2022.6-use_fuse3.patch - cd $pkgname + git config --global protocol.file.allow always git submodule init git submodule set-url bsdiff "$srcdir/bsdiff" git submodule set-url libglnx "$srcdir/libglnx" @@ -43,38 +45,39 @@ } build() { - cd $pkgname - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --with-builtin-grub2-mkconfig \ - --with-ed25519-libsodium \ - --with-dracut \ - --with-mkinitcpio \ - --with-openssl \ - --enable-experimental-api \ - --disable-static \ + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --localstatedir=/var + --sbindir=/usr/bin + --libexecdir=/usr/lib + --disable-static + --enable-experimental-api --enable-gtk-doc + --with-builtin-grub2-mkconfig + --with-curl + --with-dracut + --with-ed25519-libsodium + --with-mkinitcpio + --with-openssl + --without-soup + ) - # circumvent overlinking + cd ostree + ./configure "${configure_options[@]}" sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make } check() { - make check -k -C $pkgname || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313"; + make check -k -C ostree || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313"; } package() { depends+=(libarchive.so libavahi-client.so libavahi-common.so libavahi-glib.so libgio-2.0.so libglib-2.0.so libgobject-2.0.so - libgpgme.so libsoup-2.4.so libsystemd.so) + libgpgme.so libsystemd.so) provides=(libostree-1.so) - make DESTDIR="$pkgdir" install -C $pkgname + make DESTDIR="$pkgdir" install -C ostree } Modified: ostree-2022.6-use_fuse3.patch =================================================================== --- ostree-2022.6-use_fuse3.patch 2022-10-25 19:31:52 UTC (rev 458990) +++ ostree-2022.6-use_fuse3.patch 2022-10-25 19:50:16 UTC (rev 458991) @@ -24,21 +24,8 @@ $ ostree --repo=repo commit --link-checkout-speedup -b somebranch -s 'Commit new content' --tree=dir=branch-checkout $ rm mnt branch-checkout -rf </programlisting> -diff --git i/src/rofiles-fuse/README.md w/src/rofiles-fuse/README.md -index 1f18afcc..42bfd3b2 100644 ---- i/src/rofiles-fuse/README.md -+++ w/src/rofiles-fuse/README.md -@@ -41,7 +41,7 @@ rename it atomically over the old one, it will work: - - Let's unmount: - -- $ fusermount -u /srv/backups/mnt -+ $ fusermount3 -u /srv/backups/mnt - - Now we have two directories `/srv/backups/20150410` - `/srv/backups/20150411` which share all file storage except for the diff --git i/tests/libtest.sh w/tests/libtest.sh -index 5830f210..2beb3841 100755 +index 5830f210..117c02c8 100755 --- i/tests/libtest.sh +++ w/tests/libtest.sh @@ -685,7 +685,7 @@ skip_one_without_strace_fault_injection() { @@ -46,7 +33,7 @@ skip_without_fuse () { - fusermount --version >/dev/null 2>&1 || skip "no fusermount" -+ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount" ++ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3" capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \ skip "No cap_sys_admin in bounding set, can't use FUSE"
