Date: Friday, October 7, 2022 @ 22:35:01
Author: dvzrv
Revision: 457342
archrelease: copy trunk to extra-x86_64
Added:
ostree/repos/extra-x86_64/PKGBUILD
(from rev 457341, ostree/trunk/PKGBUILD)
ostree/repos/extra-x86_64/keys/
ostree/repos/extra-x86_64/ostree-2022.6-use_fuse3.patch
(from rev 457341, ostree/trunk/ostree-2022.6-use_fuse3.patch)
Deleted:
ostree/repos/extra-x86_64/PKGBUILD
ostree/repos/extra-x86_64/fusermount3.diff
ostree/repos/extra-x86_64/keys/
-------------------------------+
PKGBUILD | 166 +++++++++++++++++++---------------------
fusermount3.diff | 74 -----------------
ostree-2022.6-use_fuse3.patch | 87 ++++++++++++++++++++
3 files changed, 167 insertions(+), 160 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-07 22:34:45 UTC (rev 457341)
+++ PKGBUILD 2022-10-07 22:35:01 UTC (rev 457342)
@@ -1,86 +0,0 @@
-# Maintainer: David Runge <[email protected]>
-# Contributor: Jan Alexander Steffens (heftig) <[email protected]>
-# 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
<[email protected]>
-
-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/extra-x86_64/PKGBUILD (from rev 457341,
ostree/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-07 22:35:01 UTC (rev 457342)
@@ -0,0 +1,80 @@
+# Maintainer: David Runge <[email protected]>
+# Contributor: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+
+pkgname=ostree
+_commit=73744a3a4dfc7aa9ab183a9700273eee2f49750a # tags/v2022.6
+pkgver=2022.6
+pkgrel=1
+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#tag=$_commit
+ git+https://github.com/mendsley/bsdiff
+ git+https://gitlab.gnome.org/GNOME/libglnx.git
+ $pkgname-2022.6-use_fuse3.patch
+)
+b2sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+
'78f728dc7b6ef820a746c049076830049c5f21f56d8553ee739033591dccc55f624fe76f086e90f437107f3eb9759d574db64d511c217ad5397f9c199a4b7b58')
+# upstream ticket about chain of trust:
+# https://github.com/ostreedev/ostree/issues/2349
+validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters
<[email protected]>
+
+prepare() {
+ # use fusemount3 (fuse3)
+ patch -Np1 -d $pkgname -i ../$pkgname-2022.6-use_fuse3.patch
+
+ cd $pkgname
+ 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 $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 \
+ --enable-gtk-doc
+
+ # circumvent overlinking
+ 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";
+}
+
+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)
+
+ make DESTDIR="$pkgdir" install -C $pkgname
+}
Deleted: fusermount3.diff
===================================================================
--- fusermount3.diff 2022-10-07 22:34:45 UTC (rev 457341)
+++ fusermount3.diff 2022-10-07 22:35:01 UTC (rev 457342)
@@ -1,74 +0,0 @@
-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
Copied: ostree/repos/extra-x86_64/ostree-2022.6-use_fuse3.patch (from rev
457341, ostree/trunk/ostree-2022.6-use_fuse3.patch)
===================================================================
--- ostree-2022.6-use_fuse3.patch (rev 0)
+++ ostree-2022.6-use_fuse3.patch 2022-10-07 22:35:01 UTC (rev 457342)
@@ -0,0 +1,87 @@
+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/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
+--- i/tests/libtest.sh
++++ w/tests/libtest.sh
+@@ -685,7 +685,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 fusermount"
+
+ 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
