Date: Friday, August 19, 2022 @ 18:19:23 Author: heftig Revision: 454056
archrelease: copy trunk to testing-x86_64 Added: ostree/repos/testing-x86_64/PKGBUILD (from rev 454054, ostree/trunk/PKGBUILD) ostree/repos/testing-x86_64/fusermount3.diff (from rev 454054, ostree/trunk/fusermount3.diff) ostree/repos/testing-x86_64/keys/ Deleted: ostree/repos/testing-x86_64/PKGBUILD ostree/repos/testing-x86_64/keys/ ------------------+ PKGBUILD | 167 +++++++++++++++++++++++++++-------------------------- fusermount3.diff | 74 +++++++++++++++++++++++ 2 files changed, 160 insertions(+), 81 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-08-19 18:19:22 UTC (rev 454055) +++ PKGBUILD 2022-08-19 18:19:23 UTC (rev 454056) @@ -1,81 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Mirco Tischler <mt-ml at gmx dot de> - -pkgname=ostree -_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^0 -pkgver=2022.5 -pkgrel=3 -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) -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/mendsley/bsdiff - git+https://gitlab.gnome.org/GNOME/libglnx.git -) -b2sums=('SKIP' - 'SKIP' - 'SKIP') -# upstream ticket about chain of trust: -# https://github.com/ostreedev/ostree/issues/2349 -validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walt...@redhat.com> - -prepare() { - cd ostree - - # https://github.com/ostreedev/ostree/issues/2685 - git cherry-pick -n edba4b33be10c052 0a908a180fcce98c - - git submodule init - git submodule set-url bsdiff "$srcdir/bsdiff" - git submodule set-url libglnx "$srcdir/libglnx" - git submodule update - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd ostree - - ./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 \ - --enable-gtk-doc - - # circumvent overlinking - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd ostree - make check -k || 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) - provides+=(libostree-1.so) - - cd ostree - make DESTDIR="$pkgdir" install -} Copied: ostree/repos/testing-x86_64/PKGBUILD (from rev 454054, ostree/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-08-19 18:19:23 UTC (rev 454056) @@ -0,0 +1,86 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Mirco Tischler <mt-ml at gmx dot de> + +pkgname=ostree +_commit=15740d042c9c5258a1c082b5e228cf6f115edbb0 # tags/v2022.5^0 +pkgver=2022.5 +pkgrel=4 +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) +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/mendsley/bsdiff + git+https://gitlab.gnome.org/GNOME/libglnx.git + fusermount3.diff +) +b2sums=('SKIP' + 'SKIP' + 'SKIP' + '58993607327ef5408472b410f4bc05dfe9e65ddc3afc875fa28ab16cdc42f999ff63012b794905b0f90ba5a0680d5a8115923484465ddcaa7d5287666e4f71e8') +# upstream ticket about chain of trust: +# https://github.com/ostreedev/ostree/issues/2349 +validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walt...@redhat.com> + +prepare() { + cd ostree + + # https://github.com/ostreedev/ostree/issues/2685 + git cherry-pick -n edba4b33be10c052 0a908a180fcce98c + + # Use fusermount3 + git apply -3 ../fusermount3.diff + + git submodule init + git submodule set-url bsdiff "$srcdir/bsdiff" + git submodule set-url libglnx "$srcdir/libglnx" + git submodule update + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd ostree + + ./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 \ + --enable-gtk-doc + + # circumvent overlinking + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd ostree + make check -k || 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) + provides+=(libostree-1.so) + + cd ostree + make DESTDIR="$pkgdir" install +} Copied: ostree/repos/testing-x86_64/fusermount3.diff (from rev 454054, ostree/trunk/fusermount3.diff) =================================================================== --- fusermount3.diff (rev 0) +++ fusermount3.diff 2022-08-19 18:19:23 UTC (rev 454056) @@ -0,0 +1,74 @@ +diff --git i/docs/buildsystem-and-repos.md w/docs/buildsystem-and-repos.md +index e265ee7a..2e9250d5 100644 +--- i/docs/buildsystem-and-repos.md ++++ w/docs/buildsystem-and-repos.md +@@ -151,7 +151,7 @@ rofiles-fuse exampleos-build mnt + # Now run global "triggers", generate cache files: + ldconfig -r mnt + (Insert other programs here) +-fusermount -u mnt ++fusermount3 -u mnt + ostree --repo=build-repo commit -b exampleos/x86_64/standard --link-checkout-speedup exampleos-build + ``` + +diff --git i/man/rofiles-fuse.xml w/man/rofiles-fuse.xml +index f4d23739..e8569130 100644 +--- i/man/rofiles-fuse.xml ++++ w/man/rofiles-fuse.xml +@@ -89,7 +89,7 @@ $ mkdir mnt/anewdir + $ rm mnt/someoriginalcontent -rf + + # Commit and cleanup +-$ fusermount -u mnt ++$ fusermount3 -u mnt + $ 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/tests/libtest.sh w/tests/libtest.sh +index 686f08dc..10cc5a63 100755 +--- i/tests/libtest.sh ++++ w/tests/libtest.sh +@@ -635,7 +635,7 @@ skip_one_without_strace_fault_injection() { + } + + skip_without_fuse () { +- fusermount --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" +diff --git i/tests/test-demo-buildsystem.sh w/tests/test-demo-buildsystem.sh +index 2dc78dc3..50995b87 100755 +--- i/tests/test-demo-buildsystem.sh ++++ w/tests/test-demo-buildsystem.sh +@@ -55,7 +55,7 @@ exampleos_recompose() { + # Now that we have our rootfs, run triggers + rofiles-fuse exampleos-build mnt + demo_triggers mnt/ +- fusermount -u mnt ++ fusermount3 -u mnt + + # Then we commit it, using --link-checkout-speedup to effectively + # only re-checksum the ldconfig file. We also have dummy commit +diff --git i/tests/test-rofiles-fuse.sh w/tests/test-rofiles-fuse.sh +index a56a76c6..c61945d6 100755 +--- i/tests/test-rofiles-fuse.sh ++++ w/tests/test-rofiles-fuse.sh +@@ -37,7 +37,7 @@ $OSTREE checkout -H test2 checkout-test2 + + rofiles-fuse checkout-test2 mnt + cleanup_fuse() { +- fusermount -u ${test_tmpdir}/mnt || true ++ fusermount3 -u ${test_tmpdir}/mnt || true + } + libtest_exit_cmds+=(cleanup_fuse) + assert_file_has_content mnt/firstfile first +@@ -133,7 +133,7 @@ echo "ok flock" + + copyup_reset() { + cd ${test_tmpdir} +- fusermount -u mnt ++ fusermount3 -u mnt + rm checkout-test2 -rf + $OSTREE checkout -H test2 checkout-test2 + rofiles-fuse --copyup checkout-test2 mnt