Date: Friday, March 17, 2023 @ 00:35:32
Author: heftig
Revision: 471039
2023.1-2: add fixes for glib 2.76
Added:
ostree/trunk/ostree-2023.1-use_fuse3.patch
(from rev 471038, ostree/trunk/ostree-2022.6-use_fuse3.patch)
Modified:
ostree/trunk/PKGBUILD
Deleted:
ostree/trunk/ostree-2022.6-use_fuse3.patch
-------------------------------+
PKGBUILD | 16 +++++---
ostree-2022.6-use_fuse3.patch | 74 ----------------------------------------
ostree-2023.1-use_fuse3.patch | 74 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-17 00:19:30 UTC (rev 471038)
+++ PKGBUILD 2023-03-17 00:35:32 UTC (rev 471039)
@@ -5,7 +5,7 @@
pkgname=ostree
_commit=eaebbabf9c4f8c870f2d4daaa74762d4dc12f92b # tags/v2023.1
pkgver=2023.1
-pkgrel=1
+pkgrel=2
pkgdesc="Operating system and container binary deployment and upgrades"
url="https://ostreedev.github.io/ostree/";
arch=(x86_64)
@@ -35,12 +35,12 @@
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
+ $pkgname-2023.1-use_fuse3.patch
)
b2sums=('SKIP'
'SKIP'
'SKIP'
-
'82a8f557f4f21a0a769709c8e2ffb9165a8f3ad60e2d9b6722f3d06a34b102a22cd137f77530e6dc9d84a9dcdf429c5907653022f07f368c2bb2703711aab435')
+
'cfff162120f70995e18ec56454711501391b97456e2a0f34643c9d2a9c2b50b4d76afc2e2fc50ea28e8a773c618215d6cb855b96663f69dc5cc93bc5766f3f28')
# upstream ticket about chain of trust:
# https://github.com/ostreedev/ostree/issues/2349
validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters
<[email protected]>
@@ -48,12 +48,16 @@
prepare() {
cd $pkgname
+ # Fixes for GLib 2.76
+ git cherry-pick -n 376c9d7effa01fa020711a3f12829fe9b18b8bca \
+ 813c439352297622e74a288aadf3cd700d19bc2f
+
+ # use fusemount3 (fuse3)
+ git apply -3 ../$pkgname-2023.1-use_fuse3.patch
+
# remove failing test: https://github.com/ostreedev/ostree/issues/2790
sed -e '/test-signed-pull-summary.sh/d' -i Makefile-tests.am
- # use fusemount3 (fuse3)
- git apply -3 ../$pkgname-2022.6-use_fuse3.patch
-
git submodule init
git submodule set-url bsdiff "$srcdir/bsdiff"
git submodule set-url libglnx "$srcdir/libglnx"
Deleted: ostree-2022.6-use_fuse3.patch
===================================================================
--- ostree-2022.6-use_fuse3.patch 2023-03-17 00:19:30 UTC (rev 471038)
+++ ostree-2022.6-use_fuse3.patch 2023-03-17 00:35:32 UTC (rev 471039)
@@ -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/trunk/ostree-2023.1-use_fuse3.patch (from rev 471038,
ostree/trunk/ostree-2022.6-use_fuse3.patch)
===================================================================
--- ostree-2023.1-use_fuse3.patch (rev 0)
+++ ostree-2023.1-use_fuse3.patch 2023-03-17 00:35:32 UTC (rev 471039)
@@ -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 264094b1..cd1e0986 100755
+--- i/tests/libtest.sh
++++ w/tests/libtest.sh
+@@ -683,7 +683,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
