Date: Wednesday, October 26, 2022 @ 23:09:02
Author: heftig
Revision: 459347
archrelease: copy trunk to testing-x86_64
Added:
ostree/repos/testing-x86_64/PKGBUILD
(from rev 459341, ostree/trunk/PKGBUILD)
ostree/repos/testing-x86_64/keys/
ostree/repos/testing-x86_64/ostree-2022.6-use_fuse3.patch
(from rev 459342, ostree/trunk/ostree-2022.6-use_fuse3.patch)
Deleted:
ostree/repos/testing-x86_64/PKGBUILD
ostree/repos/testing-x86_64/keys/
ostree/repos/testing-x86_64/ostree-2022.6-use_fuse3.patch
-------------------------------+
PKGBUILD | 165 +++++++++++++++++++---------------------
ostree-2022.6-use_fuse3.patch | 148 +++++++++++++++++------------------
2 files changed, 156 insertions(+), 157 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-26 23:09:02 UTC (rev 459346)
+++ PKGBUILD 2022-10-26 23:09:02 UTC (rev 459347)
@@ -1,83 +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=73744a3a4dfc7aa9ab183a9700273eee2f49750a # tags/v2022.6
-pkgver=2022.6
-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 curl)
-makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc
- libarchive 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
- ostree-2022.6-use_fuse3.patch
-)
-b2sums=('SKIP'
- 'SKIP'
- 'SKIP'
-
'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)
- git apply -3 ../ostree-2022.6-use_fuse3.patch
-
- git config --global protocol.file.allow always
- 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() {
- 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
- )
-
- cd ostree
- ./configure "${configure_options[@]}"
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-check() {
- 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 libsystemd.so)
- provides=(libostree-1.so)
-
- make DESTDIR="$pkgdir" install -C ostree
-}
Copied: ostree/repos/testing-x86_64/PKGBUILD (from rev 459341,
ostree/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-26 23:09:02 UTC (rev 459347)
@@ -0,0 +1,82 @@
+# 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=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 curl)
+makedepends=(avahi e2fsprogs git glib2 gobject-introspection gpgme gtk-doc
+ libarchive 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
+ ostree-2022.6-use_fuse3.patch
+)
+b2sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+
'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)
+ git apply -3 ../ostree-2022.6-use_fuse3.patch
+
+ git submodule init
+ git submodule set-url bsdiff "$srcdir/bsdiff"
+ git submodule set-url libglnx "$srcdir/libglnx"
+ git -c protocol.file.allow=always submodule update
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ 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
+ )
+
+ cd ostree
+ ./configure "${configure_options[@]}"
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+check() {
+ 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 libsystemd.so)
+ provides=(libostree-1.so)
+
+ make DESTDIR="$pkgdir" install -C ostree
+}
Deleted: ostree-2022.6-use_fuse3.patch
===================================================================
--- ostree-2022.6-use_fuse3.patch 2022-10-26 23:09:02 UTC (rev 459346)
+++ ostree-2022.6-use_fuse3.patch 2022-10-26 23:09:02 UTC (rev 459347)
@@ -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 5830f210..117c02c8 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 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/testing-x86_64/ostree-2022.6-use_fuse3.patch (from rev
459342, ostree/trunk/ostree-2022.6-use_fuse3.patch)
===================================================================
--- ostree-2022.6-use_fuse3.patch (rev 0)
+++ ostree-2022.6-use_fuse3.patch 2022-10-26 23:09:02 UTC (rev 459347)
@@ -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 5830f210..117c02c8 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 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
